summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--KDE2PORTING.html50
-rw-r--r--KDE3PORTING.html54
-rw-r--r--TODO14
-rw-r--r--arts/kde/kvideowidget.cpp44
-rw-r--r--dcop/HOWTO6
-rw-r--r--dcop/Mainpage.dox6
-rw-r--r--interfaces/tdemediaplayer/player.h2
-rw-r--r--interfaces/tdescript/scriptloader.cpp6
-rw-r--r--interfaces/tdescript/scriptloader.h12
-rw-r--r--interfaces/terminal/test/main.h2
-rw-r--r--kab/kabapi.cc2
-rw-r--r--kab/kabapi.h4
-rw-r--r--kabc/addresseedialog.cpp4
-rw-r--r--kabc/addresseedialog.h4
-rw-r--r--kabc/addresslineedit.cpp4
-rw-r--r--kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp2
-rw-r--r--kabc/resourceselectdialog.cpp2
-rw-r--r--kabc/resourceselectdialog.h4
-rw-r--r--kate/interfaces/document.h4
-rw-r--r--kate/part/kateautoindent.cpp2
-rw-r--r--kate/part/kateautoindent.h4
-rw-r--r--kate/part/katebookmarks.cpp12
-rw-r--r--kate/part/katebookmarks.h16
-rw-r--r--kate/part/katedialogs.cpp2
-rw-r--r--kate/part/katedialogs.h8
-rw-r--r--kate/part/kateprinter.cpp2
-rw-r--r--kate/part/kateschema.cpp6
-rw-r--r--kate/part/kateschema.h6
-rw-r--r--kate/part/katesearch.cpp2
-rw-r--r--kate/part/katesearch.h4
-rw-r--r--kate/part/katespell.cpp6
-rw-r--r--kate/part/katespell.h6
-rw-r--r--kate/part/kateview.cpp174
-rw-r--r--kate/part/kateview.h60
-rw-r--r--kate/part/kateviewhelpers.cpp2
-rw-r--r--kate/part/kateviewhelpers.h2
-rw-r--r--kate/part/test_regression.cpp2
-rw-r--r--kate/plugins/autobookmarker/autobookmarker.cpp4
-rw-r--r--kate/plugins/autobookmarker/autobookmarker.h2
-rw-r--r--kate/plugins/insertfile/insertfileplugin.cpp2
-rw-r--r--kate/plugins/isearch/ISearchPlugin.cpp24
-rw-r--r--kate/plugins/isearch/ISearchPlugin.h4
-rw-r--r--kate/plugins/kdatatool/kate_kdatatool.cpp8
-rw-r--r--kate/plugins/kdatatool/kate_kdatatool.h8
-rw-r--r--kate/plugins/wordcompletion/docwordcompletion.cpp12
-rw-r--r--kded/kded.cpp2
-rw-r--r--kdewidgets/kde.widgets16
-rw-r--r--kdewidgets/tests/test.widgets12
-rw-r--r--kinit/README.DCOP2
-rw-r--r--kinit/kinit.cpp8
-rw-r--r--kinit/tdelauncher.cpp146
-rw-r--r--kinit/tdelauncher.h26
-rw-r--r--kinit/tdelauncher_main.cpp8
-rw-r--r--knewstuff/downloaddialog.cpp36
-rw-r--r--knewstuff/downloaddialog.h6
-rw-r--r--knewstuff/knewstuff.cpp6
-rw-r--r--knewstuff/knewstuff.h8
-rw-r--r--knewstuff/providerdialog.cpp8
-rw-r--r--knewstuff/providerdialog.h4
-rw-r--r--kstyles/klegacy/klegacystyle.cpp2
-rw-r--r--kstyles/klegacy/klegacystyle.h2
-rw-r--r--kstyles/kthemestyle/kthemestyle.cpp4
-rw-r--r--kstyles/web/webstyle.cpp10
-rw-r--r--kstyles/web/webstyle.h10
-rw-r--r--tdecert/tdecertpart.cc18
-rw-r--r--tdecert/tdecertpart.h14
-rw-r--r--tdecore/AUTHORS6
-rw-r--r--tdecore/DESIGN.iconloading2
-rw-r--r--tdecore/README.kiosk4
-rw-r--r--tdecore/kaccel.cpp246
-rw-r--r--tdecore/kaccel.h78
-rw-r--r--tdecore/kaccelaction.cpp226
-rw-r--r--tdecore/kaccelaction.h144
-rw-r--r--tdecore/kaccelbase.cpp140
-rw-r--r--tdecore/kaccelbase.h70
-rw-r--r--tdecore/kaccelmanager.cpp166
-rw-r--r--tdecore/kaccelmanager.h4
-rw-r--r--tdecore/kaccelmanager_private.h26
-rw-r--r--tdecore/kaccelprivate.h20
-rw-r--r--tdecore/kapplication.cpp24
-rw-r--r--tdecore/kapplication.h48
-rw-r--r--tdecore/kcheckaccelerators.cpp6
-rw-r--r--tdecore/kcompletion.h8
-rw-r--r--tdecore/kcompletionbase.cpp2
-rw-r--r--tdecore/kdebug.areas14
-rw-r--r--tdecore/kdebugrc6
-rw-r--r--tdecore/kglobalaccel.cpp28
-rw-r--r--tdecore/kglobalaccel.h30
-rw-r--r--tdecore/kglobalaccel_emb.h4
-rw-r--r--tdecore/kglobalaccel_mac.h8
-rw-r--r--tdecore/kglobalaccel_win.cpp18
-rw-r--r--tdecore/kglobalaccel_win.h10
-rw-r--r--tdecore/kglobalaccel_x11.cpp22
-rw-r--r--tdecore/kglobalaccel_x11.h12
-rw-r--r--tdecore/kglobalsettings.cpp2
-rw-r--r--tdecore/kglobalsettings.h12
-rw-r--r--tdecore/kmanagerselection.cpp84
-rw-r--r--tdecore/kmanagerselection.h24
-rw-r--r--tdecore/kshortcut.cpp74
-rw-r--r--tdecore/kshortcut.h60
-rw-r--r--tdecore/kshortcutlist.cpp84
-rw-r--r--tdecore/kshortcutlist.h76
-rw-r--r--tdecore/kshortcutmenu.cpp16
-rw-r--r--tdecore/kshortcutmenu.h8
-rw-r--r--tdecore/kstdaccel.cpp270
-rw-r--r--tdecore/kstdaccel.h116
-rw-r--r--tdecore/tdeconfigdialogmanager.cpp8
-rw-r--r--tdecore/tests/kstdacceltest.cpp12
-rw-r--r--tdehtml/ChangeLog2
-rw-r--r--tdehtml/domtreeview.cpp2
-rw-r--r--tdehtml/domtreeview.h2
-rw-r--r--tdehtml/ecma/kjs_debugwin.cpp20
-rw-r--r--tdehtml/ecma/kjs_debugwin.h18
-rw-r--r--tdehtml/misc/knsplugininstaller.cpp2
-rw-r--r--tdehtml/misc/knsplugininstaller.h2
-rw-r--r--tdehtml/rendering/render_form.cpp24
-rw-r--r--tdehtml/rendering/render_form.h12
-rw-r--r--tdehtml/tdehtml_ext.cpp64
-rw-r--r--tdehtml/tdehtml_ext.h6
-rw-r--r--tdehtml/tdehtml_part.cpp68
-rw-r--r--tdehtml/tdehtmlimage.cpp6
-rw-r--r--tdehtml/tdehtmlpart_p.h52
-rw-r--r--tdehtml/test_regression.cpp2
-rw-r--r--tdehtml/testtdehtml.cpp12
-rw-r--r--tdeio/Mainpage.dox6
-rw-r--r--tdeio/bookmarks/kbookmarkbar.cc56
-rw-r--r--tdeio/bookmarks/kbookmarkbar.h18
-rw-r--r--tdeio/bookmarks/kbookmarkimporter.h2
-rw-r--r--tdeio/bookmarks/kbookmarkmenu.cc72
-rw-r--r--tdeio/bookmarks/kbookmarkmenu.h36
-rw-r--r--tdeio/bookmarks/kbookmarkmenu_p.h34
-rw-r--r--tdeio/misc/tdewalletd/tdewalletd.desktop4
-rw-r--r--tdeio/misc/uiserver.cpp20
-rw-r--r--tdeio/misc/uiserver.h8
-rw-r--r--tdeio/tdefile/ChangeLog4
-rw-r--r--tdeio/tdefile/NOTES2
-rw-r--r--tdeio/tdefile/kacleditwidget.cpp10
-rw-r--r--tdeio/tdefile/kacleditwidget_p.h4
-rw-r--r--tdeio/tdefile/kcombiview.cpp2
-rw-r--r--tdeio/tdefile/kcombiview.h2
-rw-r--r--tdeio/tdefile/kcustommenueditor.cpp2
-rw-r--r--tdeio/tdefile/kcustommenueditor.h4
-rw-r--r--tdeio/tdefile/kdiroperator.cpp94
-rw-r--r--tdeio/tdefile/kdiroperator.h70
-rw-r--r--tdeio/tdefile/kdirselectdialog.cpp12
-rw-r--r--tdeio/tdefile/kdirselectdialog.h6
-rw-r--r--tdeio/tdefile/kencodingfiledialog.cpp6
-rw-r--r--tdeio/tdefile/knotifydialog.h2
-rw-r--r--tdeio/tdefile/knotifywidgetbase.ui2
-rw-r--r--tdeio/tdefile/kopenwith.cpp6
-rw-r--r--tdeio/tdefile/kopenwith_p.h4
-rw-r--r--tdeio/tdefile/kpropertiesdesktopbase.ui2
-rw-r--r--tdeio/tdefile/kpropertiesdialog.cpp4
-rw-r--r--tdeio/tdefile/kpropertiesmimetypebase.ui2
-rw-r--r--tdeio/tdefile/krecentdirs.cpp6
-rw-r--r--tdeio/tdefile/krecentdirs.h2
-rw-r--r--tdeio/tdefile/krecentdocument.cpp18
-rw-r--r--tdeio/tdefile/krecentdocument.h2
-rw-r--r--tdeio/tdefile/kurlbar.cpp6
-rw-r--r--tdeio/tdefile/kurlbar.h4
-rw-r--r--tdeio/tdefile/kurlrequester.cpp4
-rw-r--r--tdeio/tdefile/kurlrequester.h2
-rw-r--r--tdeio/tdefile/kurlrequesterdlg.cpp2
-rw-r--r--tdeio/tdefile/tdefilebookmarkhandler.cpp2
-rw-r--r--tdeio/tdefile/tdefilebookmarkhandler.h6
-rw-r--r--tdeio/tdefile/tdefiledetailview.cpp24
-rw-r--r--tdeio/tdefile/tdefiledetailview.h16
-rw-r--r--tdeio/tdefile/tdefiledialog.cpp42
-rw-r--r--tdeio/tdefile/tdefiledialog.h16
-rw-r--r--tdeio/tdefile/tdefileiconview.cpp12
-rw-r--r--tdeio/tdefile/tdefilepreview.cpp2
-rw-r--r--tdeio/tdefile/tdefilepreview.h4
-rw-r--r--tdeio/tdefile/tdefiletreeview.cpp10
-rw-r--r--tdeio/tdefile/tdefiletreeview.h2
-rw-r--r--tdeio/tdefile/tdefiletreeviewitem.cpp4
-rw-r--r--tdeio/tdefile/tdefiletreeviewitem.h2
-rw-r--r--tdeio/tdefile/tdefileview.cpp6
-rw-r--r--tdeio/tdefile/tdefileview.h4
-rw-r--r--tdeio/tdefile/tests/tdefiletreeviewtest.cpp2
-rw-r--r--tdeio/tdefile/tests/tdefiletreeviewtest.h2
-rw-r--r--tdeio/tdeio/kdatatool.cpp10
-rw-r--r--tdeio/tdeio/kdatatool.h6
-rw-r--r--tdeio/tdeio/kmimetypechooser.cpp4
-rw-r--r--tdeio/tdeio/krun.cpp6
-rw-r--r--tdeio/tdeio/paste.h2
-rw-r--r--tdeio/tdeio/scheduler.cpp2
-rw-r--r--tdeio/tdeio/scheduler.h8
-rw-r--r--tdeio/tdeio/slave.cpp2
-rw-r--r--tdeio/tests/tdeioslavetest.cpp2
-rw-r--r--tdeio/tests/tdeioslavetest.h2
-rw-r--r--tdemdi/tdemdi/guiclient.cpp32
-rw-r--r--tdemdi/tdemdi/guiclient.h18
-rw-r--r--tdemdi/tdemdi/toolviewaccessor_p.h2
-rw-r--r--tdemdi/tdemdidocumentviewtabwidget.h2
-rw-r--r--tdemdi/tdemdiguiclient.cpp38
-rw-r--r--tdemdi/tdemdiguiclient.h22
-rw-r--r--tdemdi/tdemdimainfrm.cpp10
-rw-r--r--tdemdi/tdemditaskbar.cpp4
-rw-r--r--tdemdi/tdemditaskbar.h2
-rw-r--r--tdemdi/tdemditoolviewaccessor_p.h2
-rw-r--r--tdemdi/test/mainwidget.cpp2
-rw-r--r--tdemdi/test/mainwidget.h2
-rw-r--r--tdeparts/mainwindow.cpp6
-rw-r--r--tdeparts/mainwindow.h8
-rw-r--r--tdeparts/part.cpp2
-rw-r--r--tdeparts/part.h10
-rw-r--r--tdeparts/statusbarextension.cpp2
-rw-r--r--tdeparts/statusbarextension.h6
-rw-r--r--tdeparts/tests/example.cpp16
-rw-r--r--tdeparts/tests/example.h6
-rw-r--r--tdeparts/tests/ghostview.cpp4
-rw-r--r--tdeparts/tests/normalktm.cpp10
-rw-r--r--tdeparts/tests/normalktm.h8
-rw-r--r--tdeparts/tests/notepad.cpp2
-rw-r--r--tdeparts/tests/parts.cpp2
-rw-r--r--tdeparts/tests/plugin_spellcheck.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/editlist.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/editlist.h4
-rw-r--r--tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/qdirmultilineedit.h4
-rw-r--r--tdeprint/cups/kmcupsjobmanager.cpp10
-rw-r--r--tdeprint/cups/kmcupsjobmanager.h4
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp8
-rw-r--r--tdeprint/cups/kmcupsmanager.h4
-rw-r--r--tdeprint/cups/kmwfax.cpp2
-rw-r--r--tdeprint/cups/kmwfax.h4
-rw-r--r--tdeprint/cups/kmwippprinter.cpp2
-rw-r--r--tdeprint/cups/kmwippprinter.h4
-rw-r--r--tdeprint/cups/kmwippselect.cpp2
-rw-r--r--tdeprint/cups/kmwippselect.h4
-rw-r--r--tdeprint/cups/kmwother.cpp2
-rw-r--r--tdeprint/cups/kmwother.h4
-rw-r--r--tdeprint/driverview.cpp2
-rw-r--r--tdeprint/driverview.h2
-rw-r--r--tdeprint/droptionview.cpp2
-rw-r--r--tdeprint/droptionview.h4
-rw-r--r--tdeprint/kmjobmanager.cpp6
-rw-r--r--tdeprint/kmjobmanager.h8
-rw-r--r--tdeprint/kmmanager.cpp4
-rw-r--r--tdeprint/kmmanager.h6
-rw-r--r--tdeprint/kpfilterpage.cpp2
-rw-r--r--tdeprint/kpfilterpage.h4
-rw-r--r--tdeprint/kprintaction.cpp6
-rw-r--r--tdeprint/kprintaction.h2
-rw-r--r--tdeprint/kprintpreview.cpp26
-rw-r--r--tdeprint/lpr/editentrydialog.cpp2
-rw-r--r--tdeprint/lpr/kmlprmanager.cpp6
-rw-r--r--tdeprint/lpr/kmlprmanager.h4
-rw-r--r--tdeprint/management/cjanuswidget.cpp6
-rw-r--r--tdeprint/management/kiconselectaction.cpp20
-rw-r--r--tdeprint/management/kiconselectaction.h2
-rw-r--r--tdeprint/management/kmconfigfilter.cpp14
-rw-r--r--tdeprint/management/kmconfigfilter.h6
-rw-r--r--tdeprint/management/kmconfigfonts.cpp2
-rw-r--r--tdeprint/management/kmconfigfonts.h4
-rw-r--r--tdeprint/management/kmdriverdbwidget.cpp4
-rw-r--r--tdeprint/management/kminstancepage.cpp2
-rw-r--r--tdeprint/management/kminstancepage.h4
-rw-r--r--tdeprint/management/kmjobviewer.cpp44
-rw-r--r--tdeprint/management/kmjobviewer.h6
-rw-r--r--tdeprint/management/kmmainview.cpp98
-rw-r--r--tdeprint/management/kmmainview.h20
-rw-r--r--tdeprint/management/kmwbackend.cpp8
-rw-r--r--tdeprint/management/kmwclass.cpp4
-rw-r--r--tdeprint/management/kmwclass.h4
-rw-r--r--tdeprint/management/kmwdriverselect.cpp2
-rw-r--r--tdeprint/management/kmwdriverselect.h4
-rw-r--r--tdeprint/management/kmwlocal.cpp2
-rw-r--r--tdeprint/management/kmwlocal.h4
-rw-r--r--tdeprint/management/kmwsocket.cpp2
-rw-r--r--tdeprint/management/kmwsocket.h4
-rw-r--r--tdeprint/management/kxmlcommanddlg.cpp10
-rw-r--r--tdeprint/management/kxmlcommanddlg.h12
-rw-r--r--tdeprint/management/kxmlcommandselector.cpp2
-rw-r--r--tdeprint/management/pluginaction.cpp2
-rw-r--r--tdeprint/management/pluginaction.h2
-rw-r--r--tdeprint/management/smbview.cpp2
-rw-r--r--tdeprint/management/smbview.h2
-rw-r--r--tdeprint/rlpr/kmwrlpr.cpp2
-rw-r--r--tdeprint/rlpr/kmwrlpr.h4
-rw-r--r--tdeprint/tdefilelist.cpp2
-rw-r--r--tdeprint/tdefilelist.h4
-rw-r--r--tdeprint/tests/helpwindow.cpp2
-rw-r--r--tdeprint/tests/helpwindow.h2
-rw-r--r--tderesources/configpage.cpp2
-rw-r--r--tderesources/configpage.h4
-rw-r--r--tderesources/selectdialog.cpp2
-rw-r--r--tderesources/selectdialog.h4
-rw-r--r--tdersync/tdersync.h2
-rw-r--r--tdeui/AUTHORS12
-rw-r--r--tdeui/Mainpage.dox2
-rw-r--r--tdeui/TODO.xmlgui8
-rw-r--r--tdeui/kaboutapplication.h4
-rw-r--r--tdeui/kaboutkde.h4
-rw-r--r--tdeui/kaccelgen.h4
-rw-r--r--tdeui/kaction.cpp492
-rw-r--r--tdeui/kaction.h134
-rw-r--r--tdeui/kactionclasses.cpp998
-rw-r--r--tdeui/kactionclasses.h316
-rw-r--r--tdeui/kactioncollection.cpp360
-rw-r--r--tdeui/kactioncollection.h152
-rw-r--r--tdeui/kactionselector.cpp88
-rw-r--r--tdeui/kactionselector.h10
-rw-r--r--tdeui/kactionshortcutlist.h42
-rw-r--r--tdeui/kanimwidget.cpp6
-rw-r--r--tdeui/kanimwidget.h2
-rw-r--r--tdeui/kcmenumngr.cpp2
-rw-r--r--tdeui/kcolorbutton.cpp4
-rw-r--r--tdeui/kcolordialog.cpp8
-rw-r--r--tdeui/kcolordialog.h8
-rw-r--r--tdeui/kcombobox.cpp8
-rw-r--r--tdeui/kcombobox.h4
-rw-r--r--tdeui/kcommand.cpp10
-rw-r--r--tdeui/kcommand.h12
-rw-r--r--tdeui/kcompletionbox.cpp14
-rw-r--r--tdeui/kcompletionbox.h4
-rw-r--r--tdeui/kdatepicker.cpp2
-rw-r--r--tdeui/kdatetbl.cpp44
-rw-r--r--tdeui/kdatetbl.h14
-rw-r--r--tdeui/kdcopactionproxy.cpp22
-rw-r--r--tdeui/kdcopactionproxy.h26
-rw-r--r--tdeui/kdetrayproxy/kdetrayproxy.h2
-rw-r--r--tdeui/kdockwidget.cpp12
-rw-r--r--tdeui/kdockwidget.h8
-rw-r--r--tdeui/keditcl1.cpp32
-rw-r--r--tdeui/kedittoolbar.cpp46
-rw-r--r--tdeui/kedittoolbar.h28
-rw-r--r--tdeui/kfontcombo.cpp80
-rw-r--r--tdeui/kfontcombo.h12
-rw-r--r--tdeui/kfontdialog.cpp80
-rw-r--r--tdeui/kfontdialog.h56
-rw-r--r--tdeui/kfontrequester.cpp16
-rw-r--r--tdeui/kfontrequester.h10
-rw-r--r--tdeui/khelpmenu.cpp20
-rw-r--r--tdeui/khelpmenu.h20
-rw-r--r--tdeui/kinputdialog.cpp8
-rw-r--r--tdeui/kinputdialog.h2
-rw-r--r--tdeui/kjanuswidget.cpp8
-rw-r--r--tdeui/kjanuswidget.h6
-rw-r--r--tdeui/kkeybutton.cpp10
-rw-r--r--tdeui/kkeybutton.h10
-rw-r--r--tdeui/kkeydialog.cpp164
-rw-r--r--tdeui/kkeydialog.h84
-rw-r--r--tdeui/klineedit.cpp70
-rw-r--r--tdeui/klineedit.h2
-rw-r--r--tdeui/klistbox.cpp26
-rw-r--r--tdeui/klistbox.h8
-rw-r--r--tdeui/klistview.cpp334
-rw-r--r--tdeui/klistview.h56
-rw-r--r--tdeui/klistviewlineedit.h10
-rw-r--r--tdeui/klistviewsearchline.cpp86
-rw-r--r--tdeui/klistviewsearchline.h56
-rw-r--r--tdeui/kmainwindow.cpp236
-rw-r--r--tdeui/kmainwindow.h126
-rw-r--r--tdeui/kmainwindowiface.cpp66
-rw-r--r--tdeui/kmainwindowiface.h20
-rw-r--r--tdeui/kmenubar.cpp4
-rw-r--r--tdeui/kmessagebox.cpp4
-rw-r--r--tdeui/kpanelmenu.cpp8
-rw-r--r--tdeui/kpanelmenu.h2
-rw-r--r--tdeui/kpartgui.dtd6
-rw-r--r--tdeui/kpixmapregionselectorwidget.cpp10
-rw-r--r--tdeui/kpixmapregionselectorwidget.h6
-rw-r--r--tdeui/kpopupmenu.cpp174
-rw-r--r--tdeui/kpopupmenu.h40
-rw-r--r--tdeui/kselect.cpp34
-rw-r--r--tdeui/kselect.h16
-rw-r--r--tdeui/kshortcutdialog.cpp42
-rw-r--r--tdeui/kshortcutdialog.h24
-rw-r--r--tdeui/kshortcutdialog_advanced.ui6
-rw-r--r--tdeui/kshortcutdialog_simple.ui6
-rw-r--r--tdeui/kstatusbar.h8
-rw-r--r--tdeui/kstdaction.cpp174
-rw-r--r--tdeui/kstdaction.h292
-rw-r--r--tdeui/kstdaction_p.h144
-rw-r--r--tdeui/ksystemtray.cpp18
-rw-r--r--tdeui/ksystemtray.h12
-rw-r--r--tdeui/ktextedit.cpp32
-rw-r--r--tdeui/ktimezonewidget.cpp4
-rw-r--r--tdeui/ktimezonewidget.h4
-rw-r--r--tdeui/ktoolbar.cpp430
-rw-r--r--tdeui/ktoolbar.h74
-rw-r--r--tdeui/ktoolbarbutton.cpp138
-rw-r--r--tdeui/ktoolbarbutton.h28
-rw-r--r--tdeui/ktoolbarhandler.cpp50
-rw-r--r--tdeui/ktoolbarhandler.h20
-rw-r--r--tdeui/ktoolbarlabelaction.cpp42
-rw-r--r--tdeui/ktoolbarlabelaction.h28
-rw-r--r--tdeui/ktoolbarradiogroup.cpp18
-rw-r--r--tdeui/ktoolbarradiogroup.h26
-rw-r--r--tdeui/kwhatsthismanager_p.h2
-rw-r--r--tdeui/kxmlgui.xsd4
-rw-r--r--tdeui/kxmlguibuilder.cpp56
-rw-r--r--tdeui/kxmlguibuilder.h4
-rw-r--r--tdeui/kxmlguiclient.cpp24
-rw-r--r--tdeui/kxmlguiclient.h24
-rw-r--r--tdeui/kxmlguifactory.cpp10
-rw-r--r--tdeui/kxmlguifactory.h10
-rw-r--r--tdeui/kxmlguifactory_p.cpp4
-rw-r--r--tdeui/kxmlguifactory_p.h12
-rw-r--r--tdeui/tdespelldlg.h4
-rw-r--r--tdeui/tests/itemcontainertest.cpp24
-rw-r--r--tdeui/tests/itemcontainertest.h8
-rw-r--r--tdeui/tests/kaccelgentest.cpp8
-rw-r--r--tdeui/tests/kactiontest.cpp18
-rw-r--r--tdeui/tests/kdockwidgettest.cpp2
-rw-r--r--tdeui/tests/kfontdialogtest.cpp8
-rw-r--r--tdeui/tests/klistviewtest.cpp26
-rw-r--r--tdeui/tests/kmainwindowrestoretest.h24
-rw-r--r--tdeui/tests/kmainwindowtest.h2
-rw-r--r--tdeui/tests/kpopuptest.cpp4
-rw-r--r--tdeui/tests/krulertest.cpp2
-rw-r--r--tdeui/tests/krulertest.h2
-rw-r--r--tdeui/tests/kstatusbartest.cpp2
-rw-r--r--tdeui/tests/kstatusbartest.h2
-rw-r--r--tdeui/tests/ktoolbarlabelactiontest.cpp10
-rw-r--r--tdeui/tests/kxmlguitest.cpp8
-rw-r--r--tdeui/tests/twindowtest.cpp14
-rw-r--r--tdeui/tests/twindowtest.h10
-rw-r--r--tdeui/twindowlistmenu.cpp4
-rw-r--r--tdeui/twindowlistmenu.h2
-rw-r--r--tdeutils/kpluginselector.cpp12
-rw-r--r--tdeutils/ksettings/componentsdialog.cpp6
-rw-r--r--tdeutils/tdemultitabbar.cpp2
424 files changed, 5904 insertions, 5904 deletions
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index e77898f3..63692b61 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -26,7 +26,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#KIconLoader">KIconLoader</A></LI>
<LI><A HREF="#KTMainWindow">KTMainWindow</A></LI>
<LI><A HREF="#KHelpMenu">KHelpMenu</A></LI>
-<LI><A HREF="#KToolBar">KToolBar</A></LI>
+<LI><A HREF="#TDEToolBar">TDEToolBar</A></LI>
<LI><A HREF="#launching">Starting other programs</A></LI>
<LI><A HREF="#tdehtmlw">tdehtmlw</A></LI>
<LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI>
@@ -45,8 +45,8 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#KQuickHelp">KQuickHelp</A></LI>
<LI><A HREF="#KPixmapgradientFill">KPixmap::gradientFill</A></LI>
<LI><A HREF="#KTabListBox">KTabListBox</A></LI>
-<LI><A HREF="#KToolBarButton">KToolBarButton &amp; KRadioGroup</A></LI>
-<LI><A HREF="#KAccel">KAccel</A></LI>
+<LI><A HREF="#TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></LI>
+<LI><A HREF="#TDEAccel">TDEAccel</A></LI>
<LI><A HREF="#kstring">kstring.h / KString</A></LI>
<LI><A HREF="#ktopwidget">ktopwidget.h / KTopWidget</A></LI>
<LI><A HREF="#kbutton">kbutton.h / KButton</A></LI>
@@ -142,8 +142,8 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
The methods tempSaveName() and checkRecoverFile() return QString
now. The returned values must _not_ be free()d.<P>
- helpMenu() has been moved to KMainWindow. aboutKDE(), aboutApp() and
- appHelpActivated() have all been removed See section for KMainWindow
+ helpMenu() has been moved to TDEMainWindow. aboutKDE(), aboutApp() and
+ appHelpActivated() have all been removed See section for TDEMainWindow
for more info.<P>
The TDEApplication constructor has changed. Command line arguments and
@@ -248,9 +248,9 @@ in stripping off the .xpm part<P>
<H3><A NAME="KTMainWindow">KTMainWindow</A></H3>
-KTMainWindow has been replaced with KMainWindow.<p>
+KTMainWindow has been replaced with TDEMainWindow.<p>
-The KMainWindow constructor needs a parent widget as first argument.
+The TDEMainWindow constructor needs a parent widget as first argument.
You can use 0 for this.<p>
setView() has been replaced with setCentralWidget().<p>
view() has been replaced with centralWidget().<p>
@@ -271,12 +271,12 @@ mainViewGeometry() instead.<P>
<H3><A NAME="KHelpMenu">KHelpMenu</A></H3>
-helpMenu() has been moved to KMainWindow from TDEApplication (kapp).<P>
+helpMenu() has been moved to TDEMainWindow from TDEApplication (kapp).<P>
Both the "About KDE" and the "About &lt;Application&gt;" dialog boxes
are now modeless. "About KDE" is a completely new widget.<P>
-If you used in the toplevel window (that is derived from KMainWindow)
+If you used in the toplevel window (that is derived from TDEMainWindow)
"kapp-&gt;helpMenu( bool, TQString )" to get the help menu
you must now change this to "helpMenu( TQString )". The TQString defaults
to TQString::null so it is sufficient to write helpMenu().<P>
@@ -284,13 +284,13 @@ to TQString::null so it is sufficient to write helpMenu().<P>
The old aboutKDE(), aboutApp() and appHelpActivated() of TDEApplication
have all been removed. If you need direct access to these or need
access to a help menu in a class that is not derived from
-KMainWindow then allocate an instance of the new class KHelpMenu.
+TDEMainWindow then allocate an instance of the new class KHelpMenu.
See KDE 2.0 API reference or khelpmenu.h (tdeui) for additional info.<P>
Espen Sand &lt;<A HREF="mailto:espen@kde.org">espen@kde.org</A>&gt;<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
-<H3><A NAME="KToolBar">KToolBar</A></H3>
+<H3><A NAME="TDEToolBar">TDEToolBar</A></H3>
enable(...) is depreciated, use show()/hide() instead.<p>
enableFloating(...) has been removed, use enableMoving() instead.<p>
@@ -588,7 +588,7 @@ this:<P>
<TABLE><TR><TD>
TQSplitter *split = new TQSplitter( parent );<BR>
TQListBox *lb = new TQListBox( split );<BR>
- KListView *lv = new KListView( split );<BR>
+ TDEListView *lv = new TDEListView( split );<BR>
TQMultiLineEdit *ed = new TQMultiLineEdit( split );
</TD></TR></TABLE>
@@ -600,17 +600,17 @@ possible if you call setOpaqueResize(true).<P>
<H3><A NAME="KTreeList">KTreeList, KTreeListItem</A></H3>
-Use KListView, TQListViewItem instead. API is almost the same, you only
-need to add a Column (KListView::addColum) before KListView is useable.<P>
+Use TDEListView, TQListViewItem instead. API is almost the same, you only
+need to add a Column (TDEListView::addColum) before TDEListView is useable.<P>
-KListView has no addChild(), insertItem() and removeItem() calls. Inserting
-a root item is done by constructing a TQListViewItem with the KListView
+TDEListView has no addChild(), insertItem() and removeItem() calls. Inserting
+a root item is done by constructing a TQListViewItem with the TDEListView
passed as the parent widget. adding a child item is done by constructing
a TQListViewItem with the parent item as parameter. removeItem() should
be replaced by delete &lt;pointer to item&gt;.<P>
The root items are not shown in a tree fashion by default. to get this,
-use KListView::setDecorativeRoot(true).<P>
+use TDEListView::setDecorativeRoot(true).<P>
Expanding and collapsing can by done by using TQListViewItem::setOpen(bool).<P>
@@ -685,24 +685,24 @@ unbalancedGradient(), hash(), desaturate(), pattern(), fade(), blend() etc.<P>
<H3><A NAME="KTabListBox">KTabListBox</A></H3>
-This widget has been replaced by the almighty KListView. Everything said
+This widget has been replaced by the almighty TDEListView. Everything said
about KTreeList could be repeated here. The good thing is, that you now
can combine TreeView's and normal Tablists without problems.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
-<H3><A NAME="KToolBarButton">KToolBarButton &amp; KRadioGroup</A></H3>
+<H3><A NAME="TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></H3>
-If you need to do anything with KToolBarButton you now need to include
-&lt;ktoolbarbutton.h&gt; KRadioGroup has been renamed to KToolBarRadioGroup and
+If you need to do anything with TDEToolBarButton you now need to include
+&lt;ktoolbarbutton.h&gt; TDERadioGroup has been renamed to TDEToolBarRadioGroup and
requires you to include &lt;ktoolbarradiogroup.h&gt;<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
-<H3><A NAME="KAccel">KAccel</A></H3>
+<H3><A NAME="TDEAccel">TDEAccel</A></H3>
The functions keyToString() and stringToKey() which were previously
-declared globally in kaccel.h are now static methods in KAccel.<P>
+declared globally in kaccel.h are now static methods in TDEAccel.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -716,7 +716,7 @@ The file has been removed completely, use TQString instead. (<A HREF="mailto:mir
<H3><A NAME="ktopwidget">ktopwidget.h / KTopWidget</A></H3>
-KMainWindow replaces this class completely. ktopwidget.h does not
+TDEMainWindow replaces this class completely. ktopwidget.h does not
exist in KDE 2. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -754,7 +754,7 @@ Please adjust your code accordingly.<P>
<H3><A NAME="KDockWidget">KDockWidget</A></H3>
-KDockWidget inherits form KMainWindow instead of KTMainWindow now.
+KDockWidget inherits form TDEMainWindow instead of KTMainWindow now.
See <A HREF="KTMainWindow">KTMainWindow</A> for more details.
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index b3fdff0d..407d5c5a 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -148,11 +148,11 @@ should be replaced with methods from TDELocale::calendar().
cases be replaced by methods in TDELocale::calendar().
<H4>Accelerators Keys</H4>
-<h5>KAccel</h5>
+<h5>TDEAccel</h5>
The following methods of been deprecated, and if KDE_NO_COMPAT is defined they will
not be available.
<ul>
- <li> KAccel::insertItem() and KAccel::connectItem().
+ <li> TDEAccel::insertItem() and TDEAccel::connectItem().
<pre>
- kaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
- kaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
@@ -163,19 +163,19 @@ not be available.
You might replace the TQString::null parameter with
<pre> i18n("Scroll the current document's contents up by one line.") </pre>
for example.</li>
- <li> KAccel::changeMenuAccel() has been deprecated because it was
+ <li> TDEAccel::changeMenuAccel() has been deprecated because it was
never used in cvs. If you've used it in your application, the following
can replace it. Note, however, that this would be handled automatically
- by using KAction instead.
+ by using TDEAction instead.
<pre>
- kaccel-&gt;changeMenuAccel( menu, id, "file_open" );
+ menu-&gt;setAccel( kaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
</pre>
</li>
</ul>
-The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
+The preferred means of defining a shortcut, however, is to use <b>TDEAction</b>.
<pre>
- new KAction( i18n("Scroll Up"), Key_Up,
+ new TDEAction( i18n("Scroll Up"), Key_Up,
this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" );
</pre>
@@ -189,25 +189,25 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
shortcut reassignments, which in turn used to make an expensive ungrab
of the old key and second grab of the new key necessary.</li>
</ul>
-<h5>KStdAccel</h5>
+<h5>TDEStdAccel</h5>
<ul>
<li><i>StdAccel::WhatThis</i> has been renamed to <i>StdAccel::WhatsThis</i>.
<li><i>StdAccel::Insert</i> and the corresponding <i>insert()</i>
have been removed. (Nobody on the list knew what its function was
supposed to be.) Calls to <i>insert()</i> and the equivalent
- <i>key(KStdAccel::Insert)</i> can be replaced with the former default
+ <i>key(TDEStdAccel::Insert)</i> can be replaced with the former default
of <i>Qt::CTRL+Qt::Key_Insert</i>.</li>
<li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined:
<table border=1>
<tr><th>Old</th><th>New</th></tr>
<tr><td>TQString action(StdAccel id)</td><td>TQString name(StdAccel id)</td></tr>
- <tr><td>int defaultKey(StdAccel accel)</td><td>KShortcut shortcutDefault(StdAccel id)</td></tr>
+ <tr><td>int defaultKey(StdAccel accel)</td><td>TDEShortcut shortcutDefault(StdAccel id)</td></tr>
<tr><td>TQString description(StdAccel id)</td><td>TQString label(StdAccel id)</td></tr>
<tr><td>bool isEqual(const TQKeyEvent* pEvent, int keyQt)</td>
<td>The best method for replacing this varies. One possibility is to use
<i>KKey(const TQKeyEvent*) == KKey(int)</i>. Another is to use
- <i>KShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
- <tr><td>int key(StdAccel)</td><td>const KShortcut& shortcut(StdAccel)</td></tr>
+ <i>TDEShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
+ <tr><td>int key(StdAccel)</td><td>const TDEShortcut& shortcut(StdAccel)</td></tr>
</table></li-->
</ul>
@@ -221,27 +221,27 @@ KURLBar and KURLBarItem.
<H3><A NAME="tdeui">Changes in tdeui</A></H3>
-<H4>KAccelMenu</H4>
+<H4>TDEAccelMenu</H4>
This class has been removed, Qt offers the same functionality.
-Use QPopupMenu/KPopupMenu or the XML-UI method for building menus.
+Use QPopupMenu/TDEPopupMenu or the XML-UI method for building menus.
-<H4>KAction</H4>
+<H4>TDEAction</H4>
<ul>
<li>The following methods have been deprecated and will need to be
replaced if KDE_NO_COMPAT is defined.
<table border=1>
<tr><th>Old</th><th>New</th></tr>
- <tr><td>int accel()</td><td>const KShortcut&amp; shortcut()</td></tr>
+ <tr><td>int accel()</td><td>const TDEShortcut&amp; shortcut()</td></tr>
<tr><td>int menuId()</td><td>int itemId()</td></tr>
- <tr><td>void setAccel(int)</td><td>void setShortcut(const KShortcut&amp;)</td></tr>
+ <tr><td>void setAccel(int)</td><td>void setShortcut(const TDEShortcut&amp;)</td></tr>
</table></li>
</ul>
-<h4>KActionCollection</h4>
+<h4>TDEActionCollection</h4>
<ul>
- <li>When constructing a KActionCollection object, a pointer to the focus widget should be passed.</li>
+ <li>When constructing a TDEActionCollection object, a pointer to the focus widget should be passed.</li>
<li>The insert(), remove(), and take() methods have been deprecated.
- If you wish to keep a list of actions, use the KActionPtrList container instead.
+ If you wish to keep a list of actions, use the TDEActionPtrList container instead.
If you want to configure the shortcuts from multiple actions collections,
pass each collection to KKeyChooser or KKeyDialog via their insert() methods.</li>
</ul>
@@ -322,24 +322,24 @@ KThemeBase and KThemeStyle have been ported over to the new QStyle/KStyle API
present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in kstyles/kthemestyle
as its use is basically limited to KThemeStyle.
-<H4>KAction, KToolBar, KToolBarButton and icons</H4>
+<H4>TDEAction, TDEToolBar, TDEToolBarButton and icons</H4>
The preferred way for specifying icons is passing the icon names (and the icons will be loaded by KIconLoader),
instead of using TQIconSet or TQPixmap. This results in always using the correct icon size and allows delayed
on-demand icon loading.
<p>
-Method KAction::hasIconSet() has been renamed to KAction::hasIcon(), the old name will still work unless KDE_NO_COMPAT is defined.
-KAction::iconSet() now has an argument specifying icon group, the old KAction::iconSet() is still available unless KDE_NO_COMPAT
+Method TDEAction::hasIconSet() has been renamed to TDEAction::hasIcon(), the old name will still work unless KDE_NO_COMPAT is defined.
+TDEAction::iconSet() now has an argument specifying icon group, the old TDEAction::iconSet() is still available unless KDE_NO_COMPAT
is defined and returns KIcon::Small iconset, just like in KDE2.
<p>
-KToolBarButton methods setPixmap(), setDefaultPixmap(), setDisabledPixmap(), setDefaultIcon() and setDisabledIcon() are deprecated.
-Use KToolBarButton::setIcon() (preferred) or KToolBarButton::setIconSet() instead.
+TDEToolBarButton methods setPixmap(), setDefaultPixmap(), setDisabledPixmap(), setDefaultIcon() and setDisabledIcon() are deprecated.
+Use TDEToolBarButton::setIcon() (preferred) or TDEToolBarButton::setIconSet() instead.
-<H4>KAction and derived classes</H4>
+<H4>TDEAction and derived classes</H4>
The protected set* methods have been renamed to update* and they now take only one argument (i.e. setText(int, const TQString&)
is now updateText(int) ). Because the former second argument was always the value of the a corresponding data member, you
can simply call the accessor method (i.e. in updateText() call text() to get the text).
-<H4>KToggleAction</H4>
+<H4>TDEToggleAction</H4>
exclusiveGroup() is no more virtual. setExclusiveGroup(const
TQString&) is not a slot anymore.
@@ -563,7 +563,7 @@ flexibility and efficiency.
<br><br>
Sorting has changed radically. Previously, KFileView had protected methods QuickSort,
compareItems() and mergeLists() to sort directory entries for displaying in the views. Now,
-KFileView does not do any sorting anymore. Instead, the view's (i.e. KIconView, KListView)
+KFileView does not do any sorting anymore. Instead, the view's (i.e. KIconView, TDEListView)
sorting is utilized by letting its view-items provide a TQString key() method. Therefore,
KFileView offers the two methods
<ul>
diff --git a/TODO b/TODO
index c4772bbf..fe2c608a 100644
--- a/TODO
+++ b/TODO
@@ -33,7 +33,7 @@ that we would like to make for the next binary incompatible release.
- Clean up the uses of virtual_hook, use normal virtuals instead (e.g. KZip/KArchive)
-- Make it possible to create a KSystemTray without a KMainWindow and instead lazily
+- Make it possible to create a KSystemTray without a TDEMainWindow and instead lazily
create the main window on demand.
- Make KSystemTray's Quit option in the context menu call kapp->quit() instead of
@@ -94,12 +94,12 @@ that we would like to make for the next binary incompatible release.
QFont/QPoint/QSize is cheap enough to justify a consistent and usable API (IMHO) .
Keep source compatibility.
-- Sort out reference counting of applications and KMainWindows: Add a setRefCountEnabled()
+- Sort out reference counting of applications and TDEMainWindows: Add a setRefCountEnabled()
function to TDEApplication; deref()ing the last reference should only quit the application
if reference counts are enabled, and the reference count should be disabled by default
- so apps that don't use a KMainWindow mostly continue to work. Make the KMainWindow
- constructor call setRefCountEnabled(true), and make each KMainWindow hold its own
- reference to the application. The KMainWindow should drop its app reference on hide, and
+ so apps that don't use a TDEMainWindow mostly continue to work. Make the TDEMainWindow
+ constructor call setRefCountEnabled(true), and make each TDEMainWindow hold its own
+ reference to the application. The TDEMainWindow should drop its app reference on hide, and
regain it on show.
Make KSysTray also hold a reference to the app. Then apps that use more than one main
@@ -159,7 +159,7 @@ that we would like to make for the next binary incompatible release.
- Make API use US English, (eg. KCatalogue -> KCatalog)
-- It would be nice if some insan^H^H^H brave soul had a look at the KAccel/KShortcut/KKeyWhatever
+- It would be nice if some insan^H^H^H brave soul had a look at the TDEAccel/TDEShortcut/KKeyWhatever
classes and cleaned it up.
- KKeyDialog needs to be improved. It should simplify using KKeyChooser by not having to instantiate
@@ -209,7 +209,7 @@ an alternative help->contents action)
- Dump KPixmapIO class. QPixmap with qt-copy patches #0005 and #0007 can perform just as well,
KPixmapIO can't dither, and it generally doesn't make much sense to have this class.
-- KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
+- TDEListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
"dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :)
- Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index bc17f32d..a4307dbb 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -101,22 +101,22 @@ void KVideoWidget::init(void)
videoHeight = 0;
// Setup actions
- new KToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
+ new TDEToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
actionCollection(), "fullscreen_mode" );
- new KRadioAction( i18n("&Half Size"), ALT+Key_0,
+ new TDERadioAction( i18n("&Half Size"), ALT+Key_0,
TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()),
actionCollection(), "half_size" );
- new KRadioAction( i18n("&Normal Size"), ALT+Key_1,
+ new TDERadioAction( i18n("&Normal Size"), ALT+Key_1,
TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()),
actionCollection(), "normal_size" );
- new KRadioAction( i18n("&Double Size"), ALT+Key_2,
+ new TDERadioAction( i18n("&Double Size"), ALT+Key_2,
TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()),
actionCollection(), "double_size" );
- ((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
- ((KToggleAction *)action( "normal_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
- ((KToggleAction *)action( "double_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
+ ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
+ ((TDEToggleAction *)action( "normal_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
+ ((TDEToggleAction *)action( "double_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
action("double_size")->setEnabled(false);
action("half_size")->setEnabled(false);
@@ -232,29 +232,29 @@ bool KVideoWidget::isEmbedded()
bool KVideoWidget::isFullscreen()
{
- return ((KToggleAction *)action( "fullscreen_mode" ))->isChecked();
+ return ((TDEToggleAction *)action( "fullscreen_mode" ))->isChecked();
}
bool KVideoWidget::isHalfSize()
{
- return ((KToggleAction *)action( "half_size" ))->isChecked();
+ return ((TDEToggleAction *)action( "half_size" ))->isChecked();
}
bool KVideoWidget::isNormalSize()
{
- return ((KToggleAction *)action( "normal_size" ))->isChecked();
+ return ((TDEToggleAction *)action( "normal_size" ))->isChecked();
}
bool KVideoWidget::isDoubleSize()
{
- return ((KToggleAction *)action( "double_size" ))->isChecked();
+ return ((TDEToggleAction *)action( "double_size" ))->isChecked();
}
void KVideoWidget::setFullscreen()
{
if (!isFullscreen())
{
- ((KToggleAction *)action( "fullscreen_mode" ))->setChecked( true );
+ ((TDEToggleAction *)action( "fullscreen_mode" ))->setChecked( true );
fullscreenActivated();
}
}
@@ -263,26 +263,26 @@ void KVideoWidget::setWindowed()
{
if (isFullscreen())
{
- ((KToggleAction *)action( "fullscreen_mode" ))->setChecked( false );
+ ((TDEToggleAction *)action( "fullscreen_mode" ))->setChecked( false );
fullscreenActivated();
}
}
void KVideoWidget::setHalfSize()
{
- ((KToggleAction *)action( "half_size" ))->setChecked( true );
+ ((TDEToggleAction *)action( "half_size" ))->setChecked( true );
halfSizeActivated();
}
void KVideoWidget::setNormalSize()
{
- ((KToggleAction *)action( "normal_size" ))->setChecked( true );
+ ((TDEToggleAction *)action( "normal_size" ))->setChecked( true );
normalSizeActivated();
}
void KVideoWidget::setDoubleSize()
{
- ((KToggleAction *)action( "double_size" ))->setChecked( true );
+ ((TDEToggleAction *)action( "double_size" ))->setChecked( true );
doubleSizeActivated();
}
@@ -323,18 +323,18 @@ void KVideoWidget::resizeEvent( TQResizeEvent *event )
{
if (width() == QMAX( (videoWidth / 2), minimumWidth() ) &&
height() == QMAX( (videoHeight / 2), minimumHeight() ))
- ((KToggleAction *)action( "half_size" ))->setChecked( true );
+ ((TDEToggleAction *)action( "half_size" ))->setChecked( true );
else if (width() == QMAX( videoWidth, minimumWidth() ) &&
height() == QMAX( videoHeight, minimumHeight() ))
- ((KToggleAction *)action( "normal_size" ))->setChecked( true );
+ ((TDEToggleAction *)action( "normal_size" ))->setChecked( true );
else if (width() == QMAX( (2 * videoWidth), minimumWidth() ) &&
height() == QMAX( (2 * videoHeight), minimumHeight() ))
- ((KToggleAction *)action( "double_size" ))->setChecked( true );
+ ((TDEToggleAction *)action( "double_size" ))->setChecked( true );
else
{
- ((KToggleAction *)action( "half_size" ))->setChecked( false );
- ((KToggleAction *)action( "normal_size" ))->setChecked( false );
- ((KToggleAction *)action( "double_size" ))->setChecked( false );
+ ((TDEToggleAction *)action( "half_size" ))->setChecked( false );
+ ((TDEToggleAction *)action( "normal_size" ))->setChecked( false );
+ ((TDEToggleAction *)action( "double_size" ))->setChecked( false );
}
}
}
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 5927f371..7126d3c1 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -309,8 +309,8 @@ in that case the signal connection will always be deleted.
A receiver can create a non-volatile connection while the sender doesn't (yet)
exist. An anonymous DCOP connection should always be non-volatile.
-The following example shows how KLauncher emits a signal whenever it notices
-that an application that was started via KLauncher terminates.
+The following example shows how TDELauncher emits a signal whenever it notices
+that an application that was started via TDELauncher terminates.
QByteArray params;
QDataStream stream(params, IO_WriteOnly);
@@ -319,7 +319,7 @@ that an application that was started via KLauncher terminates.
The task manager of the TDE panel connects to this signal. It uses an
anonymous connection (it doesn't require that the signal is being emitted
-by KLauncher) that is non-volatile:
+by TDELauncher) that is non-volatile:
connectDCOPSignal(0, 0, "clientDied(pid_t)", "clientDied(pid_t)", false);
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index 42357128..62fd3cf4 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -541,8 +541,8 @@ in that case the signal connection will always be deleted.
A receiver can create a non-volatile connection while the sender doesn't (yet)
exist. An anonymous DCOP connection should always be non-volatile.
-The following example shows how KLauncher emits a signal whenever it notices
-that an application that was started via KLauncher terminates:
+The following example shows how TDELauncher emits a signal whenever it notices
+that an application that was started via TDELauncher terminates:
\code
QByteArray params;
@@ -553,7 +553,7 @@ kapp->dcopClient()->emitDCOPSignal("clientDied(pid_t)", params);
The task manager of the Trinity panel connects to this signal. It uses an
anonymous connection (it doesn't require that the signal is being emitted
-by KLauncher) that is non-volatile:
+by TDELauncher) that is non-volatile:
\code
connectDCOPSignal(0, 0, "clientDied(pid_t)", "clientDied(pid_t)", false);
diff --git a/interfaces/tdemediaplayer/player.h b/interfaces/tdemediaplayer/player.h
index 493a921e..05582ca0 100644
--- a/interfaces/tdemediaplayer/player.h
+++ b/interfaces/tdemediaplayer/player.h
@@ -39,7 +39,7 @@ namespace KMediaPlayer
*
* There are two servicetypes for Player: KMediaPlayer/Player and
* KMediaPlayer/Engine. KMediaPlayer/Player provides a widget (accessable
- * through view as well as XML GUI KActions. KMediaPlayer/Engine omits
+ * through view as well as XML GUI TDEActions. KMediaPlayer/Engine omits
* the user interface facets, for those who wish to provide their own
* interface.
*/
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index 1ff34f98..a11032ad 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -33,11 +33,11 @@
#include <tqfileinfo.h>
-ScriptLoader::ScriptLoader(KMainWindow *parent) : TQObject (parent)
+ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent)
{
m_parent = parent;
m_scripts.clear();
- m_theAction = new KSelectAction ( i18n("KDE Scripts"),
+ m_theAction = new TDESelectAction ( i18n("KDE Scripts"),
0,
this,
TQT_SLOT(runAction()),
@@ -51,7 +51,7 @@ ScriptLoader::~ScriptLoader()
m_scripts.clear();
}
-KSelectAction * ScriptLoader::getScripts()
+TDESelectAction * ScriptLoader::getScripts()
{
// Get the available scripts for this application.
TQStringList pluginList = "";
diff --git a/interfaces/tdescript/scriptloader.h b/interfaces/tdescript/scriptloader.h
index a249283d..d0b33882 100644
--- a/interfaces/tdescript/scriptloader.h
+++ b/interfaces/tdescript/scriptloader.h
@@ -33,12 +33,12 @@ class ScriptLoader : virtual public QObject
/**
* Default Constructor
*/
- ScriptLoader(KMainWindow *parent=0);
+ ScriptLoader(TDEMainWindow *parent=0);
~ScriptLoader();
- /** Return the a KSelectAction with all of the scripts
- * @returns KSelectAction containing access to all of the scripts
+ /** Return the a TDESelectAction with all of the scripts
+ * @returns TDESelectAction containing access to all of the scripts
*/
- KSelectAction *getScripts();
+ TDESelectAction *getScripts();
public slots:
/** Run the current action.
*/
@@ -52,8 +52,8 @@ class ScriptLoader : virtual public QObject
virtual void done(int errorCode);
private:
TQPtrList<KScriptInterface> m_scripts;
- KSelectAction *m_theAction;
+ TDESelectAction *m_theAction;
int m_currentSelection;
- KMainWindow *m_parent;
+ TDEMainWindow *m_parent;
};
#endif
diff --git a/interfaces/terminal/test/main.h b/interfaces/terminal/test/main.h
index 098c10d5..256b0840 100644
--- a/interfaces/terminal/test/main.h
+++ b/interfaces/terminal/test/main.h
@@ -3,7 +3,7 @@
class Win
- : public KMainWindow
+ : public TDEMainWindow
{
Q_OBJECT
KParts::Part* p;
diff --git a/kab/kabapi.cc b/kab/kabapi.cc
index 622fc708..245f07c5 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cc
@@ -36,7 +36,7 @@ using namespace std;
KabAPI::KabAPI(TQWidget* parent, const char* name)
: KDialogBase(parent, name),
book(0),
- listbox(new KListBox(this)),
+ listbox(new TDEListBox(this)),
selection(-1)
{
TQ_CHECK_PTR(listbox);
diff --git a/kab/kabapi.h b/kab/kabapi.h
index 6cf46c37..6204efc3 100644
--- a/kab/kabapi.h
+++ b/kab/kabapi.h
@@ -22,7 +22,7 @@
class TQPushButton;
class TQFrame;
-class KListBox;
+class TDEListBox;
/**
* The class KabAPI provides a public interface to access the
@@ -189,7 +189,7 @@ protected:
/**
* This displays the overview over the addresses in the dialog.
*/
- KListBox* listbox;
+ TDEListBox* listbox;
/**
* The index of the selected entry. This value is only valid after the
* KabAPI dialog has been executed and accepted by the user.
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 623d26cf..c8a1bf51 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -66,7 +66,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
TQBoxLayout *listLayout = new TQVBoxLayout;
topLayout->addLayout( listLayout );
- mAddresseeList = new KListView( topWidget );
+ mAddresseeList = new TDEListView( topWidget );
mAddresseeList->addColumn( i18n("Name") );
mAddresseeList->addColumn( i18n("Email") );
mAddresseeList->setAllColumnsShowFocus( true );
@@ -96,7 +96,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
topWidget );
selectedLayout->addWidget( selectedGroup );
- mSelectedList = new KListView( selectedGroup );
+ mSelectedList = new TDEListView( selectedGroup );
mSelectedList->addColumn( i18n("Name") );
mSelectedList->addColumn( i18n("Email") );
mSelectedList->setAllColumnsShowFocus( true );
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index ebb4bbfc..83166b50 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -143,10 +143,10 @@ class KABC_EXPORT AddresseeDialog : public KDialogBase
bool mMultiple;
- KListView *mAddresseeList;
+ TDEListView *mAddresseeList;
KLineEdit *mAddresseeEdit;
- KListView *mSelectedList;
+ TDEListView *mSelectedList;
AddressBook *mAddressBook;
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index efb0738a..1affd099 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -156,12 +156,12 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
{
bool accept = false;
- if (KStdAccel::shortcut(KStdAccel::SubstringCompletion).contains(KKey(e)))
+ if (TDEStdAccel::shortcut(TDEStdAccel::SubstringCompletion).contains(KKey(e)))
{
doCompletion(true);
accept = true;
}
- else if (KStdAccel::shortcut(KStdAccel::TextCompletion).contains(KKey(e)))
+ else if (TDEStdAccel::shortcut(TDEStdAccel::TextCompletion).contains(KKey(e)))
{
int len = text().length();
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index a8060c17..15efa5ba 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
+++ b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -293,7 +293,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
}
}
- KAcceleratorManager::manage( this );
+ TDEAcceleratorManager::manage( this );
}
AttributesDialog::~AttributesDialog()
diff --git a/kabc/resourceselectdialog.cpp b/kabc/resourceselectdialog.cpp
index 256125cd..e840e027 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/kabc/resourceselectdialog.cpp
@@ -45,7 +45,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal, this );
groupBox->setTitle( i18n( "Resources" ) );
- mResourceId = new KListBox( groupBox );
+ mResourceId = new TDEListBox( groupBox );
mainLayout->addWidget( groupBox );
diff --git a/kabc/resourceselectdialog.h b/kabc/resourceselectdialog.h
index 6441dc24..f5f2d698 100644
--- a/kabc/resourceselectdialog.h
+++ b/kabc/resourceselectdialog.h
@@ -26,7 +26,7 @@
#include <kdialog.h>
#include <kdemacros.h>
-class KListBox;
+class TDEListBox;
namespace KABC {
@@ -48,7 +48,7 @@ class KABC_EXPORT_DEPRECATED ResourceSelectDialog : KDialog
static Resource *getResource( AddressBook *ab, TQWidget *parent = 0 );
private:
- KListBox *mResourceId;
+ TDEListBox *mResourceId;
TQMap<int, Resource*> mResourceMap;
};
diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h
index c5660035..4d596fb0 100644
--- a/kate/interfaces/document.h
+++ b/kate/interfaces/document.h
@@ -77,13 +77,13 @@ class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage
void slotChanged();
};
-class KATEPARTINTERFACES_EXPORT ActionMenu : public KActionMenu
+class KATEPARTINTERFACES_EXPORT ActionMenu : public TDEActionMenu
{
Q_OBJECT
public:
ActionMenu ( const TQString& text, TQObject* parent = 0, const char* name = 0 )
- : KActionMenu(text, parent, name) { ; };
+ : TDEActionMenu(text, parent, name) { ; };
virtual ~ActionMenu () { ; };
public:
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index ed9a6169..792c5338 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -159,7 +159,7 @@ KateAutoIndent::~KateAutoIndent ()
//BEGIN KateViewIndentAction
KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name)
- : KActionMenu (text, parent, name), doc(_doc)
+ : TDEActionMenu (text, parent, name), doc(_doc)
{
connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
}
diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h
index 6c0d15d4..abdab777 100644
--- a/kate/part/kateautoindent.h
+++ b/kate/part/kateautoindent.h
@@ -190,9 +190,9 @@ class KateAutoIndent : public TQObject
/**
* This action provides a list of available indenters and gets plugged
- * into the KateView's KActionCollection.
+ * into the KateView's TDEActionCollection.
*/
-class KateViewIndentationAction : public KActionMenu
+class KateViewIndentationAction : public TDEActionMenu
{
Q_OBJECT
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index ac1ee73d..d3fb52a7 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -71,34 +71,34 @@ KateBookmarks::~KateBookmarks()
{
}
-void KateBookmarks::createActions( KActionCollection* ac )
+void KateBookmarks::createActions( TDEActionCollection* ac )
{
- m_bookmarkToggle = new KToggleAction(
+ m_bookmarkToggle = new TDEToggleAction(
i18n("Set &Bookmark"), "bookmark", CTRL+Key_B,
this, TQT_SLOT(toggleBookmark()),
ac, "bookmarks_toggle" );
m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it."));
m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") );
- m_bookmarkClear = new KAction(
+ m_bookmarkClear = new TDEAction(
i18n("Clear &All Bookmarks"), 0,
this, TQT_SLOT(clearBookmarks()),
ac, "bookmarks_clear");
m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document."));
- m_goNext = new KAction(
+ m_goNext = new TDEAction(
i18n("Next Bookmark"), "next", ALT + Key_PageDown,
this, TQT_SLOT(goNext()),
ac, "bookmarks_next");
m_goNext->setWhatsThis(i18n("Go to the next bookmark."));
- m_goPrevious = new KAction(
+ m_goPrevious = new TDEAction(
i18n("Previous Bookmark"), "previous", ALT + Key_PageUp,
this, TQT_SLOT(goPrevious()),
ac, "bookmarks_previous");
m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark."));
- m_bookmarksMenu = (new KActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
+ m_bookmarksMenu = (new TDEActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
//connect the aboutToShow() and aboutToHide() signals with
//the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots
diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h
index 63928800..ae415181 100644
--- a/kate/part/katebookmarks.h
+++ b/kate/part/katebookmarks.h
@@ -29,9 +29,9 @@ namespace KTextEditor { class Mark; }
namespace Kate { class View; }
-class KAction;
-class KToggleAction;
-class KActionCollection;
+class TDEAction;
+class TDEToggleAction;
+class TDEActionCollection;
class TQPopupMenu;
class TQMenuData;
@@ -44,7 +44,7 @@ class KateBookmarks : public TQObject
KateBookmarks( KateView* parent, Sorting sort=Position );
virtual ~KateBookmarks();
- void createActions( KActionCollection* );
+ void createActions( TDEActionCollection* );
KateBookmarks::Sorting sorting() { return m_sorting; };
void setSorting( Sorting s ) { m_sorting = s; };
@@ -69,10 +69,10 @@ class KateBookmarks : public TQObject
private:
KateView* m_view;
- KToggleAction* m_bookmarkToggle;
- KAction* m_bookmarkClear;
- KAction* m_goNext;
- KAction* m_goPrevious;
+ TDEToggleAction* m_bookmarkToggle;
+ TDEAction* m_bookmarkClear;
+ TDEAction* m_goNext;
+ TDEAction* m_goPrevious;
Sorting m_sorting;
TQPopupMenu* m_bookmarksMenu;
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 5006ddd6..099dad99 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -1095,7 +1095,7 @@ void KatePartPluginListItem::stateChange(bool b)
//BEGIN PluginListView
KatePartPluginListView::KatePartPluginListView(TQWidget *parent, const char *name)
- : KListView(parent, name)
+ : TDEListView(parent, name)
{
}
diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h
index fc9fa0a1..c97f45d9 100644
--- a/kate/part/katedialogs.h
+++ b/kate/part/katedialogs.h
@@ -52,13 +52,13 @@ namespace TDEIO
class TransferJob;
}
-class KAccel;
+class TDEAccel;
class KColorButton;
class KComboBox;
class KIntNumInput;
class KKeyButton;
class KKeyChooser;
-class KMainWindow;
+class TDEMainWindow;
class KPushButton;
class KRegExpDialog;
class KIntNumInput;
@@ -235,7 +235,7 @@ class KateEditKeyConfiguration: public KateConfigPage
bool m_ready;
class KateDocument *m_doc;
KKeyChooser* m_keyChooser;
- class KActionCollection *m_ac;
+ class TDEActionCollection *m_ac;
};
class KateSaveConfigTab : public KateConfigPage
@@ -263,7 +263,7 @@ class KateSaveConfigTab : public KateConfigPage
class KatePartPluginListItem;
-class KatePartPluginListView : public KListView
+class KatePartPluginListView : public TDEListView
{
Q_OBJECT
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index 7f448172..1b264a60 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -888,7 +888,7 @@ void KatePrintHeaderFooter::setHFFont()
{
TQFont fnt( lFontPreview->font() );
// display a font dialog
- if ( KFontDialog::getFont( fnt, false, this ) == KFontDialog::Accepted )
+ if ( TDEFontDialog::getFont( fnt, false, this ) == TDEFontDialog::Accepted )
{
// change strFont
strFont = fnt.toString();
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 0cb802e9..9a7e4e1a 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -541,8 +541,8 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char *
// sizemanagment
TQGridLayout *grid = new TQGridLayout( this, 1, 1 );
- m_fontchooser = new KFontChooser ( this, 0L, false, TQStringList(), false );
- m_fontchooser->enableColumn(KFontChooser::StyleList, false);
+ m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false );
+ m_fontchooser->enableColumn(TDEFontChooser::StyleList, false);
grid->addWidget( m_fontchooser, 0, 0);
connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
@@ -1078,7 +1078,7 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
{
if ( !dynamic_cast<KateStyleListItem*>(i) ) return;
- KPopupMenu m( this );
+ TDEPopupMenu m( this );
KateAttribute *is = i->style();
int id;
// the title is used, because the menu obscures the context name when
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index 2e92812d..6675a6bc 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -90,13 +90,13 @@ class KateSchemaManager
};
-class KateViewSchemaAction : public KActionMenu
+class KateViewSchemaAction : public TDEActionMenu
{
Q_OBJECT
public:
KateViewSchemaAction(const TQString& text, TQObject* parent = 0, const char* name = 0)
- : KActionMenu(text, parent, name) { init(); };
+ : TDEActionMenu(text, parent, name) { init(); };
~KateViewSchemaAction(){;};
@@ -226,7 +226,7 @@ class KateSchemaConfigFontTab : public TQWidget
void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
private:
- class KFontChooser *m_fontchooser;
+ class TDEFontChooser *m_fontchooser;
FontMap m_fonts;
int m_schema;
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index a7d37ead..9d0dc896 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -66,7 +66,7 @@ KateSearch::~KateSearch()
delete m_arbitraryHLList;
}
-void KateSearch::createActions( KActionCollection* ac )
+void KateSearch::createActions( TDEActionCollection* ac )
{
KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis(
i18n("Look up the first occurrence of a piece of text or regular expression."));
diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h
index bec9eb51..5ae92f56 100644
--- a/kate/part/katesearch.h
+++ b/kate/part/katesearch.h
@@ -37,7 +37,7 @@ class KateView;
class KateDocument;
class KateSuperRangeList;
-class KActionCollection;
+class TDEActionCollection;
class KateSearch : public TQObject
{
@@ -87,7 +87,7 @@ class KateSearch : public TQObject
KateSearch( KateView* );
~KateSearch();
- void createActions( KActionCollection* );
+ void createActions( TDEActionCollection* );
public slots:
void find();
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index 77e693fa..53767d67 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -51,13 +51,13 @@ KateSpell::~KateSpell()
}
}
-void KateSpell::createActions( KActionCollection* ac )
+void KateSpell::createActions( TDEActionCollection* ac )
{
KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac );
- KAction *a = new KAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
+ TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward"));
- m_spellcheckSelection = new KAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
+ m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text"));
}
diff --git a/kate/part/katespell.h b/kate/part/katespell.h
index f5a776c8..9ce41666 100644
--- a/kate/part/katespell.h
+++ b/kate/part/katespell.h
@@ -27,7 +27,7 @@
class KateView;
-class KAction;
+class TDEAction;
class KSpell;
class KateSpell : public TQObject
@@ -38,7 +38,7 @@ class KateSpell : public TQObject
KateSpell( KateView* );
~KateSpell();
- void createActions( KActionCollection* );
+ void createActions( TDEActionCollection* );
void updateActions ();
@@ -69,7 +69,7 @@ class KateSpell : public TQObject
private:
KateView *m_view;
- KAction *m_spellcheckSelection;
+ TDEAction *m_spellcheckSelection;
KSpell *m_tdespell;
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 22a4799d..03b1fa5d 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -207,8 +207,8 @@ void KateView::setupConnections()
void KateView::setupActions()
{
- KActionCollection *ac = this->actionCollection ();
- KAction *a;
+ TDEActionCollection *ac = this->actionCollection ();
+ TDEAction *a;
m_toggleWriteLock = 0;
@@ -221,7 +221,7 @@ void KateView::setupActions()
m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac);
a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard."));
- m_copyHTML = a = new KAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
+ m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard."));
if (!m_doc->readOnly())
@@ -235,56 +235,56 @@ void KateView::setupActions()
a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac);
a->setWhatsThis(i18n("Revert the most recent undo operation"));
- (new KAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
+ (new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
i18n("Use this command to wrap all lines of the current document which are longer than the width of the"
" current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated"
" when the view is resized."));
// setup Tools menu
- a=new KAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
+ a=new TDEAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>"
"You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
- a=new KAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
+ a=new TDEAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
a->setWhatsThis(i18n("Use this to unindent a selected block of text."));
- a=new KAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
+ a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>"
"You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
- a=new KAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
+ a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level."));
- a=new KAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
+ a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
ac, "tools_comment");
a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>"
"The characters for single/multiple line comments are defined within the language's highlighting."));
- a=new KAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
+ a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
ac, "tools_uncomment");
a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>"
"The characters for single/multiple line comments are defined within the language's highlighting."));
- a = m_toggleWriteLock = new KToggleAction(
+ a = m_toggleWriteLock = new TDEToggleAction(
i18n("&Read Only Mode"), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ),
ac, "tools_toggle_write_lock" );
a->setWhatsThis( i18n("Lock/unlock the document for writing") );
- a = new KAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this),
+ a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(uppercase()), ac, "tools_uppercase" );
a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the "
"right of the cursor if no text is selected.") );
- a = new KAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this),
+ a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(lowercase()), ac, "tools_lowercase" );
a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the "
"right of the cursor if no text is selected.") );
- a = new KAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this),
+ a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(capitalize()), ac, "tools_capitalize" );
a->setWhatsThis( i18n("Capitalize the selection, or the word under the "
"cursor if no text is selected.") );
- a = new KAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
+ a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
TQT_SLOT( joinLines() ), ac, "tools_join_lines" );
}
else
@@ -298,7 +298,7 @@ void KateView::setupActions()
a=KStdAction::print( m_doc, TQT_SLOT(print()), ac );
a->setWhatsThis(i18n("Print the current document."));
- a=new KAction(i18n("Reloa&d"), "reload", KStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload");
+ a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload");
a->setWhatsThis(i18n("Reload the current document from disk."));
a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac);
@@ -307,7 +307,7 @@ void KateView::setupActions()
a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac);
a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to."));
- a=new KAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
+ a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
a->setWhatsThis(i18n("Configure various aspects of this editor."));
KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight");
@@ -324,7 +324,7 @@ void KateView::setupActions()
new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation");
// html export
- a = new KAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html");
+ a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html");
a->setWhatsThis(i18n("This command allows you to export the current document"
" with all highlighting information into a HTML document."));
@@ -334,32 +334,32 @@ void KateView::setupActions()
m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac);
a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected."));
- a=new KAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
+ a=new TDEAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
a->setWhatsThis(i18n("This increases the display font size."));
- a=new KAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
+ a=new TDEAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
a->setWhatsThis(i18n("This decreases the display font size."));
- a= m_toggleBlockSelection = new KToggleAction(
+ a= m_toggleBlockSelection = new TDEToggleAction(
i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B,
TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()),
ac, "set_verticalSelect");
a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode."));
- a= m_toggleInsert = new KToggleAction(
+ a= m_toggleInsert = new TDEToggleAction(
i18n("Overwr&ite Mode"), Key_Insert,
TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()),
ac, "set_insert" );
a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text."));
- KToggleAction *toggleAction;
- a= m_toggleDynWrap = toggleAction = new KToggleAction(
+ TDEToggleAction *toggleAction;
+ a= m_toggleDynWrap = toggleAction = new TDEToggleAction(
i18n("&Dynamic Word Wrap"), Key_F10,
TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()),
ac, "view_dynamic_word_wrap" );
a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen."));
- a= m_setDynWrapIndicators = new KSelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
+ a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed"));
connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int)));
@@ -369,14 +369,14 @@ void KateView::setupActions()
list2.append(i18n("&Always On"));
m_setDynWrapIndicators->setItems(list2);
- a= toggleAction=m_toggleFoldingMarkers = new KToggleAction(
+ a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction(
i18n("Show Folding &Markers"), Key_F9,
TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()),
ac, "view_folding_markers" );
a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible."));
toggleAction->setCheckedState(i18n("Hide Folding &Markers"));
- a= m_toggleIconBar = toggleAction = new KToggleAction(
+ a= m_toggleIconBar = toggleAction = new TDEToggleAction(
i18n("Show &Icon Border"), Key_F6,
TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()),
ac, "view_border");
@@ -384,21 +384,21 @@ void KateView::setupActions()
a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance."));
toggleAction->setCheckedState(i18n("Hide &Icon Border"));
- a= toggleAction=m_toggleLineNumbers = new KToggleAction(
+ a= toggleAction=m_toggleLineNumbers = new TDEToggleAction(
i18n("Show &Line Numbers"), Key_F11,
TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()),
ac, "view_line_numbers" );
a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view."));
toggleAction->setCheckedState(i18n("Hide &Line Numbers"));
- a= m_toggleScrollBarMarks = toggleAction = new KToggleAction(
+ a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction(
i18n("Show Scroll&bar Marks"), 0,
TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()),
ac, "view_scrollbar_marks");
a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks."));
toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks"));
- a = toggleAction = m_toggleWWMarker = new KToggleAction(
+ a = toggleAction = m_toggleWWMarker = new TDEToggleAction(
i18n("Show Static &Word Wrap Marker"), 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ),
ac, "view_word_wrap_marker" );
@@ -407,13 +407,13 @@ void KateView::setupActions()
"wrap column as defined in the editing properties" ));
toggleAction->setCheckedState(i18n("Hide Static &Word Wrap Marker"));
- a= m_switchCmdLine = new KAction(
+ a= m_switchCmdLine = new TDEAction(
i18n("Switch to Command Line"), Key_F7,
TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()),
ac, "switch_to_cmd_line" );
a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view."));
- a=m_setEndOfLine = new KSelectAction(i18n("&End of Line"), 0, ac, "set_eol");
+ a=m_setEndOfLine = new TDESelectAction(i18n("&End of Line"), 0, ac, "set_eol");
a->setWhatsThis(i18n("Choose which line endings should be used, when you save the document"));
TQStringList list;
list.append("&UNIX");
@@ -437,137 +437,137 @@ void KateView::setupActions()
void KateView::setupEditActions()
{
- m_editActions = new KActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" );
- KActionCollection* ac = m_editActions;
+ m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" );
+ TDEActionCollection* ac = m_editActions;
- new KAction(
+ new TDEAction(
i18n("Move Word Left"), CTRL + Key_Left,
TQT_TQOBJECT(this),TQT_SLOT(wordLeft()),
ac, "word_left" );
- new KAction(
+ new TDEAction(
i18n("Select Character Left"), SHIFT + Key_Left,
TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()),
ac, "select_char_left" );
- new KAction(
+ new TDEAction(
i18n("Select Word Left"), SHIFT + CTRL + Key_Left,
TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()),
ac, "select_word_left" );
- new KAction(
+ new TDEAction(
i18n("Move Word Right"), CTRL + Key_Right,
TQT_TQOBJECT(this), TQT_SLOT(wordRight()),
ac, "word_right" );
- new KAction(
+ new TDEAction(
i18n("Select Character Right"), SHIFT + Key_Right,
TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()),
ac, "select_char_right" );
- new KAction(
+ new TDEAction(
i18n("Select Word Right"), SHIFT + CTRL + Key_Right,
TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()),
ac, "select_word_right" );
- new KAction(
+ new TDEAction(
i18n("Move to Beginning of Line"), Key_Home,
TQT_TQOBJECT(this), TQT_SLOT(home()),
ac, "beginning_of_line" );
- new KAction(
- i18n("Move to Beginning of Document"), KStdAccel::home(),
+ new TDEAction(
+ i18n("Move to Beginning of Document"), TDEStdAccel::home(),
TQT_TQOBJECT(this), TQT_SLOT(top()),
ac, "beginning_of_document" );
- new KAction(
+ new TDEAction(
i18n("Select to Beginning of Line"), SHIFT + Key_Home,
TQT_TQOBJECT(this), TQT_SLOT(shiftHome()),
ac, "select_beginning_of_line" );
- new KAction(
+ new TDEAction(
i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home,
TQT_TQOBJECT(this), TQT_SLOT(shiftTop()),
ac, "select_beginning_of_document" );
- new KAction(
+ new TDEAction(
i18n("Move to End of Line"), Key_End,
TQT_TQOBJECT(this), TQT_SLOT(end()),
ac, "end_of_line" );
- new KAction(
- i18n("Move to End of Document"), KStdAccel::end(),
+ new TDEAction(
+ i18n("Move to End of Document"), TDEStdAccel::end(),
TQT_TQOBJECT(this), TQT_SLOT(bottom()),
ac, "end_of_document" );
- new KAction(
+ new TDEAction(
i18n("Select to End of Line"), SHIFT + Key_End,
TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()),
ac, "select_end_of_line" );
- new KAction(
+ new TDEAction(
i18n("Select to End of Document"), SHIFT + CTRL + Key_End,
TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()),
ac, "select_end_of_document" );
- new KAction(
+ new TDEAction(
i18n("Select to Previous Line"), SHIFT + Key_Up,
TQT_TQOBJECT(this), TQT_SLOT(shiftUp()),
ac, "select_line_up" );
- new KAction(
+ new TDEAction(
i18n("Scroll Line Up"),"", CTRL + Key_Up,
TQT_TQOBJECT(this), TQT_SLOT(scrollUp()),
ac, "scroll_line_up" );
- new KAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()),
+ new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()),
ac, "move_line_down");
- new KAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()),
+ new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()),
ac, "move_line_up");
- new KAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this),
+ new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this),
TQT_SLOT(cursorRight()), ac, "move_cursor_right");
- new KAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()),
+ new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()),
ac, "move_cusor_left");
- new KAction(
+ new TDEAction(
i18n("Select to Next Line"), SHIFT + Key_Down,
TQT_TQOBJECT(this), TQT_SLOT(shiftDown()),
ac, "select_line_down" );
- new KAction(
+ new TDEAction(
i18n("Scroll Line Down"), CTRL + Key_Down,
TQT_TQOBJECT(this), TQT_SLOT(scrollDown()),
ac, "scroll_line_down" );
- new KAction(
- i18n("Scroll Page Up"), KStdAccel::prior(),
+ new TDEAction(
+ i18n("Scroll Page Up"), TDEStdAccel::prior(),
TQT_TQOBJECT(this), TQT_SLOT(pageUp()),
ac, "scroll_page_up" );
- new KAction(
+ new TDEAction(
i18n("Select Page Up"), SHIFT + Key_PageUp,
TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()),
ac, "select_page_up" );
- new KAction(
+ new TDEAction(
i18n("Move to Top of View"), CTRL + Key_PageUp,
TQT_TQOBJECT(this), TQT_SLOT(topOfView()),
ac, "move_top_of_view" );
- new KAction(
+ new TDEAction(
i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp,
TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()),
ac, "select_top_of_view" );
- new KAction(
- i18n("Scroll Page Down"), KStdAccel::next(),
+ new TDEAction(
+ i18n("Scroll Page Down"), TDEStdAccel::next(),
TQT_TQOBJECT(this), TQT_SLOT(pageDown()),
ac, "scroll_page_down" );
- new KAction(
+ new TDEAction(
i18n("Select Page Down"), SHIFT + Key_PageDown,
TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()),
ac, "select_page_down" );
- new KAction(
+ new TDEAction(
i18n("Move to Bottom of View"), CTRL + Key_PageDown,
TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()),
ac, "move_bottom_of_view" );
- new KAction(
+ new TDEAction(
i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown,
TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()),
ac, "select_bottom_of_view" );
- new KAction(
+ new TDEAction(
i18n("Move to Matching Bracket"), CTRL + Key_6,
TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()),
ac, "to_matching_bracket" );
- new KAction(
+ new TDEAction(
i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6,
TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()),
ac, "select_matching_bracket" );
@@ -575,34 +575,34 @@ void KateView::setupEditActions()
// anders: shortcuts doing any changes should not be created in browserextension
if ( !m_doc->readOnly() )
{
- new KAction(
+ new TDEAction(
i18n("Transpose Characters"), CTRL + Key_T,
TQT_TQOBJECT(this), TQT_SLOT(transpose()),
ac, "transpose_char" );
- new KAction(
+ new TDEAction(
i18n("Delete Line"), CTRL + Key_K,
TQT_TQOBJECT(this), TQT_SLOT(killLine()),
ac, "delete_line" );
- new KAction(
- i18n("Delete Word Left"), KStdAccel::deleteWordBack(),
+ new TDEAction(
+ i18n("Delete Word Left"), TDEStdAccel::deleteWordBack(),
TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()),
ac, "delete_word_left" );
- new KAction(
- i18n("Delete Word Right"), KStdAccel::deleteWordForward(),
+ new TDEAction(
+ i18n("Delete Word Right"), TDEStdAccel::deleteWordForward(),
TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()),
ac, "delete_word_right" );
- new KAction(i18n("Delete Next Character"), Key_Delete,
+ new TDEAction(i18n("Delete Next Character"), Key_Delete,
TQT_TQOBJECT(this), TQT_SLOT(keyDelete()),
ac, "delete_next_character");
- KAction *a = new KAction(i18n("Backspace"), Key_Backspace,
+ TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace,
TQT_TQOBJECT(this), TQT_SLOT(backspace()),
ac, "backspace");
- KShortcut cut = a->shortcut();
+ TDEShortcut cut = a->shortcut();
cut.append( KKey( SHIFT + Key_Backspace ) );
a->setShortcut( cut );
}
@@ -624,18 +624,18 @@ void KateView::setupEditActions()
void KateView::setupCodeFolding()
{
- KActionCollection *ac=this->actionCollection();
- new KAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
+ TDEActionCollection *ac=this->actionCollection();
+ new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel");
- new KAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
+ new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel");
- new KAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
+ new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal");
- new KAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
+ new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal");
#ifdef DEBUGACCELS
- KAccel* debugAccels = new KAccel(this,TQT_TQOBJECT(this));
+ TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this));
debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree()));
debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode()));
debugAccels->setEnabled(true);
@@ -760,7 +760,7 @@ void KateView::slotReadWriteChanged ()
<< "edit_undo" << "edit_redo" << "tools_spelling_from_cursor"
<< "tools_spelling_selection";
- KAction *a = 0;
+ TDEAction *a = 0;
for (uint z = 0; z < l.size(); z++)
if ((a = actionCollection()->action( l[z].ascii() )))
a->setEnabled (m_doc->isReadWrite());
@@ -1256,7 +1256,7 @@ void KateView::updateFoldingConfig ()
l << "folding_toplevel" << "folding_expandtoplevel"
<< "folding_collapselocal" << "folding_expandlocal";
- KAction *a = 0;
+ TDEAction *a = 0;
for (uint z = 0; z < l.size(); z++)
if ((a = actionCollection()->action( l[z].ascii() )))
a->setEnabled (m_doc->highlight() && m_doc->highlight()->allowsFolding());
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index 1d6a1016..0a00ab1f 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -44,10 +44,10 @@ class KateViewSchemaAction;
class KateRenderer;
class KateSpell;
-class KToggleAction;
-class KAction;
-class KRecentFilesAction;
-class KSelectAction;
+class TDEToggleAction;
+class TDEAction;
+class TDERecentFilesAction;
+class TDESelectAction;
class TQGridLayout;
@@ -429,7 +429,7 @@ class KateView : public Kate::View,
// Is it really necessary to have 3 methods for this?! :)
KateDocument* doc() const { return m_doc; }
- KActionCollection* editActionCollection() const { return m_editActions; }
+ TDEActionCollection* editActionCollection() const { return m_editActions; }
public slots:
void slotNewUndo();
@@ -472,31 +472,31 @@ class KateView : public Kate::View,
void setupCodeFolding();
void setupCodeCompletion();
- KActionCollection* m_editActions;
- KAction* m_editUndo;
- KAction* m_editRedo;
- KRecentFilesAction* m_fileRecent;
- KToggleAction* m_toggleFoldingMarkers;
- KToggleAction* m_toggleIconBar;
- KToggleAction* m_toggleLineNumbers;
- KToggleAction* m_toggleScrollBarMarks;
- KToggleAction* m_toggleDynWrap;
- KSelectAction* m_setDynWrapIndicators;
- KToggleAction* m_toggleWWMarker;
- KAction* m_switchCmdLine;
-
- KSelectAction* m_setEndOfLine;
-
- KAction *m_cut;
- KAction *m_copy;
- KAction *m_copyHTML;
- KAction *m_paste;
- KAction *m_selectAll;
- KAction *m_deSelect;
-
- KToggleAction *m_toggleBlockSelection;
- KToggleAction *m_toggleInsert;
- KToggleAction *m_toggleWriteLock;
+ TDEActionCollection* m_editActions;
+ TDEAction* m_editUndo;
+ TDEAction* m_editRedo;
+ TDERecentFilesAction* m_fileRecent;
+ TDEToggleAction* m_toggleFoldingMarkers;
+ TDEToggleAction* m_toggleIconBar;
+ TDEToggleAction* m_toggleLineNumbers;
+ TDEToggleAction* m_toggleScrollBarMarks;
+ TDEToggleAction* m_toggleDynWrap;
+ TDESelectAction* m_setDynWrapIndicators;
+ TDEToggleAction* m_toggleWWMarker;
+ TDEAction* m_switchCmdLine;
+
+ TDESelectAction* m_setEndOfLine;
+
+ TDEAction *m_cut;
+ TDEAction *m_copy;
+ TDEAction *m_copyHTML;
+ TDEAction *m_paste;
+ TDEAction *m_selectAll;
+ TDEAction *m_deSelect;
+
+ TDEToggleAction *m_toggleBlockSelection;
+ TDEToggleAction *m_toggleInsert;
+ TDEToggleAction *m_toggleWriteLock;
KateDocument* m_doc;
KateViewInternal* m_viewInternal;
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index eca6716c..fc007298 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -1168,7 +1168,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
//END KateIconBorder
KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name)
- : KActionMenu (text, parent, name), doc(_doc), view (_view)
+ : TDEActionMenu (text, parent, name), doc(_doc), view (_view)
{
connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
}
diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h
index 1205ea99..0faa9030 100644
--- a/kate/part/kateviewhelpers.h
+++ b/kate/part/kateviewhelpers.h
@@ -182,7 +182,7 @@ class KateIconBorder : public TQWidget
mutable TQColor m_oldBackgroundColor;
};
-class KateViewEncodingAction : public KActionMenu
+class KateViewEncodingAction : public TDEActionMenu
{
Q_OBJECT
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 1463c8bc..1a7b73bf 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -511,7 +511,7 @@ int main(int argc, char *argv[])
// create widgets
KateFactory *fac = KateFactory::self();
- KMainWindow *toplevel = new KMainWindow();
+ TDEMainWindow *toplevel = new TDEMainWindow();
KateDocument *part = new KateDocument(/*bSingleViewMode*/true,
/*bBrowserView*/false,
/*bReadOnly*/false,
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index cf3190c4..449675f6 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -253,7 +253,7 @@ void ABGlobal::writeConfig()
class AutoBookmarkEntItem : public QListViewItem
{
public:
- AutoBookmarkEntItem( KListView *lv, AutoBookmarkEnt *e )
+ AutoBookmarkEntItem( TDEListView *lv, AutoBookmarkEnt *e )
: TQListViewItem( lv ),
ent( e )
{
@@ -383,7 +383,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char
TQLabel *l = new TQLabel( i18n("&Patterns"), this );
lo->addWidget( l );
- lvPatterns = new KListView( this );
+ lvPatterns = new TDEListView( this );
lvPatterns->addColumn( i18n("Pattern") );
lvPatterns->addColumn( i18n("Mime Types") );
lvPatterns->addColumn( i18n("File Masks") );
diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h
index 4a7b998d..9687d8ce 100644
--- a/kate/plugins/autobookmarker/autobookmarker.h
+++ b/kate/plugins/autobookmarker/autobookmarker.h
@@ -111,7 +111,7 @@ class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage
void slotEdit();
private:
- class KListView *lvPatterns;
+ class TDEListView *lvPatterns;
class TQPushButton *btnNew, *btnDel, *btnEdit;
ABEntityList *m_ents;
};
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index aa9f998b..2f0d01ed 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -76,7 +76,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char
view->insertChildClient( this );
setInstance( KGenericFactory<InsertFilePlugin>::instance() );
_job = 0;
- (void) new KAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
+ (void) new TDEAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
setXMLFile( "tdetexteditor_insertfileui.rc" );
}
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index de1c1c37..758449fb 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -64,11 +64,11 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
setInstance( KGenericFactory<ISearchPlugin>::instance() );
- m_searchForwardAction = new KAction(
+ m_searchForwardAction = new TDEAction(
i18n("Search Incrementally"), CTRL+ALT+Key_F,
this, TQT_SLOT(slotSearchForwardAction()),
actionCollection(), "edit_isearch" );
- m_searchBackwardAction = new KAction(
+ m_searchBackwardAction = new TDEAction(
i18n("Search Incrementally Backwards"), CTRL+ALT+SHIFT+Key_F,
this, TQT_SLOT(slotSearchBackwardAction()),
actionCollection(), "edit_isearch_reverse" );
@@ -97,13 +97,13 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
m_comboAction->setAutoSized( true );
m_comboAction->setShortcutConfigurable( false );
- KActionMenu* optionMenu = new KActionMenu(
+ TDEActionMenu* optionMenu = new TDEActionMenu(
i18n("Search Options"), "configure",
actionCollection(), "isearch_options" );
optionMenu->setDelayed( false );
- KToggleAction* action = new KToggleAction(
- i18n("Case Sensitive"), KShortcut(),
+ TDEToggleAction* action = new TDEToggleAction(
+ i18n("Case Sensitive"), TDEShortcut(),
actionCollection(), "isearch_case_sensitive" );
action->setShortcutConfigurable( false );
connect( action, TQT_SIGNAL(toggled(bool)),
@@ -111,8 +111,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
action->setChecked( m_caseSensitive );
optionMenu->insert( action );
- action = new KToggleAction(
- i18n("From Beginning"), KShortcut(),
+ action = new TDEToggleAction(
+ i18n("From Beginning"), TDEShortcut(),
actionCollection(), "isearch_from_beginning" );
action->setShortcutConfigurable( false );
connect( action, TQT_SIGNAL(toggled(bool)),
@@ -120,8 +120,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
action->setChecked( m_fromBeginning );
optionMenu->insert( action );
- action = new KToggleAction(
- i18n("Regular Expression"), KShortcut(),
+ action = new TDEToggleAction(
+ i18n("Regular Expression"), TDEShortcut(),
actionCollection(), "isearch_reg_exp" );
action->setShortcutConfigurable( false );
connect( action, TQT_SIGNAL(toggled(bool)),
@@ -129,10 +129,10 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
action->setChecked( m_regExp );
optionMenu->insert( action );
-// optionMenu->insert( new KActionSeparator() );
+// optionMenu->insert( new TDEActionSeparator() );
//
-// action = new KToggleAction(
-// i18n("Auto-Wrap Search"), KShortcut(),
+// action = new TDEToggleAction(
+// i18n("Auto-Wrap Search"), TDEShortcut(),
// actionCollection(), "isearch_auto_wrap" );
// connect( action, TQT_SIGNAL(toggled(bool)),
// this, TQT_SLOT(setAutoWrap(bool)) );
diff --git a/kate/plugins/isearch/ISearchPlugin.h b/kate/plugins/isearch/ISearchPlugin.h
index 98063079..b11b2a8b 100644
--- a/kate/plugins/isearch/ISearchPlugin.h
+++ b/kate/plugins/isearch/ISearchPlugin.h
@@ -92,8 +92,8 @@ private:
KTextEditor::SearchInterface* m_searchIF;
KTextEditor::ViewCursorInterface* m_cursorIF;
KTextEditor::SelectionInterface* m_selectIF;
- KAction* m_searchForwardAction;
- KAction* m_searchBackwardAction;
+ TDEAction* m_searchForwardAction;
+ TDEAction* m_searchBackwardAction;
KWidgetAction* m_comboAction;
TQGuardedPtr<TQLabel> m_label;
TQGuardedPtr<KHistoryCombo> m_combo;
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index 832ff5eb..829a0f31 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -75,7 +75,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view )
view->insertChildClient (this);
setInstance( KGenericFactory<KDataToolPlugin>::instance() );
- m_menu = new KActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool");
+ m_menu = new TDEActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool");
connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow()));
setXMLFile("tdetexteditor_kdatatoolui.rc");
@@ -96,7 +96,7 @@ void KDataToolPluginView::aboutToShow()
m_wordUnderCursor = TQString::null;
// unplug old actions, if any:
- KAction *ac;
+ TDEAction *ac;
for ( ac = m_actionList.first(); ac; ac = m_actionList.next() ) {
m_menu->remove(ac);
}
@@ -150,7 +150,7 @@ void KDataToolPluginView::aboutToShow()
m_singleWord = true;
m_singleWord_line = line;
} else {
- m_notAvailable = new KAction(i18n("(not available)"), TQString::null, 0, this,
+ m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this,
TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av");
m_menu->insert(m_notAvailable);
return;
@@ -172,7 +172,7 @@ void KDataToolPluginView::aboutToShow()
}
if( m_actionList.isEmpty() ) {
- m_notAvailable = new KAction(i18n("(not available)"), TQString::null, 0, this,
+ m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this,
TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av");
m_menu->insert(m_notAvailable);
}
diff --git a/kate/plugins/kdatatool/kate_kdatatool.h b/kate/plugins/kdatatool/kate_kdatatool.h
index ac437dd1..a217c6f2 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.h
+++ b/kate/plugins/kdatatool/kate_kdatatool.h
@@ -26,7 +26,7 @@
#include <kxmlguiclient.h>
#include <tqguardedptr.h>
-class KActionMenu;
+class TDEActionMenu;
class KDataToolInfo;
namespace KTextEditor
@@ -62,9 +62,9 @@ private:
bool m_singleWord;
int m_singleWord_line, m_singleWord_start, m_singleWord_end;
TQString m_wordUnderCursor;
- TQPtrList<KAction> m_actionList;
- TQGuardedPtr<KActionMenu> m_menu;
- KAction *m_notAvailable;
+ TQPtrList<TDEAction> m_actionList;
+ TQGuardedPtr<TDEActionMenu> m_menu;
+ TDEAction *m_notAvailable;
protected slots:
void aboutToShow();
void slotToolActivated( const KDataToolInfo &datatoolinfo, const TQString &string );
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index fbd5a4db..4c38b128 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -130,7 +130,7 @@ struct DocWordCompletionPluginViewPrivate
TQString last; // last word we were trying to match
TQString lastIns; // latest applied completion
TQRegExp re; // hrm
- KToggleAction *autopopup; // for accessing state
+ TDEToggleAction *autopopup; // for accessing state
uint treshold; // the required length of a word before popping up the completion list automatically
int directionalPos; // be able to insert "" at the correct time
};
@@ -145,15 +145,15 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au
view->insertChildClient( this );
setInstance( KGenericFactory<DocWordCompletionPlugin>::instance() );
- (void) new KAction( i18n("Reuse Word Above"), CTRL+Key_8, this,
+ (void) new TDEAction( i18n("Reuse Word Above"), CTRL+Key_8, this,
TQT_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" );
- (void) new KAction( i18n("Reuse Word Below"), CTRL+Key_9, this,
+ (void) new TDEAction( i18n("Reuse Word Below"), CTRL+Key_9, this,
TQT_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" );
- (void) new KAction( i18n("Pop Up Completion List"), 0, this,
+ (void) new TDEAction( i18n("Pop Up Completion List"), 0, this,
TQT_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" );
- (void) new KAction( i18n("Shell Completion"), 0, this,
+ (void) new TDEAction( i18n("Shell Completion"), 0, this,
TQT_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" );
- d->autopopup = new KToggleAction( i18n("Automatic Completion Popup"), 0, this,
+ d->autopopup = new TDEToggleAction( i18n("Automatic Completion Popup"), 0, this,
TQT_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" );
d->autopopup->setChecked( autopopup );
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 704dd9fb..ed002b53 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -468,7 +468,7 @@ void Kded::runDelayedCheck()
void Kded::recreate(bool initial)
{
m_recreateBusy = true;
- // Using KLauncher here is difficult since we might not have a
+ // Using TDELauncher here is difficult since we might not have a
// database
if (!initial)
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index 0a4bf622..6de9e90d 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -55,19 +55,19 @@ Group=Graphics (KDE)
ToolTip=Fullfeatured edit box with buttons (KDE)
Group=Views (KDE)
-[KFontCombo]
+[TDEFontCombo]
ToolTip=Font Combo Box (KDE)
WhatsThis=A TQCombo Box showing the installed system fonts (with preview)
Group=Input (KDE)
-[KFontChooser]
+[TDEFontChooser]
IncludeFile=kfontdialog.h
IconSet=kfontcombo.png
ToolTip=Font Chooser (KDE)
WhatsThis=A font type, size and style selection widget complete with preview
Group=Input (KDE)
-[KFontRequester]
+[TDEFontRequester]
IncludeFile=kfontrequester.h
ToolTip=Font Requester (KDE)
WhatsThis=A compact font selection and preview widget
@@ -94,12 +94,12 @@ ToolTip=LED Widget (KDE)
WhatsThis=A widget showing a light emitter diode
Group=Display (KDE)
-[KListBox]
+[TDEListBox]
ToolTip=Extended List Box (KDE)
WhatsThis=An improved version of the TQListBox that follows KDE settings
Group=Views (KDE)
-[KListView]
+[TDEListView]
ToolTip=Extended List View (KDE)
WhatsThis=An improved version of the TQListView that allows certain KDE extensions
Group=Views (KDE)
@@ -108,12 +108,12 @@ Group=Views (KDE)
ToolTip=Line Edit (KDE)
Group=Input (KDE)
-[KListViewSearchLine]
+[TDEListViewSearchLine]
ToolTip=ListView Search Line (KDE)
Group=Input (KDE)
ConstructorArgs=(parent, 0, name)
-[KListViewSearchLineWidget]
+[TDEListViewSearchLineWidget]
ToolTip=ListView Search Line Widget (KDE)
IncludeFile=klistviewsearchline.h
Group=Input (KDE)
@@ -243,7 +243,7 @@ ToolTip=A widget that provides a image preview of a URL
Group=Display (KDE)
ConstructorArgs=(parent)
-[KActionSelector]
+[TDEActionSelector]
IncludeFile=kactionselector.h
ToolTip=A widget for selecting and arranging actions/objects
Group=Views (KDE)
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index ed320bc6..92874ec3 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -55,19 +55,19 @@ Group=Graphics (KDE)
ToolTip=Fullfeatured edit box with buttons (KDE)
Group=Views (KDE)
-[KFontCombo]
+[TDEFontCombo]
ToolTip=Font Combo Box (KDE)
WhatsThis=A QCombo Box showing the installed system fonts (with preview)
Group=Input (KDE)
-[KFontChooser]
+[TDEFontChooser]
IncludeFile=kfontdialog.h
IconSet=kfontcombo.png
ToolTip=Font Chooser (KDE)
WhatsThis=A font type, size and style selection widget complete with preview
Group=Input (KDE)
-[KFontRequester]
+[TDEFontRequester]
IncludeFile=kfontrequester.h
ToolTip=Font Requester (KDE)
WhatsThis=A compact font selection and preview widget
@@ -94,12 +94,12 @@ ToolTip=LED Widget (KDE)
WhatsThis=A widget showing a light emitter diode
Group=Display (KDE)
-[KListBox]
+[TDEListBox]
ToolTip=Extended List Box (KDE)
WhatsThis=An improved version of the QListBox that follows KDE settings
Group=Views (KDE)
-[KListView]
+[TDEListView]
ToolTip=Extended List View (KDE)
WhatsThis=An improved version of the QListView that allows certain KDE extensions
Group=Views (KDE)
@@ -232,7 +232,7 @@ ToolTip=A widget that provides a image preview of a URL
Group=Display (KDE)
ConstructorArgs=(parent)
-[KActionSelector]
+[TDEActionSelector]
IncludeFile=kactionselector.h
ToolTip=A widget for selecting and arranging actions/objects
Group=Views (KDE)
diff --git a/kinit/README.DCOP b/kinit/README.DCOP
index af5aff80..cd5ba983 100644
--- a/kinit/README.DCOP
+++ b/kinit/README.DCOP
@@ -1,4 +1,4 @@
-"KLauncher" supports the following DCOP functions:
+"TDELauncher" supports the following DCOP functions:
/**
* Starts a program.
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 16946fb2..c1ba0920 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -1074,9 +1074,9 @@ static void launcher_died()
return;
}
- // KLauncher died... restart
+ // TDELauncher died... restart
#ifndef NDEBUG
- fprintf(stderr, "[tdeinit] KLauncher died unexpectedly.\n");
+ fprintf(stderr, "[tdeinit] TDELauncher died unexpectedly.\n");
#endif
// Make sure it's really dead.
if (d.launcher_pid)
@@ -1092,7 +1092,7 @@ static void launcher_died()
pid_t pid = launch( 1, "tdelauncher", 0 );
#ifndef NDEBUG
- fprintf(stderr, "[tdeinit] Relaunching KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
+ fprintf(stderr, "[tdeinit] Relaunching TDELauncher, pid = %ld result = %d\n", (long) pid, d.result);
#endif
}
@@ -1819,7 +1819,7 @@ int main(int argc, char **argv, char **envp)
else
pid = launch( 1, "tdelauncher", 0 );
#ifndef NDEBUG
- fprintf(stderr, "[tdeinit] Launched KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
+ fprintf(stderr, "[tdeinit] Launched TDELauncher, pid = %ld result = %d\n", (long) pid, d.result);
#endif
handle_requests(pid); // Wait for tdelauncher to be ready
}
diff --git a/kinit/tdelauncher.cpp b/kinit/tdelauncher.cpp
index 45dbd863..7b75bfaf 100644
--- a/kinit/tdelauncher.cpp
+++ b/kinit/tdelauncher.cpp
@@ -63,7 +63,7 @@
using namespace TDEIO;
-template class TQPtrList<KLaunchRequest>;
+template class TQPtrList<TDELaunchRequest>;
template class TQPtrList<IdleSlave>;
IdleSlave::IdleSlave(TDESocket *socket)
@@ -162,7 +162,7 @@ IdleSlave::age(time_t now)
return (int) difftime(now, mBirthDate);
}
-KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
+TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
// : TDEApplication( false, false ), // No Styles, No GUI
: TDEApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
DCOPObject("tdelauncher"),
@@ -186,7 +186,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
if (domainname.status() != 0)
{
// Sever error!
- tqDebug("KLauncher: Fatal error, can't create tempfile!");
+ tqDebug("TDELauncher: Fatal error, can't create tempfile!");
::exit(1);
}
mPoolSocketName = domainname.name();
@@ -224,12 +224,12 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
write(tdeinitSocket, &request_header, sizeof(request_header));
}
-KLauncher::~KLauncher()
+TDELauncher::~TDELauncher()
{
close();
}
-void KLauncher::close()
+void TDELauncher::close()
{
if (!mPoolSocketName.isEmpty())
{
@@ -244,15 +244,15 @@ void KLauncher::close()
}
void
-KLauncher::destruct(int exit_code)
+TDELauncher::destruct(int exit_code)
{
- if (kapp) ((KLauncher*)kapp)->close();
+ if (kapp) ((TDELauncher*)kapp)->close();
// We don't delete kapp here, that's intentional.
::exit(exit_code);
}
bool
-KLauncher::process(const TQCString &fun, const TQByteArray &data,
+TDELauncher::process(const TQCString &fun, const TQByteArray &data,
TQCString &replyType, TQByteArray &replyData)
{
if ((fun == "exec_blind(TQCString,TQValueList<TQCString>)")
@@ -267,7 +267,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
stream >> name >> arg_list;
if( fun == "exec_blind(TQCString,TQValueList<TQCString>,TQValueList<TQCString>,TQCString)" )
stream >> envs >> startup_id;
- kdDebug(7016) << "KLauncher: Got exec_blind('" << name << "', ...)" << endl;
+ kdDebug(7016) << "TDELauncher: Got exec_blind('" << name << "', ...)" << endl;
exec_blind( name, arg_list, envs, startup_id);
return true;
}
@@ -315,29 +315,29 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
bool finished;
if (strncmp(fun, "start_service_by_name(", 22) == 0)
{
- kdDebug(7016) << "KLauncher: Got start_service_by_name('" << serviceName << "', ...)" << endl;
+ kdDebug(7016) << "TDELauncher: Got start_service_by_name('" << serviceName << "', ...)" << endl;
finished = start_service_by_name(serviceName, urls, envs, startup_id, bNoWait);
}
else if (strncmp(fun, "start_service_by_desktop_path(", 30) == 0)
{
- kdDebug(7016) << "KLauncher: Got start_service_by_desktop_path('" << serviceName << "', ...)" << endl;
+ kdDebug(7016) << "TDELauncher: Got start_service_by_desktop_path('" << serviceName << "', ...)" << endl;
finished = start_service_by_desktop_path(serviceName, urls, envs, startup_id, bNoWait);
}
else if (strncmp(fun, "start_service_by_desktop_name(", 30) == 0)
{
- kdDebug(7016) << "KLauncher: Got start_service_by_desktop_name('" << serviceName << "', ...)" << endl;
+ kdDebug(7016) << "TDELauncher: Got start_service_by_desktop_name('" << serviceName << "', ...)" << endl;
finished = start_service_by_desktop_name(serviceName, urls, envs, startup_id, bNoWait );
}
else if ((fun == "tdeinit_exec(TQString,TQStringList)")
|| (fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)")
|| (fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)"))
{
- kdDebug(7016) << "KLauncher: Got tdeinit_exec('" << serviceName << "', ...)" << endl;
+ kdDebug(7016) << "TDELauncher: Got tdeinit_exec('" << serviceName << "', ...)" << endl;
finished = tdeinit_exec(serviceName, urls, envs, startup_id, false);
}
else
{
- kdDebug(7016) << "KLauncher: Got tdeinit_exec_wait('" << serviceName << "', ...)" << endl;
+ kdDebug(7016) << "TDELauncher: Got tdeinit_exec_wait('" << serviceName << "', ...)" << endl;
finished = tdeinit_exec(serviceName, urls, envs, startup_id, true);
}
if (!finished)
@@ -397,7 +397,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
else if (fun == "reparseConfiguration()")
{
TDEGlobal::config()->reparseConfiguration();
- kdDebug(7016) << "KLauncher::process : reparseConfiguration" << endl;
+ kdDebug(7016) << "TDELauncher::process : reparseConfiguration" << endl;
KProtocolManager::reparseConfiguration();
IdleSlave *slave;
for(slave = mSlaveList.first(); slave; slave = mSlaveList.next())
@@ -409,7 +409,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
{
::signal( SIGHUP, SIG_IGN);
::signal( SIGTERM, SIG_IGN);
- kdDebug() << "KLauncher::process ---> terminateKDE" << endl;
+ kdDebug() << "TDELauncher::process ---> terminateKDE" << endl;
tdelauncher_header request_header;
request_header.cmd = LAUNCHER_TERMINATE_KDE;
request_header.arg_length = 0;
@@ -418,14 +418,14 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
}
else if (fun == "autoStart()")
{
- kdDebug() << "KLauncher::process ---> autoStart" << endl;
+ kdDebug() << "TDELauncher::process ---> autoStart" << endl;
autoStart(1);
replyType = "void";
return true;
}
else if (fun == "autoStart(int)")
{
- kdDebug() << "KLauncher::process ---> autoStart(int)" << endl;
+ kdDebug() << "TDELauncher::process ---> autoStart(int)" << endl;
TQDataStream stream(data, IO_ReadOnly);
int phase;
stream >> phase;
@@ -443,15 +443,15 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
}
QCStringList
-KLauncher::interfaces()
+TDELauncher::interfaces()
{
QCStringList ifaces = DCOPObject::interfaces();
- ifaces += "KLauncher";
+ ifaces += "TDELauncher";
return ifaces;
}
QCStringList
-KLauncher::functions()
+TDELauncher::functions()
{
QCStringList funcs = DCOPObject::functions();
funcs << "void exec_blind(TQCString,TQValueList<TQCString>)";
@@ -480,7 +480,7 @@ KLauncher::functions()
return funcs;
}
-void KLauncher::setLaunchEnv(const TQCString &name, const TQCString &_value)
+void TDELauncher::setLaunchEnv(const TQCString &name, const TQCString &_value)
{
TQCString value(_value);
if (value.isNull())
@@ -522,7 +522,7 @@ read_socket(int sock, char *buffer, int len)
void
-KLauncher::slotKDEInitData(int)
+TDELauncher::slotKDEInitData(int)
{
tdelauncher_header request_header;
TQByteArray requestData;
@@ -572,25 +572,25 @@ KLauncher::slotKDEInitData(int)
{
case KService::DCOP_None:
{
- lastRequest->status = KLaunchRequest::Running;
+ lastRequest->status = TDELaunchRequest::Running;
break;
}
case KService::DCOP_Unique:
{
- lastRequest->status = KLaunchRequest::Launching;
+ lastRequest->status = TDELaunchRequest::Launching;
break;
}
case KService::DCOP_Wait:
{
- lastRequest->status = KLaunchRequest::Launching;
+ lastRequest->status = TDELaunchRequest::Launching;
break;
}
case KService::DCOP_Multi:
{
- lastRequest->status = KLaunchRequest::Launching;
+ lastRequest->status = TDELaunchRequest::Launching;
break;
}
}
@@ -599,7 +599,7 @@ KLauncher::slotKDEInitData(int)
}
if (lastRequest && (request_header.cmd == LAUNCHER_ERROR))
{
- lastRequest->status = KLaunchRequest::Error;
+ lastRequest->status = TDELaunchRequest::Error;
if (!requestData.isEmpty())
lastRequest->errorMsg = TQString::fromUtf8((char *) requestData.data());
lastRequest = 0;
@@ -611,20 +611,20 @@ KLauncher::slotKDEInitData(int)
}
void
-KLauncher::processDied(pid_t pid, long /* exitStatus */)
+TDELauncher::processDied(pid_t pid, long /* exitStatus */)
{
- KLaunchRequest *request = requestList.first();
+ TDELaunchRequest *request = requestList.first();
for(; request; request = requestList.next())
{
if (request->pid == pid)
{
if (request->dcop_service_type == KService::DCOP_Wait)
- request->status = KLaunchRequest::Done;
+ request->status = TDELaunchRequest::Done;
else if ((request->dcop_service_type == KService::DCOP_Unique) &&
(dcopClient()->isApplicationRegistered(request->dcop_name)))
- request->status = KLaunchRequest::Running;
+ request->status = TDELaunchRequest::Running;
else
- request->status = KLaunchRequest::Error;
+ request->status = TDELaunchRequest::Error;
requestDone(request);
return;
}
@@ -632,17 +632,17 @@ KLauncher::processDied(pid_t pid, long /* exitStatus */)
}
void
-KLauncher::slotAppRegistered(const TQCString &appId)
+TDELauncher::slotAppRegistered(const TQCString &appId)
{
const char *cAppId = appId.data();
if (!cAppId) return;
- KLaunchRequest *request = requestList.first();
- KLaunchRequest *nextRequest;
+ TDELaunchRequest *request = requestList.first();
+ TDELaunchRequest *nextRequest;
for(; request; request = nextRequest)
{
nextRequest = requestList.next();
- if (request->status != KLaunchRequest::Launching)
+ if (request->status != TDELaunchRequest::Launching)
continue;
// For unique services check the requested service name first
@@ -650,7 +650,7 @@ KLauncher::slotAppRegistered(const TQCString &appId)
((appId == request->dcop_name) ||
dcopClient()->isApplicationRegistered(request->dcop_name)))
{
- request->status = KLaunchRequest::Running;
+ request->status = TDELaunchRequest::Running;
requestDone(request);
continue;
}
@@ -663,7 +663,7 @@ KLauncher::slotAppRegistered(const TQCString &appId)
((cAppId[l] == '\0') || (cAppId[l] == '-')))
{
request->dcop_name = appId;
- request->status = KLaunchRequest::Running;
+ request->status = TDELaunchRequest::Running;
requestDone(request);
continue;
}
@@ -671,7 +671,7 @@ KLauncher::slotAppRegistered(const TQCString &appId)
}
void
-KLauncher::autoStart(int phase)
+TDELauncher::autoStart(int phase)
{
if( mAutoStart.phase() >= phase )
return;
@@ -690,7 +690,7 @@ KLauncher::autoStart(int phase)
}
void
-KLauncher::slotAutoStart()
+TDELauncher::slotAutoStart()
{
KService::Ptr s;
do
@@ -727,10 +727,10 @@ KLauncher::slotAutoStart()
}
void
-KLauncher::requestDone(KLaunchRequest *request)
+TDELauncher::requestDone(TDELaunchRequest *request)
{
- if ((request->status == KLaunchRequest::Running) ||
- (request->status == KLaunchRequest::Done))
+ if ((request->status == TDELaunchRequest::Running) ||
+ (request->status == TDELaunchRequest::Done))
{
DCOPresult.result = 0;
DCOPresult.dcopName = request->dcop_name;
@@ -788,7 +788,7 @@ KLauncher::requestDone(KLaunchRequest *request)
}
void
-KLauncher::requestStart(KLaunchRequest *request)
+TDELauncher::requestStart(TDELaunchRequest *request)
{
requestList.append( request );
// Send request to tdeinit.
@@ -879,17 +879,17 @@ KLauncher::requestStart(KLaunchRequest *request)
}
void
-KLauncher::exec_blind( const TQCString &name, const TQValueList<TQCString> &arg_list,
+TDELauncher::exec_blind( const TQCString &name, const TQValueList<TQCString> &arg_list,
const TQValueList<TQCString> &envs, const TQCString& startup_id )
{
- KLaunchRequest *request = new KLaunchRequest;
+ TDELaunchRequest *request = new TDELaunchRequest;
request->autoStart = false;
request->name = name;
request->arg_list = arg_list;
request->dcop_name = 0;
request->dcop_service_type = KService::DCOP_None;
request->pid = 0;
- request->status = KLaunchRequest::Launching;
+ request->status = TDELaunchRequest::Launching;
request->transaction = 0; // No confirmation is send
request->envs = envs;
// Find service, if any - strip path if needed
@@ -907,7 +907,7 @@ KLauncher::exec_blind( const TQCString &name, const TQValueList<TQCString> &arg_
bool
-KLauncher::start_service_by_name(const TQString &serviceName, const TQStringList &urls,
+TDELauncher::start_service_by_name(const TQString &serviceName, const TQStringList &urls,
const TQValueList<TQCString> &envs, const TQCString& startup_id, bool blind)
{
KService::Ptr service = 0;
@@ -924,7 +924,7 @@ KLauncher::start_service_by_name(const TQString &serviceName, const TQStringList
}
bool
-KLauncher::start_service_by_desktop_path(const TQString &serviceName, const TQStringList &urls,
+TDELauncher::start_service_by_desktop_path(const TQString &serviceName, const TQStringList &urls,
const TQValueList<TQCString> &envs, const TQCString& startup_id, bool blind)
{
KService::Ptr service = 0;
@@ -949,7 +949,7 @@ KLauncher::start_service_by_desktop_path(const TQString &serviceName, const TQSt
}
bool
-KLauncher::start_service_by_desktop_name(const TQString &serviceName, const TQStringList &urls,
+TDELauncher::start_service_by_desktop_name(const TQString &serviceName, const TQStringList &urls,
const TQValueList<TQCString> &envs, const TQCString& startup_id, bool blind)
{
KService::Ptr service = 0;
@@ -966,7 +966,7 @@ KLauncher::start_service_by_desktop_name(const TQString &serviceName, const TQSt
}
bool
-KLauncher::start_service(KService::Ptr service, const TQStringList &_urls,
+TDELauncher::start_service(KService::Ptr service, const TQStringList &_urls,
const TQValueList<TQCString> &envs, const TQCString& startup_id, bool blind, bool autoStart)
{
TQStringList urls = _urls;
@@ -977,7 +977,7 @@ KLauncher::start_service(KService::Ptr service, const TQStringList &_urls,
cancel_service_startup_info( NULL, startup_id, envs ); // cancel it if any
return false;
}
- KLaunchRequest *request = new KLaunchRequest;
+ TDELaunchRequest *request = new TDELaunchRequest;
request->autoStart = autoStart;
if ((urls.count() > 1) && !service->allowMultipleFiles())
@@ -1047,7 +1047,7 @@ KLauncher::start_service(KService::Ptr service, const TQStringList &_urls,
}
void
-KLauncher::send_service_startup_info( KLaunchRequest *request, KService::Ptr service, const TQCString& startup_id,
+TDELauncher::send_service_startup_info( TDELaunchRequest *request, KService::Ptr service, const TQCString& startup_id,
const TQValueList<TQCString> &envs )
{
#if defined Q_WS_X11 && ! defined K_WS_QTONLY
@@ -1102,7 +1102,7 @@ KLauncher::send_service_startup_info( KLaunchRequest *request, KService::Ptr ser
}
void
-KLauncher::cancel_service_startup_info( KLaunchRequest* request, const TQCString& startup_id,
+TDELauncher::cancel_service_startup_info( TDELaunchRequest* request, const TQCString& startup_id,
const TQValueList<TQCString> &envs )
{
#if defined Q_WS_X11 && ! defined K_WS_QTONLY
@@ -1136,10 +1136,10 @@ KLauncher::cancel_service_startup_info( KLaunchRequest* request, const TQCString
}
bool
-KLauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
+TDELauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
const TQValueList<TQCString> &envs, TQCString startup_id, bool wait)
{
- KLaunchRequest *request = new KLaunchRequest;
+ TDELaunchRequest *request = new TDELaunchRequest;
request->autoStart = false;
for(TQStringList::ConstIterator it = args.begin();
@@ -1178,7 +1178,7 @@ KLauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
}
void
-KLauncher::queueRequest(KLaunchRequest *request)
+TDELauncher::queueRequest(TDELaunchRequest *request)
{
requestQueue.append( request );
if (!bProcessingQueue)
@@ -1189,14 +1189,14 @@ KLauncher::queueRequest(KLaunchRequest *request)
}
void
-KLauncher::slotDequeue()
+TDELauncher::slotDequeue()
{
do {
- KLaunchRequest *request = requestQueue.take(0);
+ TDELaunchRequest *request = requestQueue.take(0);
// process request
- request->status = KLaunchRequest::Launching;
+ request->status = TDELaunchRequest::Launching;
requestStart(request);
- if (request->status != KLaunchRequest::Launching)
+ if (request->status != TDELaunchRequest::Launching)
{
// Request handled.
requestDone( request );
@@ -1207,7 +1207,7 @@ KLauncher::slotDequeue()
}
void
-KLauncher::createArgs( KLaunchRequest *request, const KService::Ptr service ,
+TDELauncher::createArgs( TDELaunchRequest *request, const KService::Ptr service ,
const TQStringList &urls)
{
TQStringList params = KRun::processDesktopExec(*service, urls, false);
@@ -1223,7 +1223,7 @@ KLauncher::createArgs( KLaunchRequest *request, const KService::Ptr service ,
///// IO-Slave functions
pid_t
-KLauncher::requestHoldSlave(const KURL &url, const TQString &app_socket)
+TDELauncher::requestHoldSlave(const KURL &url, const TQString &app_socket)
{
IdleSlave *slave;
for(slave = mSlaveList.first(); slave; slave = mSlaveList.next())
@@ -1242,7 +1242,7 @@ KLauncher::requestHoldSlave(const KURL &url, const TQString &app_socket)
pid_t
-KLauncher::requestSlave(const TQString &protocol,
+TDELauncher::requestSlave(const TQString &protocol,
const TQString &host,
const TQString &app_socket,
TQString &error)
@@ -1292,7 +1292,7 @@ KLauncher::requestSlave(const TQString &protocol,
arg_list.append(arg2);
arg_list.append(arg3);
-// kdDebug(7016) << "KLauncher: launching new slave " << _name << " with protocol=" << protocol << endl;
+// kdDebug(7016) << "TDELauncher: launching new slave " << _name << " with protocol=" << protocol << endl;
if (mSlaveDebug == arg1)
{
tdelauncher_header request_header;
@@ -1311,7 +1311,7 @@ KLauncher::requestSlave(const TQString &protocol,
arg_list.prepend("--tool=memcheck");
}
- KLaunchRequest *request = new KLaunchRequest;
+ TDELaunchRequest *request = new TDELaunchRequest;
request->autoStart = false;
request->name = name;
request->arg_list = arg_list;
@@ -1321,7 +1321,7 @@ KLauncher::requestSlave(const TQString &protocol,
#ifdef Q_WS_X11
request->startup_id = "0";
#endif
- request->status = KLaunchRequest::Launching;
+ request->status = TDELaunchRequest::Launching;
request->transaction = 0; // No confirmation is send
requestStart(request);
pid_t pid = request->pid;
@@ -1338,7 +1338,7 @@ KLauncher::requestSlave(const TQString &protocol,
}
void
-KLauncher::waitForSlave(pid_t pid)
+TDELauncher::waitForSlave(pid_t pid)
{
IdleSlave *slave;
for(slave = mSlaveList.first(); slave; slave = mSlaveList.next())
@@ -1353,7 +1353,7 @@ KLauncher::waitForSlave(pid_t pid)
}
void
-KLauncher::acceptSlave(TDESocket *slaveSocket)
+TDELauncher::acceptSlave(TDESocket *slaveSocket)
{
IdleSlave *slave = new IdleSlave(slaveSocket);
// Send it a SLAVE_STATUS command.
@@ -1368,7 +1368,7 @@ KLauncher::acceptSlave(TDESocket *slaveSocket)
}
void
-KLauncher::slotSlaveStatus(IdleSlave *slave)
+TDELauncher::slotSlaveStatus(IdleSlave *slave)
{
SlaveWaitRequest *waitRequest = mSlaveWaitRequest.first();
while(waitRequest)
@@ -1390,7 +1390,7 @@ KLauncher::slotSlaveStatus(IdleSlave *slave)
}
void
-KLauncher::slotSlaveGone()
+TDELauncher::slotSlaveGone()
{
IdleSlave *slave = (IdleSlave *) sender();
mSlaveList.removeRef(slave);
@@ -1401,7 +1401,7 @@ KLauncher::slotSlaveGone()
}
void
-KLauncher::idleTimeout()
+TDELauncher::idleTimeout()
{
bool keepOneFileSlave=true;
time_t now = time(0);
diff --git a/kinit/tdelauncher.h b/kinit/tdelauncher.h
index 27c49ef7..79195898 100644
--- a/kinit/tdelauncher.h
+++ b/kinit/tdelauncher.h
@@ -76,7 +76,7 @@ public:
DCOPClientTransaction *transaction;
};
-class KLaunchRequest
+class TDELaunchRequest
{
public:
TQCString name;
@@ -105,14 +105,14 @@ struct serviceResult
pid_t pid;
};
-class KLauncher : public TDEApplication, public DCOPObject
+class TDELauncher : public TDEApplication, public DCOPObject
{
Q_OBJECT
public:
- KLauncher(int _tdeinitSocket, bool new_startup);
+ TDELauncher(int _tdeinitSocket, bool new_startup);
- ~KLauncher();
+ ~TDELauncher();
void close();
static void destruct(int exit_code); // exit!
@@ -126,8 +126,8 @@ public:
protected:
void processDied(pid_t pid, long exitStatus);
- void requestStart(KLaunchRequest *request);
- void requestDone(KLaunchRequest *request);
+ void requestStart(TDELaunchRequest *request);
+ void requestDone(TDELaunchRequest *request);
void setLaunchEnv(const TQCString &name, const TQCString &value);
void exec_blind(const TQCString &name, const TQValueList<TQCString> &arg_list,
@@ -148,7 +148,7 @@ protected:
void autoStart(int phase);
- void createArgs( KLaunchRequest *request, const KService::Ptr service,
+ void createArgs( TDELaunchRequest *request, const KService::Ptr service,
const TQStringList &url);
pid_t requestHoldSlave(const KURL &url, const TQString &app_socket);
@@ -156,11 +156,11 @@ protected:
const TQString &app_socket, TQString &error);
- void queueRequest(KLaunchRequest *);
+ void queueRequest(TDELaunchRequest *);
- void send_service_startup_info( KLaunchRequest *request, KService::Ptr service, const TQCString& startup_id,
+ void send_service_startup_info( TDELaunchRequest *request, KService::Ptr service, const TQCString& startup_id,
const TQValueList<TQCString> &envs );
- void cancel_service_startup_info( KLaunchRequest *request, const TQCString& startup_id,
+ void cancel_service_startup_info( TDELaunchRequest *request, const TQCString& startup_id,
const TQValueList<TQCString> &envs );
public slots:
@@ -174,12 +174,12 @@ public slots:
void idleTimeout();
protected:
- TQPtrList<KLaunchRequest> requestList; // Requests being handled
- TQPtrList<KLaunchRequest> requestQueue; // Requests waiting to being handled
+ TQPtrList<TDELaunchRequest> requestList; // Requests being handled
+ TQPtrList<TDELaunchRequest> requestQueue; // Requests waiting to being handled
int tdeinitSocket;
TQSocketNotifier *tdeinitNotifier;
serviceResult DCOPresult;
- KLaunchRequest *lastRequest;
+ TDELaunchRequest *lastRequest;
TQPtrList<SlaveWaitRequest> mSlaveWaitRequest;
TQString mPoolSocketName;
TDEServerSocket *mPoolSocket;
diff --git a/kinit/tdelauncher_main.cpp b/kinit/tdelauncher_main.cpp
index 059496c0..dc0c02dd 100644
--- a/kinit/tdelauncher_main.cpp
+++ b/kinit/tdelauncher_main.cpp
@@ -41,7 +41,7 @@ static void sig_handler(int sig_num)
signal( SIGHUP, SIG_IGN);
signal( SIGTERM, SIG_IGN);
fprintf(stderr, "[tdelauncher] Exiting on signal %d\n", sig_num);
- KLauncher::destruct(255);
+ TDELauncher::destruct(255);
}
static KCmdLineOptions options[] =
@@ -62,10 +62,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
TQCString cname = TDEApplication::launcher();
char *name = cname.data();
- TDECmdLineArgs::init(argc, argv, name, "KLauncher", "A service launcher.",
+ TDECmdLineArgs::init(argc, argv, name, "TDELauncher", "A service launcher.",
"v1.0");
- KLauncher::addCmdLineOptions();
+ TDELauncher::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions( options );
// WABA: Make sure not to enable session management.
@@ -101,7 +101,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
// Try again...
}
- KLauncher *launcher = new KLauncher(LAUNCHER_FD, args->isSet("new-startup"));
+ TDELauncher *launcher = new TDELauncher(LAUNCHER_FD, args->isSet("new-startup"));
launcher->dcopClient()->setDefaultObject( name );
launcher->dcopClient()->setDaemonMode( true );
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp
index 3cc47625..4bfe13f3 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/knewstuff/downloaddialog.cpp
@@ -50,18 +50,18 @@ struct DownloadDialog::Private
{
TQString m_providerlist;
TQWidget *m_page;
- KListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l;
+ TDEListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l;
TQPtrList<Entry> m_installlist;
TQMap<TDEIO::Job*, Provider*> m_variantjobs;
TQMap<TDEIO::Job*, TQStringList> m_variants;
TQMap<Provider*, Provider*> m_newproviders;
};
-class NumSortListViewItem : public KListViewItem
+class NumSortListViewItem : public TDEListViewItem
{
public:
NumSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null, TQString label7 = TQString::null, TQString label8 = TQString::null ) :
- KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
+ TDEListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
@@ -72,15 +72,15 @@ class NumSortListViewItem : public KListViewItem
s.sprintf("%08d", text(col).toInt());
return s;
}
- return KListViewItem::key( col, asc );
+ return TDEListViewItem::key( col, asc );
}
};
-class DateSortListViewItem : public KListViewItem
+class DateSortListViewItem : public TDEListViewItem
{
public:
DateSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null, TQString label7 = TQString::null, TQString label8 = TQString::null ) :
- KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
+ TDEListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
@@ -92,7 +92,7 @@ class DateSortListViewItem : public KListViewItem
s.sprintf("%08d", date.year() * 366 + date.dayOfYear());
return s;
}
- return KListViewItem::key( col, asc );
+ return TDEListViewItem::key( col, asc );
}
};
@@ -157,7 +157,7 @@ DownloadDialog::~DownloadDialog()
{
for (TQMap<TQWidget *, TQValueList<TQPushButton *>* >::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
delete it.data();
- for (TQMap<TQWidget *, TQValueList<KListView *>* >::const_iterator it = m_map.constBegin(); it != m_map.constEnd(); ++it)
+ for (TQMap<TQWidget *, TQValueList<TDEListView *>* >::const_iterator it = m_map.constBegin(); it != m_map.constEnd(); ++it)
delete it.data();
delete d;
}
@@ -174,11 +174,11 @@ void DownloadDialog::load(TQString providerList)
void DownloadDialog::clear()
{
- TQMap<TQWidget*, TQValueList<KListView*>* >::Iterator it;
- TQMap<TQWidget*, TQValueList<KListView*>* >::Iterator end(m_map.end());
+ TQMap<TQWidget*, TQValueList<TDEListView*>* >::Iterator it;
+ TQMap<TQWidget*, TQValueList<TDEListView*>* >::Iterator end(m_map.end());
for(it = m_map.begin(); it != end; ++it)
{
- TQValueList<KListView*> *v = it.data();
+ TQValueList<TDEListView*> *v = it.data();
kdDebug() << "clear listviews in " << v << endl;
if(v)
{
@@ -266,19 +266,19 @@ void DownloadDialog::addProvider(Provider *p)
TQHBoxLayout *box = new TQHBoxLayout(frame);
box->add(ctl);
- d->m_lvtmp_r = new KListView(w_r);
+ d->m_lvtmp_r = new TDEListView(w_r);
d->m_lvtmp_r->addColumn(i18n("Name"));
d->m_lvtmp_r->addColumn(i18n("Version"));
d->m_lvtmp_r->addColumn(i18n("Rating"));
d->m_lvtmp_r->setSorting(2, false);
- d->m_lvtmp_d = new KListView(w_d);
+ d->m_lvtmp_d = new TDEListView(w_d);
d->m_lvtmp_d->addColumn(i18n("Name"));
d->m_lvtmp_d->addColumn(i18n("Version"));
d->m_lvtmp_d->addColumn(i18n("Downloads"));
d->m_lvtmp_d->setSorting(2, false);
- d->m_lvtmp_l = new KListView(w_l);
+ d->m_lvtmp_l = new TDEListView(w_l);
d->m_lvtmp_l->addColumn(i18n("Name"));
d->m_lvtmp_l->addColumn(i18n("Version"));
d->m_lvtmp_l->addColumn(i18n("Release Date"));
@@ -315,7 +315,7 @@ void DownloadDialog::addProvider(Provider *p)
TQVBoxLayout *box4 = new TQVBoxLayout(w_l);
box4->add(d->m_lvtmp_l);
- TQValueList<KListView*> *v = new TQValueList<KListView*>;
+ TQValueList<TDEListView*> *v = new TQValueList<TDEListView*>;
*v << d->m_lvtmp_r << d->m_lvtmp_d << d->m_lvtmp_l;
m_map[frame] = v;
m_rts[frame] = rt;
@@ -423,19 +423,19 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants)
if(variants.contains("score"))
{
- KListViewItem *tmp_r = new NumSortListViewItem(lv_r,
+ TDEListViewItem *tmp_r = new NumSortListViewItem(lv_r,
entry->name(lang), entry->version(), TQString("%1").arg(entry->rating()));
tmp_r->setPixmap(0, pix);
}
if(variants.contains("downloads"))
{
- KListViewItem *tmp_d = new NumSortListViewItem(lv_d,
+ TDEListViewItem *tmp_d = new NumSortListViewItem(lv_d,
entry->name(lang), entry->version(), TQString("%1").arg(entry->downloads()));
tmp_d->setPixmap(0, pix);
}
if(variants.contains("latest"))
{
- KListViewItem *tmp_l = new DateSortListViewItem(lv_l,
+ TDEListViewItem *tmp_l = new DateSortListViewItem(lv_l,
entry->name(lang), entry->version(), TDEGlobal::locale()->formatDate(entry->releaseDate()));
tmp_l->setPixmap(0, pix);
}
diff --git a/knewstuff/downloaddialog.h b/knewstuff/downloaddialog.h
index cfcd4858..1d61d259 100644
--- a/knewstuff/downloaddialog.h
+++ b/knewstuff/downloaddialog.h
@@ -28,7 +28,7 @@ namespace TDEIO
class Job;
}
-class KListView;
+class TDEListView;
class TQTextBrowser;
class TQFrame;
class KNewStuffGeneric;
@@ -232,7 +232,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
ProviderLoader *m_loader;
TQString m_entryname;
- KListView *lv_r, *lv_d, *lv_l;
+ TDEListView *lv_r, *lv_d, *lv_l;
TQTextBrowser *m_rt;
TQFrame *m_frame;
TQListViewItem *m_entryitem;
@@ -240,7 +240,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
Entry *m_entry;
KNewStuffGeneric *m_s;
int m_curtab;
- TQMap<TQWidget*, TQValueList<KListView*>* > m_map;
+ TQMap<TQWidget*, TQValueList<TDEListView*>* > m_map;
TQMap<TQWidget*, Provider*> m_providers;
TQMap<TQWidget*, TQTextBrowser*> m_rts;
TQMap<TQWidget*, TQValueList<TQPushButton*>* > m_buttons;
diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp
index 6bfbb333..d36a1ef1 100644
--- a/knewstuff/knewstuff.cpp
+++ b/knewstuff/knewstuff.cpp
@@ -30,12 +30,12 @@
using namespace KNS;
-KAction* KNS::standardAction(const TQString& what,
+TDEAction* KNS::standardAction(const TQString& what,
const TQObject *recvr,
- const char *slot, KActionCollection* parent,
+ const char *slot, TDEActionCollection* parent,
const char *name)
{
- return new KAction(i18n("Download New %1").arg(what), "knewstuff",
+ return new TDEAction(i18n("Download New %1").arg(what), "knewstuff",
0, recvr, slot, parent, name);
}
diff --git a/knewstuff/knewstuff.h b/knewstuff/knewstuff.h
index 5d2319ae..ca07c7f0 100644
--- a/knewstuff/knewstuff.h
+++ b/knewstuff/knewstuff.h
@@ -26,17 +26,17 @@
class TQObject;
class TQWidget;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
namespace KNS {
class Engine;
class Entry;
-KDE_EXPORT KAction* standardAction(const TQString& what,
+KDE_EXPORT TDEAction* standardAction(const TQString& what,
const TQObject *recvr,
const char *slot,
- KActionCollection* parent,
+ TDEActionCollection* parent,
const char *name = 0);
}
diff --git a/knewstuff/providerdialog.cpp b/knewstuff/providerdialog.cpp
index a6625870..23aa9438 100644
--- a/knewstuff/providerdialog.cpp
+++ b/knewstuff/providerdialog.cpp
@@ -34,11 +34,11 @@
using namespace KNS;
-class ProviderItem : public KListViewItem
+class ProviderItem : public TDEListViewItem
{
public:
- ProviderItem( KListView *parent, Provider *provider ) :
- KListViewItem( parent ), mProvider( provider )
+ ProviderItem( TDEListView *parent, Provider *provider ) :
+ TDEListViewItem( parent ), mProvider( provider )
{
setText( 0, provider->name() );
}
@@ -61,7 +61,7 @@ ProviderDialog::ProviderDialog( Engine *engine, TQWidget *parent ) :
TQLabel *description = new TQLabel( i18n("Please select one of the providers listed below:"), topPage );
topLayout->addWidget( description );
- mListView = new KListView( topPage );
+ mListView = new TDEListView( topPage );
mListView->addColumn( i18n("Name") );
topLayout->addWidget( mListView );
}
diff --git a/knewstuff/providerdialog.h b/knewstuff/providerdialog.h
index 3e02e30a..549a6541 100644
--- a/knewstuff/providerdialog.h
+++ b/knewstuff/providerdialog.h
@@ -22,7 +22,7 @@
#include <kdialogbase.h>
-class KListView;
+class TDEListView;
namespace KNS {
@@ -68,7 +68,7 @@ class ProviderDialog : public KDialogBase
private:
Engine *mEngine;
- KListView *mListView;
+ TDEListView *mListView;
};
}
diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index bd1deffb..d19dcec0 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -2979,7 +2979,7 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo
void KLegacyStyle::drawKBarHandle(TQPainter *p, int x, int y, int w, int h,
- const TQColorGroup &g, KToolBarPos type, TQBrush *fill)
+ const TQColorGroup &g, TDEToolBarPos type, TQBrush *fill)
{
GtkObject *gobj = priv->gtkDict.find(TQToolBar::staticMetaObject());
diff --git a/kstyles/klegacy/klegacystyle.h b/kstyles/klegacy/klegacystyle.h
index 18c073f9..5288fd4f 100644
--- a/kstyles/klegacy/klegacystyle.h
+++ b/kstyles/klegacy/klegacystyle.h
@@ -60,7 +60,7 @@ public:
// toolbar stuffs
virtual void drawKBarHandle(TQPainter *p, int x, int y, int w, int h,
- const TQColorGroup &g, KToolBarPos type, TQBrush *fill = 0);
+ const TQColorGroup &g, TDEToolBarPos type, TQBrush *fill = 0);
virtual void drawKickerHandle(TQPainter *p, int x, int y, int w, int h,
const TQColorGroup &g, TQBrush *fill = 0);
virtual void drawKickerAppletHandle(TQPainter *p, int x, int y, int w, int h,
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index ff719993..7d2c72c2 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -569,7 +569,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
{
w->setBackgroundMode( TQWidget::NoBackground );
}
- else if ( w->inherits( "KToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
+ else if ( w->inherits( "TDEToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
{
w->setBackgroundMode( TQWidget::PaletteBackground );
}
@@ -652,7 +652,7 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem
w->setBackgroundMode( TQWidget::PaletteButton );
//For toolbar internal separators, return to button, too (can't use tqqt_cast here since don't have access to the class)
- else if ( w->inherits( "KToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
+ else if ( w->inherits( "TDEToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
w->setBackgroundMode( TQWidget::PaletteButton );
//For scrollbars, we don't do much, since the widget queries the style on the switch
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index ab5282e0..3e850394 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -965,7 +965,7 @@ WebStyle::drawSlider
}
void
-WebStyle::drawKToolBar
+WebStyle::drawTDEToolBar
(
TQPainter * p,
int x,
@@ -973,7 +973,7 @@ WebStyle::drawKToolBar
int w,
int h,
const TQColorGroup & g,
- KToolBarPos /* pos */,
+ TDEToolBarPos /* pos */,
TQBrush * /* fill */
)
{
@@ -993,7 +993,7 @@ WebStyle::drawKBarHandle
int w,
int h,
const TQColorGroup & g,
- KToolBarPos /* pos */,
+ TDEToolBarPos /* pos */,
TQBrush * /* fill */
)
{
@@ -1025,7 +1025,7 @@ WebStyle::drawKMenuBar
}
void
-WebStyle::drawKToolBarButton
+WebStyle::drawTDEToolBarButton
(
TQPainter * p,
int x,
@@ -1037,7 +1037,7 @@ WebStyle::drawKToolBarButton
bool raised,
bool enabled,
bool popup,
- KToolButtonType type,
+ TDEToolButtonType type,
const TQString & btext,
const TQPixmap * pixmap,
TQFont * font,
diff --git a/kstyles/web/webstyle.h b/kstyles/web/webstyle.h
index 5cd930c7..611cf848 100644
--- a/kstyles/web/webstyle.h
+++ b/kstyles/web/webstyle.h
@@ -210,7 +210,7 @@ class WebStyle : public KStyle
bool tickBelow
);
- void drawKToolBar
+ void drawTDEToolBar
(
TQPainter *,
int x,
@@ -218,7 +218,7 @@ class WebStyle : public KStyle
int w,
int h,
const TQColorGroup &,
- KToolBarPos,
+ TDEToolBarPos,
TQBrush * fill = 0
);
@@ -230,7 +230,7 @@ class WebStyle : public KStyle
int w,
int h,
const TQColorGroup &,
- KToolBarPos,
+ TDEToolBarPos,
TQBrush * fill = 0
);
@@ -246,7 +246,7 @@ class WebStyle : public KStyle
TQBrush * fill = 0
);
- void drawKToolBarButton
+ void drawTDEToolBarButton
(
TQPainter * p,
int x,
@@ -258,7 +258,7 @@ class WebStyle : public KStyle
bool raised = true,
bool enabled = true,
bool popup = false,
- KToolButtonType = Icon,
+ TDEToolButtonType = Icon,
const TQString & btext = TQString::null,
const TQPixmap * = 0,
TQFont * = 0,
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cc
index 08e3ec5e..f91c545d 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -52,14 +52,14 @@
K_EXPORT_COMPONENT_FACTORY( libtdecertpart, KParts::GenericFactory<KCertPart> )
-KX509Item::KX509Item(KListViewItem *parent, KSSLCertificate *x) :
- KListViewItem(parent, 0L)
+KX509Item::KX509Item(TDEListViewItem *parent, KSSLCertificate *x) :
+ TDEListViewItem(parent, 0L)
{
setup(x);
}
-KX509Item::KX509Item(KListView *parent, KSSLCertificate *x) :
- KListViewItem(parent)
+KX509Item::KX509Item(TDEListView *parent, KSSLCertificate *x) :
+ TDEListViewItem(parent)
{
setup(x);
}
@@ -98,8 +98,8 @@ KX509Item::~KX509Item()
}
-KPKCS12Item::KPKCS12Item(KListViewItem *parent, KSSLPKCS12 *x) :
- KListViewItem(parent, 0L)
+KPKCS12Item::KPKCS12Item(TDEListViewItem *parent, KSSLPKCS12 *x) :
+ TDEListViewItem(parent, 0L)
{
cert = x;
if (x) {
@@ -155,13 +155,13 @@ setWidget(_frame);
_baseGrid = new TQGridLayout(_frame, 15, 9, KDialog::marginHint(),
KDialog::spacingHint());
-_sideList = new KListView(_frame);
+_sideList = new TDEListView(_frame);
_sideList->setRootIsDecorated(true);
_sideList->addColumn(i18n("Certificates"));
-_parentCA = new KListViewItem(_sideList, i18n("Signers"));
+_parentCA = new TDEListViewItem(_sideList, i18n("Signers"));
_parentCA->setExpandable(true);
_sideList->setOpen(_parentCA, true);
-_parentP12 = new KListViewItem(_sideList, i18n("Client"));
+_parentP12 = new TDEListViewItem(_sideList, i18n("Client"));
_parentP12->setExpandable(true);
_sideList->setOpen(_parentP12, true);
diff --git a/tdecert/tdecertpart.h b/tdecert/tdecertpart.h
index 040b0ad9..bb4ca958 100644
--- a/tdecert/tdecertpart.h
+++ b/tdecert/tdecertpart.h
@@ -44,10 +44,10 @@ class TDEAboutData;
class TQGridLayout;
-class KX509Item : public KListViewItem {
+class KX509Item : public TDEListViewItem {
public:
- KX509Item(KListViewItem *parent, KSSLCertificate *x);
- KX509Item(KListView *parent, KSSLCertificate *x);
+ KX509Item(TDEListViewItem *parent, KSSLCertificate *x);
+ KX509Item(TDEListView *parent, KSSLCertificate *x);
void setup(KSSLCertificate *x);
~KX509Item();
virtual int rtti() const { return 1; }
@@ -56,9 +56,9 @@ class KX509Item : public KListViewItem {
};
-class KPKCS12Item : public KListViewItem {
+class KPKCS12Item : public TDEListViewItem {
public:
- KPKCS12Item(KListViewItem *parent, KSSLPKCS12 *x);
+ KPKCS12Item(TDEListViewItem *parent, KSSLPKCS12 *x);
~KPKCS12Item();
KSSLPKCS12 *cert;
TQString _prettyName;
@@ -94,8 +94,8 @@ protected:
void displayPKCS12Cert(KSSLCertificate *c);
void displayCACert(KSSLCertificate *c);
- KListView *_sideList;
- KListViewItem *_parentCA, *_parentP12;
+ TDEListView *_sideList;
+ TDEListViewItem *_parentCA, *_parentP12;
TQFrame *_pkcsFrame, *_blankFrame, *_x509Frame, *_frame;
// for the PKCS12 widget
diff --git a/tdecore/AUTHORS b/tdecore/AUTHORS
index 03def3f4..ce19e095 100644
--- a/tdecore/AUTHORS
+++ b/tdecore/AUTHORS
@@ -16,16 +16,16 @@ DnD stuff, TDESocket and TDEServerSocket classes, KPixmap
Alexander Sanda <alex@darkstar.ping.at>
Read and write numerical config entries, KPanner, KTabControl,
-KPopupMenu, KMessageBox, KEdit widgets.
+TDEPopupMenu, KMessageBox, KEdit widgets.
Martin Jones <mjones@powerup.com.au>
-Bugfixes in KPixmap and KURL, KColorDialog, KSelector
+Bugfixes in KPixmap and KURL, KColorDialog, TDESelector
Keith Brown <kbrown@pdq.net>
KTreeList class
Bernd Johannes Wuebben <wuebben@math.cornell.edu>
-KFontDialog classes
+TDEFontDialog classes
Tim D. Gilman <tdgilman@best.com>
KDatePicker, KDateTable class
diff --git a/tdecore/DESIGN.iconloading b/tdecore/DESIGN.iconloading
index a9e57afb..a675a892 100644
--- a/tdecore/DESIGN.iconloading
+++ b/tdecore/DESIGN.iconloading
@@ -72,7 +72,7 @@ information and then waiting for a sufficient long period, e.. 5 minutes,
before actually removing the image data.
I can also imagine a scenario where the index information is only used very
-temporarily, e.g. during the creation of a KMainWindow (mmap the file in the
+temporarily, e.g. during the creation of a TDEMainWindow (mmap the file in the
constructor, unmap it from the next event loop) that way icons can be removed
from the index and after e.g. a timeout of 5 minutes one can be relatively
sure that the index will no longer be used.
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index e12e29d2..54ab60d2 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -331,7 +331,7 @@ Applications may use additional actions that they defined themselves.
You can get a list of the actions used by a certain applications by using the
following dcop command:
-dcop <dcopid> qt objects | grep KActionCollection/ | cut -d '/' -f 3
+dcop <dcopid> qt objects | grep TDEActionCollection/ | cut -d '/' -f 3
or with
@@ -660,7 +660,7 @@ KDE3 Kiosk Application API
Three new methods have been added to TDEApplication:
- bool authorize(QString action); // Generic actions
-- bool authorizeKAction(QString action); // For KActions exclusively
+- bool authorizeTDEAction(QString action); // For TDEActions exclusively
- bool authorizeURLAction(QString, referringURL, destinationURL) // URL Handling
Automatic Logout
diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp
index 7291f3f5..9dde93e7 100644
--- a/tdecore/kaccel.cpp
+++ b/tdecore/kaccel.cpp
@@ -45,15 +45,15 @@
// TODO: Put in kaccelbase.cpp
//---------------------------------------------------------------------
-// KAccelEventHandler
+// TDEAccelEventHandler
//---------------------------------------------------------------------
//
-// In KAccelEventHandler::x11Event we do our own X11 keyboard event handling
+// In TDEAccelEventHandler::x11Event we do our own X11 keyboard event handling
// This allows us to map the Win key to Qt::MetaButton, Qt does not know about
// the Win key.
//
-// KAccelEventHandler::x11Event will generate an AccelOverride event. The
-// AccelOverride event is abused a bit to ensure that KAccelPrivate::eventFilter
+// TDEAccelEventHandler::x11Event will generate an AccelOverride event. The
+// AccelOverride event is abused a bit to ensure that TDEAccelPrivate::eventFilter
// (as an event filter on the toplevel widget) will get the key event first
// (in the form of AccelOverride) before any of the intermediate widgets are
// able to process it.
@@ -63,10 +63,10 @@
// skipped and the KeyPress is followed immediately.
// If the Accel event is accepted, no KeyPress event will follow.
//
-// KAccelEventHandler::x11Event converts a X11 keyboard event into an AccelOverride
+// TDEAccelEventHandler::x11Event converts a X11 keyboard event into an AccelOverride
// event, there are now two possibilities:
//
-// 1) If KAccel intercepts the AccelOverride we are done and can consider the X11
+// 1) If TDEAccel intercepts the AccelOverride we are done and can consider the X11
// keyboard event as handled.
// 2) If another widget accepts the AccelOverride, it will expect to get a normal
// Qt generated KeyPress event afterwards. So we let Qt handle the X11 keyboard event
@@ -80,34 +80,34 @@
bool kde_g_bKillAccelOverride = false;
-class KAccelEventHandler : public TQWidget
+class TDEAccelEventHandler : public TQWidget
{
public:
- static KAccelEventHandler* self()
+ static TDEAccelEventHandler* self()
{
if( !g_pSelf )
- g_pSelf = new KAccelEventHandler;
+ g_pSelf = new TDEAccelEventHandler;
return g_pSelf;
}
static void accelActivated( bool b ) { g_bAccelActivated = b; }
private:
- KAccelEventHandler();
+ TDEAccelEventHandler();
# ifdef Q_WS_X11
bool x11Event( XEvent* pEvent );
# endif
- static KAccelEventHandler* g_pSelf;
+ static TDEAccelEventHandler* g_pSelf;
static bool g_bAccelActivated;
};
-KAccelEventHandler* KAccelEventHandler::g_pSelf = 0;
-bool KAccelEventHandler::g_bAccelActivated = false;
+TDEAccelEventHandler* TDEAccelEventHandler::g_pSelf = 0;
+bool TDEAccelEventHandler::g_bAccelActivated = false;
-KAccelEventHandler::KAccelEventHandler()
- : TQWidget( 0, "KAccelEventHandler" )
+TDEAccelEventHandler::TDEAccelEventHandler()
+ : TQWidget( 0, "TDEAccelEventHandler" )
{
# ifdef Q_WS_X11
if ( kapp )
@@ -118,7 +118,7 @@ KAccelEventHandler::KAccelEventHandler()
#ifdef Q_WS_X11
bool tqt_try_modal( TQWidget *, XEvent * );
-bool KAccelEventHandler::x11Event( XEvent* pEvent )
+bool TDEAccelEventHandler::x11Event( XEvent* pEvent )
{
if( TQWidget::keyboardGrabber() || !kapp->focusWidget() )
return false;
@@ -146,7 +146,7 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent )
g_bAccelActivated = false;
kapp->sendEvent( kapp->focusWidget(), &ke );
- // If the Override event was accepted from a non-KAccel widget,
+ // If the Override event was accepted from a non-TDEAccel widget,
// then kill the next AccelOverride in TDEApplication::notify.
if( ke.isAccepted() && !g_bAccelActivated )
kde_g_bKillAccelOverride = true;
@@ -160,35 +160,35 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent )
#endif // Q_WS_X11
//---------------------------------------------------------------------
-// KAccelPrivate
+// TDEAccelPrivate
//---------------------------------------------------------------------
-KAccelPrivate::KAccelPrivate( KAccel* pParent, TQWidget* pWatch )
-: KAccelBase( KAccelBase::QT_KEYS )
+TDEAccelPrivate::TDEAccelPrivate( TDEAccel* pParent, TQWidget* pWatch )
+: TDEAccelBase( TDEAccelBase::QT_KEYS )
{
- //kdDebug(125) << "KAccelPrivate::KAccelPrivate( pParent = " << pParent << " ): this = " << this << endl;
+ //kdDebug(125) << "TDEAccelPrivate::TDEAccelPrivate( pParent = " << pParent << " ): this = " << this << endl;
m_pAccel = pParent;
m_pWatch = pWatch;
m_bAutoUpdate = true;
connect( (TQAccel*)m_pAccel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotKeyPressed(int)) );
-#ifdef Q_WS_X11 //only makes sense if KAccelEventHandler is working
+#ifdef Q_WS_X11 //only makes sense if TDEAccelEventHandler is working
if( m_pWatch )
m_pWatch->installEventFilter( this );
#endif
- KAccelEventHandler::self();
+ TDEAccelEventHandler::self();
}
-void KAccelPrivate::setEnabled( bool bEnabled )
+void TDEAccelPrivate::setEnabled( bool bEnabled )
{
m_bEnabled = bEnabled;
((TQAccel*)m_pAccel)->setEnabled( bEnabled );
}
-bool KAccelPrivate::setEnabled( const TQString& sAction, bool bEnable )
+bool TDEAccelPrivate::setEnabled( const TQString& sAction, bool bEnable )
{
- kdDebug(125) << "KAccelPrivate::setEnabled( \"" << sAction << "\", " << bEnable << " ): this = " << this << endl;
- KAccelAction* pAction = actionPtr( sAction );
+ kdDebug(125) << "TDEAccelPrivate::setEnabled( \"" << sAction << "\", " << bEnable << " ): this = " << this << endl;
+ TDEAccelAction* pAction = actionPtr( sAction );
if( !pAction )
return false;
if( pAction->isEnabled() == bEnable )
@@ -196,7 +196,7 @@ bool KAccelPrivate::setEnabled( const TQString& sAction, bool bEnable )
pAction->setEnabled( bEnable );
- TQMap<int, KAccelAction*>::const_iterator it = m_mapIDToAction.begin();
+ TQMap<int, TDEAccelAction*>::const_iterator it = m_mapIDToAction.begin();
for( ; it != m_mapIDToAction.end(); ++it ) {
if( *it == pAction )
((TQAccel*)m_pAccel)->setItemEnabled( it.key(), bEnable );
@@ -204,32 +204,32 @@ bool KAccelPrivate::setEnabled( const TQString& sAction, bool bEnable )
return true;
}
-bool KAccelPrivate::removeAction( const TQString& sAction )
+bool TDEAccelPrivate::removeAction( const TQString& sAction )
{
// FIXME: getID() doesn't contains any useful
// information! Use mapIDToAction. --ellis, 2/May/2002
- // Or maybe KAccelBase::remove() takes care of TQAccel indirectly...
- KAccelAction* pAction = actions().actionPtr( sAction );
+ // Or maybe TDEAccelBase::remove() takes care of TQAccel indirectly...
+ TDEAccelAction* pAction = actions().actionPtr( sAction );
if( pAction ) {
int nID = pAction->getID();
//bool b = actions().removeAction( sAction );
- bool b = KAccelBase::remove( sAction );
+ bool b = TDEAccelBase::remove( sAction );
((TQAccel*)m_pAccel)->removeItem( nID );
return b;
} else
return false;
}
-bool KAccelPrivate::emitSignal( KAccelBase::Signal signal )
+bool TDEAccelPrivate::emitSignal( TDEAccelBase::Signal signal )
{
- if( signal == KAccelBase::KEYCODE_CHANGED ) {
+ if( signal == TDEAccelBase::KEYCODE_CHANGED ) {
m_pAccel->emitKeycodeChanged();
return true;
}
return false;
}
-bool KAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key& key )
{
uint keyQt = key.keyCodeQt();
int nID = ((TQAccel*)m_pAccel)->insertItem( keyQt );
@@ -246,23 +246,23 @@ bool KAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key
((TQAccel*)m_pAccel)->setItemEnabled( nID, false );
}
- kdDebug(125) << "KAccelPrivate::connectKey( \"" << action.name() << "\", " << key.key().toStringInternal() << " = 0x" << TQString::number(keyQt,16) << " ): id = " << nID << " m_pObjSlot = " << action.objSlotPtr() << endl;
+ kdDebug(125) << "TDEAccelPrivate::connectKey( \"" << action.name() << "\", " << key.key().toStringInternal() << " = 0x" << TQString::number(keyQt,16) << " ): id = " << nID << " m_pObjSlot = " << action.objSlotPtr() << endl;
//kdDebug(125) << "m_pAccel = " << m_pAccel << endl;
return nID != 0;
}
-bool KAccelPrivate::connectKey( const KKeyServer::Key& key )
+bool TDEAccelPrivate::connectKey( const KKeyServer::Key& key )
{
uint keyQt = key.keyCodeQt();
int nID = ((TQAccel*)m_pAccel)->insertItem( keyQt );
m_mapIDToKey[nID] = keyQt;
- kdDebug(125) << "KAccelPrivate::connectKey( " << key.key().toStringInternal() << " = 0x" << TQString::number(keyQt,16) << " ): id = " << nID << endl;
+ kdDebug(125) << "TDEAccelPrivate::connectKey( " << key.key().toStringInternal() << " = 0x" << TQString::number(keyQt,16) << " ): id = " << nID << endl;
return nID != 0;
}
-bool KAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEAccelPrivate::disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key )
{
int keyQt = key.keyCodeQt();
TQMap<int, int>::iterator it = m_mapIDToKey.begin();
@@ -270,7 +270,7 @@ bool KAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key&
//kdDebug(125) << "m_mapIDToKey[" << it.key() << "] = " << TQString::number(*it,16) << " == " << TQString::number(keyQt,16) << endl;
if( *it == keyQt ) {
int nID = it.key();
- kdDebug(125) << "KAccelPrivate::disconnectKey( \"" << action.name() << "\", 0x" << TQString::number(keyQt,16) << " ) : id = " << nID << " m_pObjSlot = " << action.objSlotPtr() << endl;
+ kdDebug(125) << "TDEAccelPrivate::disconnectKey( \"" << action.name() << "\", 0x" << TQString::number(keyQt,16) << " ) : id = " << nID << " m_pObjSlot = " << action.objSlotPtr() << endl;
((TQAccel*)m_pAccel)->removeItem( nID );
m_mapIDToAction.remove( nID );
m_mapIDToKey.remove( it );
@@ -282,10 +282,10 @@ bool KAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key&
return false;
}
-bool KAccelPrivate::disconnectKey( const KKeyServer::Key& key )
+bool TDEAccelPrivate::disconnectKey( const KKeyServer::Key& key )
{
int keyQt = key.keyCodeQt();
- kdDebug(125) << "KAccelPrivate::disconnectKey( 0x" << TQString::number(keyQt,16) << " )" << endl;
+ kdDebug(125) << "TDEAccelPrivate::disconnectKey( 0x" << TQString::number(keyQt,16) << " )" << endl;
TQMap<int, int>::iterator it = m_mapIDToKey.begin();
for( ; it != m_mapIDToKey.end(); ++it ) {
if( *it == keyQt ) {
@@ -299,9 +299,9 @@ bool KAccelPrivate::disconnectKey( const KKeyServer::Key& key )
return false;
}
-void KAccelPrivate::slotKeyPressed( int id )
+void TDEAccelPrivate::slotKeyPressed( int id )
{
- kdDebug(125) << "KAccelPrivate::slotKeyPressed( " << id << " )" << endl;
+ kdDebug(125) << "TDEAccelPrivate::slotKeyPressed( " << id << " )" << endl;
if( m_mapIDToKey.contains( id ) ) {
KKey key = m_mapIDToKey[id];
@@ -326,14 +326,14 @@ void KAccelPrivate::slotKeyPressed( int id )
}
}
-void KAccelPrivate::slotShowMenu()
+void TDEAccelPrivate::slotShowMenu()
{
}
-void KAccelPrivate::slotMenuActivated( int iAction )
+void TDEAccelPrivate::slotMenuActivated( int iAction )
{
- kdDebug(125) << "KAccelPrivate::slotMenuActivated( " << iAction << " )" << endl;
- KAccelAction* pAction = actions().actionPtr( iAction );
+ kdDebug(125) << "TDEAccelPrivate::slotMenuActivated( " << iAction << " )" << endl;
+ TDEAccelAction* pAction = actions().actionPtr( iAction );
#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
if( pAction ) {
connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
@@ -345,12 +345,12 @@ void KAccelPrivate::slotMenuActivated( int iAction )
#endif
}
-bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
+bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
{
if( pEvent->type() == TQEvent::AccelOverride && m_bEnabled ) {
TQKeyEvent* pKeyEvent = (TQKeyEvent*) pEvent;
KKey key( pKeyEvent );
- kdDebug(125) << "KAccelPrivate::eventFilter( AccelOverride ): this = " << this << ", key = " << key.toStringInternal() << endl;
+ kdDebug(125) << "TDEAccelPrivate::eventFilter( AccelOverride ): this = " << this << ", key = " << key.toStringInternal() << endl;
int keyCodeQt = key.keyCodeQt();
TQMap<int, int>::iterator it = m_mapIDToKey.begin();
for( ; it != m_mapIDToKey.end(); ++it ) {
@@ -359,11 +359,11 @@ bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
kdDebug(125) << "shortcut found!" << endl;
if( m_mapIDToAction.contains( nID ) ) {
// TODO: reduce duplication between here and slotMenuActivated
- KAccelAction* pAction = m_mapIDToAction[nID];
+ TDEAccelAction* pAction = m_mapIDToAction[nID];
if( !pAction->isEnabled() )
continue;
#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
- TQGuardedPtr<KAccelPrivate> me = this;
+ TQGuardedPtr<TDEAccelPrivate> me = this;
connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
emit menuItemActivated();
if (me) {
@@ -376,7 +376,7 @@ bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
slotKeyPressed( nID );
pKeyEvent->accept();
- KAccelEventHandler::accelActivated( true );
+ TDEAccelEventHandler::accelActivated( true );
return true;
}
}
@@ -385,17 +385,17 @@ bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
}
#ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
-void KAccelPrivate::emitActivatedSignal( KAccelAction* pAction )
+void TDEAccelPrivate::emitActivatedSignal( TDEAccelAction* pAction )
{
if( pAction ) {
- TQGuardedPtr<KAccelPrivate> me = this;
- TQRegExp reg( "([ ]*KAccelAction.*)" );
+ TQGuardedPtr<TDEAccelPrivate> me = this;
+ TQRegExp reg( "([ ]*TDEAccelAction.*)" );
if( reg.search( pAction->methodSlotPtr()) >= 0 ) {
- connect( this, TQT_SIGNAL(menuItemActivated(KAccelAction*)),
+ connect( this, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)),
pAction->objSlotPtr(), pAction->methodSlotPtr() );
emit menuItemActivated( pAction );
if (me)
- disconnect( me, TQT_SIGNAL(menuItemActivated(KAccelAction*)),
+ disconnect( me, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)),
pAction->objSlotPtr(), pAction->methodSlotPtr() );
} else {
connect( this, TQT_SIGNAL(menuItemActivated()),
@@ -411,39 +411,39 @@ void KAccelPrivate::emitActivatedSignal( KAccelAction* pAction )
#endif
//---------------------------------------------------------------------
-// KAccel
+// TDEAccel
//---------------------------------------------------------------------
-KAccel::KAccel( TQWidget* pParent, const char* psName )
-: TQAccel( pParent, (psName) ? psName : "KAccel-TQAccel" )
+TDEAccel::TDEAccel( TQWidget* pParent, const char* psName )
+: TQAccel( pParent, (psName) ? psName : "TDEAccel-TQAccel" )
{
- kdDebug(125) << "KAccel( pParent = " << pParent << ", psName = " << psName << " ): this = " << this << endl;
- d = new KAccelPrivate( this, pParent );
+ kdDebug(125) << "TDEAccel( pParent = " << pParent << ", psName = " << psName << " ): this = " << this << endl;
+ d = new TDEAccelPrivate( this, pParent );
}
-KAccel::KAccel( TQWidget* watch, TQObject* pParent, const char* psName )
-: TQAccel( watch, pParent, (psName) ? psName : "KAccel-TQAccel" )
+TDEAccel::TDEAccel( TQWidget* watch, TQObject* pParent, const char* psName )
+: TQAccel( watch, pParent, (psName) ? psName : "TDEAccel-TQAccel" )
{
- kdDebug(125) << "KAccel( watch = " << watch << ", pParent = " << pParent << ", psName = " << psName << " ): this = " << this << endl;
+ kdDebug(125) << "TDEAccel( watch = " << watch << ", pParent = " << pParent << ", psName = " << psName << " ): this = " << this << endl;
if( !watch )
kdDebug(125) << kdBacktrace() << endl;
- d = new KAccelPrivate( this, watch );
+ d = new TDEAccelPrivate( this, watch );
}
-KAccel::~KAccel()
+TDEAccel::~TDEAccel()
{
- kdDebug(125) << "~KAccel(): this = " << this << endl;
+ kdDebug(125) << "~TDEAccel(): this = " << this << endl;
delete d;
}
-KAccelActions& KAccel::actions() { return d->actions(); }
-const KAccelActions& KAccel::actions() const { return d->actions(); }
-bool KAccel::isEnabled() { return d->isEnabled(); }
-void KAccel::setEnabled( bool bEnabled ) { d->setEnabled( bEnabled ); }
-bool KAccel::setAutoUpdate( bool bAuto ) { return d->setAutoUpdate( bAuto ); }
+TDEAccelActions& TDEAccel::actions() { return d->actions(); }
+const TDEAccelActions& TDEAccel::actions() const { return d->actions(); }
+bool TDEAccel::isEnabled() { return d->isEnabled(); }
+void TDEAccel::setEnabled( bool bEnabled ) { d->setEnabled( bEnabled ); }
+bool TDEAccel::setAutoUpdate( bool bAuto ) { return d->setAutoUpdate( bAuto ); }
-KAccelAction* KAccel::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& cutDef,
+TDEAccelAction* TDEAccel::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& cutDef,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled )
{
@@ -453,8 +453,8 @@ KAccelAction* KAccel::insert( const TQString& sAction, const TQString& sLabel, c
bConfigurable, bEnabled );
}
-KAccelAction* KAccel::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& cutDef3, const KShortcut& cutDef4,
+TDEAccelAction* TDEAccel::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled )
{
@@ -464,7 +464,7 @@ KAccelAction* KAccel::insert( const TQString& sAction, const TQString& sLabel, c
bConfigurable, bEnabled );
}
-KAccelAction* KAccel::insert( const char* psAction, const KShortcut& cutDef,
+TDEAccelAction* TDEAccel::insert( const char* psAction, const TDEShortcut& cutDef,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled )
{
@@ -474,45 +474,45 @@ KAccelAction* KAccel::insert( const char* psAction, const KShortcut& cutDef,
bConfigurable, bEnabled );
}
-KAccelAction* KAccel::insert( KStdAccel::StdAccel id,
+TDEAccelAction* TDEAccel::insert( TDEStdAccel::StdAccel id,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled )
{
- TQString sAction = KStdAccel::name( id );
+ TQString sAction = TDEStdAccel::name( id );
if( sAction.isEmpty() )
return 0;
- KAccelAction* pAction = d->insert( sAction, KStdAccel::label( id ), KStdAccel::whatsThis( id ),
- KStdAccel::shortcutDefault3( id ), KStdAccel::shortcutDefault4( id ),
+ TDEAccelAction* pAction = d->insert( sAction, TDEStdAccel::label( id ), TDEStdAccel::whatsThis( id ),
+ TDEStdAccel::shortcutDefault3( id ), TDEStdAccel::shortcutDefault4( id ),
pObjSlot, psMethodSlot,
bConfigurable, bEnabled );
if( pAction )
- pAction->setShortcut( KStdAccel::shortcut( id ) );
+ pAction->setShortcut( TDEStdAccel::shortcut( id ) );
return pAction;
}
-bool KAccel::remove( const TQString& sAction )
+bool TDEAccel::remove( const TQString& sAction )
{ return d->removeAction( sAction ); }
-bool KAccel::updateConnections()
+bool TDEAccel::updateConnections()
{ return d->updateConnections(); }
-const KShortcut& KAccel::shortcut( const TQString& sAction ) const
+const TDEShortcut& TDEAccel::shortcut( const TQString& sAction ) const
{
- const KAccelAction* pAction = actions().actionPtr( sAction );
- return (pAction) ? pAction->shortcut() : KShortcut::null();
+ const TDEAccelAction* pAction = actions().actionPtr( sAction );
+ return (pAction) ? pAction->shortcut() : TDEShortcut::null();
}
-bool KAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
+bool TDEAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
{ return d->setActionSlot( sAction, pObjSlot, psMethodSlot ); }
-bool KAccel::setEnabled( const TQString& sAction, bool bEnable )
+bool TDEAccel::setEnabled( const TQString& sAction, bool bEnable )
{ return d->setEnabled( sAction, bEnable ); }
-bool KAccel::setShortcut( const TQString& sAction, const KShortcut& cut )
+bool TDEAccel::setShortcut( const TQString& sAction, const TDEShortcut& cut )
{
- kdDebug(125) << "KAccel::setShortcut( \"" << sAction << "\", " << cut.toStringInternal() << " )" << endl;
- KAccelAction* pAction = actions().actionPtr( sAction );
+ kdDebug(125) << "TDEAccel::setShortcut( \"" << sAction << "\", " << cut.toStringInternal() << " )" << endl;
+ TDEAccelAction* pAction = actions().actionPtr( sAction );
if( pAction ) {
if( pAction->shortcut() != cut )
return d->setShortcut( sAction, cut );
@@ -521,24 +521,24 @@ bool KAccel::setShortcut( const TQString& sAction, const KShortcut& cut )
return false;
}
-const TQString& KAccel::configGroup() const
+const TQString& TDEAccel::configGroup() const
{ return d->configGroup(); }
// for tdegames/ksirtet
-void KAccel::setConfigGroup( const TQString& s )
+void TDEAccel::setConfigGroup( const TQString& s )
{ d->setConfigGroup( s ); }
-bool KAccel::readSettings( TDEConfigBase* pConfig )
+bool TDEAccel::readSettings( TDEConfigBase* pConfig )
{
d->readSettings( pConfig );
return true;
}
-bool KAccel::writeSettings( TDEConfigBase* pConfig ) const
+bool TDEAccel::writeSettings( TDEConfigBase* pConfig ) const
{ d->writeSettings( pConfig ); return true; }
-void KAccel::emitKeycodeChanged()
+void TDEAccel::emitKeycodeChanged()
{
- kdDebug(125) << "KAccel::emitKeycodeChanged()" << endl;
+ kdDebug(125) << "TDEAccel::emitKeycodeChanged()" << endl;
emit keycodeChanged();
}
@@ -547,11 +547,11 @@ void KAccel::emitKeycodeChanged()
// Obsolete methods -- for backward compatibility
//------------------------------------------------------------
-bool KAccel::insertItem( const TQString& sLabel, const TQString& sAction,
+bool TDEAccel::insertItem( const TQString& sLabel, const TQString& sAction,
const char* cutsDef,
int /*nIDMenu*/, TQPopupMenu *, bool bConfigurable )
{
- KShortcut cut( cutsDef );
+ TDEShortcut cut( cutsDef );
bool b = d->insert( sAction, sLabel, TQString::null,
cut, cut,
0, 0,
@@ -559,13 +559,13 @@ bool KAccel::insertItem( const TQString& sLabel, const TQString& sAction,
return b;
}
-bool KAccel::insertItem( const TQString& sLabel, const TQString& sAction,
+bool TDEAccel::insertItem( const TQString& sLabel, const TQString& sAction,
int key,
int /*nIDMenu*/, TQPopupMenu*, bool bConfigurable )
{
- KShortcut cut;
+ TDEShortcut cut;
cut.init( TQKeySequence(key) );
- KAccelAction* pAction = d->insert( sAction, sLabel, TQString::null,
+ TDEAccelAction* pAction = d->insert( sAction, sLabel, TQString::null,
cut, cut,
0, 0,
bConfigurable );
@@ -573,20 +573,20 @@ bool KAccel::insertItem( const TQString& sLabel, const TQString& sAction,
}
// Used in tdeutils/kjots
-bool KAccel::insertStdItem( KStdAccel::StdAccel id, const TQString& sLabel )
+bool TDEAccel::insertStdItem( TDEStdAccel::StdAccel id, const TQString& sLabel )
{
- KAccelAction* pAction = d->insert( KStdAccel::name( id ), sLabel, TQString::null,
- KStdAccel::shortcutDefault3( id ), KStdAccel::shortcutDefault4( id ),
+ TDEAccelAction* pAction = d->insert( TDEStdAccel::name( id ), sLabel, TQString::null,
+ TDEStdAccel::shortcutDefault3( id ), TDEStdAccel::shortcutDefault4( id ),
0, 0 );
if( pAction )
- pAction->setShortcut( KStdAccel::shortcut( id ) );
+ pAction->setShortcut( TDEStdAccel::shortcut( id ) );
return true;
}
-bool KAccel::connectItem( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot, bool bActivate )
+bool TDEAccel::connectItem( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot, bool bActivate )
{
- kdDebug(125) << "KAccel::connectItem( " << sAction << ", " << pObjSlot << ", " << psMethodSlot << " )" << endl;
+ kdDebug(125) << "TDEAccel::connectItem( " << sAction << ", " << pObjSlot << ", " << psMethodSlot << " )" << endl;
if( bActivate == false )
d->setActionEnabled( sAction, false );
bool b = setSlot( sAction, pObjSlot, psMethodSlot );
@@ -595,15 +595,15 @@ bool KAccel::connectItem( const TQString& sAction, const TQObject* pObjSlot, con
return b;
}
-bool KAccel::removeItem( const TQString& sAction )
+bool TDEAccel::removeItem( const TQString& sAction )
{ return d->removeAction( sAction ); }
-bool KAccel::setItemEnabled( const TQString& sAction, bool bEnable )
+bool TDEAccel::setItemEnabled( const TQString& sAction, bool bEnable )
{ return setEnabled( sAction, bEnable ); }
-void KAccel::changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action )
+void TDEAccel::changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action )
{
- KAccelAction* pAction = actions().actionPtr( action );
+ TDEAccelAction* pAction = actions().actionPtr( action );
TQString s = menu->text( id );
if( !pAction || s.isEmpty() )
return;
@@ -628,27 +628,27 @@ void KAccel::changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action
menu->changeItem( s, id );
}
-void KAccel::changeMenuAccel( TQPopupMenu *menu, int id, KStdAccel::StdAccel accel )
+void TDEAccel::changeMenuAccel( TQPopupMenu *menu, int id, TDEStdAccel::StdAccel accel )
{
- changeMenuAccel( menu, id, KStdAccel::name( accel ) );
+ changeMenuAccel( menu, id, TDEStdAccel::name( accel ) );
}
-int KAccel::stringToKey( const TQString& sKey )
+int TDEAccel::stringToKey( const TQString& sKey )
{
return KKey( sKey ).keyCodeQt();
}
-int KAccel::currentKey( const TQString& sAction ) const
+int TDEAccel::currentKey( const TQString& sAction ) const
{
- KAccelAction* pAction = d->actionPtr( sAction );
+ TDEAccelAction* pAction = d->actionPtr( sAction );
if( pAction )
return pAction->shortcut().keyCodeQt();
return 0;
}
-TQString KAccel::findKey( int key ) const
+TQString TDEAccel::findKey( int key ) const
{
- KAccelAction* pAction = d->actionPtr( KKey(key) );
+ TDEAccelAction* pAction = d->actionPtr( KKey(key) );
if( pAction )
return pAction->name();
else
@@ -656,7 +656,7 @@ TQString KAccel::findKey( int key ) const
}
#endif // !KDE_NO_COMPAT
-void KAccel::virtual_hook( int, void* )
+void TDEAccel::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
#include "kaccel.moc"
diff --git a/tdecore/kaccel.h b/tdecore/kaccel.h
index 491fa39c..8a3f2d49 100644
--- a/tdecore/kaccel.h
+++ b/tdecore/kaccel.h
@@ -27,11 +27,11 @@
class TQPopupMenu; // for obsolete insertItem() methods below
class TQWidget;
-class KAccelAction;
-class KAccelActions;
+class TDEAccelAction;
+class TDEAccelActions;
class TDEConfigBase;
-class KAccelPrivate;
+class TDEAccelPrivate;
/**
* Handle shortcuts.
*
@@ -39,17 +39,17 @@ class KAccelPrivate;
* through application configuration files or through the
* KKeyChooser GUI.
*
- * A KAccel contains a list of accelerator actions.
+ * A TDEAccel contains a list of accelerator actions.
*
* For example, CTRL+Key_P could be a shortcut for printing a document. The key
* codes are listed in tqnamespace.h. "Print" could be the action name for printing.
* The action name identifies the shortcut in configuration files and the
* KKeyChooser GUI.
*
- * A KAccel object handles key events sent to its parent widget and to all
- * children of this parent widget. The most recently created KAccel object
- * has precedence over any KAccel objects created before it.
- * When a shortcut pressed, KAccel calls the slot to which it has been
+ * A TDEAccel object handles key events sent to its parent widget and to all
+ * children of this parent widget. The most recently created TDEAccel object
+ * has precedence over any TDEAccel objects created before it.
+ * When a shortcut pressed, TDEAccel calls the slot to which it has been
* connected. If you want to set global accelerators, independent of the window
* which has the focus, use TDEGlobalAccel.
*
@@ -69,14 +69,14 @@ class KAccelPrivate;
* The translated first argument for insertItem() is used only
* in the configuration dialog.
*\code
- * KAccel* pAccel = new KAccel( this );
+ * TDEAccel* pAccel = new TDEAccel( this );
*
* // Insert an action "Scroll Up" which is associated with the "Up" key:
* pAccel->insert( "Scroll Up", i18n("Scroll up"),
* i18n("Scroll up the current document by one line."),
* Qt::Key_Up, this, TQT_SLOT(slotScrollUp()) );
* // Insert an standard acclerator action.
- * pAccel->insert( KStdAccel::Print, this, TQT_SLOT(slotPrint()) );
+ * pAccel->insert( TDEStdAccel::Print, this, TQT_SLOT(slotPrint()) );
*
* // Update the shortcuts by read any user-defined settings from the
* // application's config file.
@@ -85,56 +85,56 @@ class KAccelPrivate;
*
* @short Configurable shortcut support for widgets.
* @see TDEGlobalAccel
- * @see KAccelShortcutList
+ * @see TDEAccelShortcutList
* @see KKeyChooser
* @see KKeyDialog
*/
-class TDECORE_EXPORT KAccel : public TQAccel
+class TDECORE_EXPORT TDEAccel : public TQAccel
{
Q_OBJECT
public:
/**
- * Creates a new KAccel that watches @p pParent, which is also
+ * Creates a new TDEAccel that watches @p pParent, which is also
* the QObject's parent.
*
* @param pParent the parent and widget to watch for key strokes
* @param psName the name of the QObject
*/
- KAccel( TQWidget* pParent, const char* psName = 0 );
+ TDEAccel( TQWidget* pParent, const char* psName = 0 );
/**
- * Creates a new KAccel that watches @p watch.
+ * Creates a new TDEAccel that watches @p watch.
*
* @param watch the widget to watch for key strokes
* @param parent the parent of the QObject
* @param psName the name of the QObject
*/
- KAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 );
- virtual ~KAccel();
+ TDEAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 );
+ virtual ~TDEAccel();
/**
* @internal
- * Returns the KAccel's @p KAccelActions, a list of @p KAccelAction.
- * @return the KAccelActions of the KAccel
+ * Returns the TDEAccel's @p TDEAccelActions, a list of @p TDEAccelAction.
+ * @return the TDEAccelActions of the TDEAccel
*/
- KAccelActions& actions();
+ TDEAccelActions& actions();
/**
* @internal
- * Returns the KAccel's @p KAccelActions, a list of @p KAccelAction.
- * @return the KAccelActions of the KAccel
+ * Returns the TDEAccel's @p TDEAccelActions, a list of @p TDEAccelAction.
+ * @return the TDEAccelActions of the TDEAccel
*/
- const KAccelActions& actions() const;
+ const TDEAccelActions& actions() const;
/**
- * Checks whether the KAccel is active.
+ * Checks whether the TDEAccel is active.
* @return true if the TQAccel is enabled
*/
bool isEnabled();
/**
- * Enables or disables the KAccel.
+ * Enables or disables the TDEAccel.
* @param bEnabled true to enable, false to disable
*/
void setEnabled( bool bEnabled );
@@ -172,16 +172,16 @@ class TDECORE_EXPORT KAccel : public TQAccel
* @param bConfigurable Allow the user to change this shortcut if set to 'true'.
* @param bEnabled The action will be activated by the shortcut if set to 'true'.
*/
- KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& cutDef,
+ TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& cutDef,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable = true, bool bEnabled = true );
/**
* Same as first insert(), but with separate shortcuts defined for
* 3- and 4- modifier defaults.
*/
- KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& cutDef3, const KShortcut& cutDef4,
+ TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable = true, bool bEnabled = true );
/**
@@ -201,16 +201,16 @@ class TDECORE_EXPORT KAccel : public TQAccel
* @param bConfigurable Allow the user to change this shortcut if set to 'true'.
* @param bEnabled The action will be activated by the shortcut if set to 'true'.
*/
- KAccelAction* insert( const char* psAction, const KShortcut& cutDef,
+ TDEAccelAction* insert( const char* psAction, const TDEShortcut& cutDef,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable = true, bool bEnabled = true );
/**
* Similar to the first insert() method, but with the action
* name, short description, help text, and default shortcuts all
* set according to one of the standard accelerators.
- * @see KStdAccel.
+ * @see TDEStdAccel.
*/
- KAccelAction* insert( KStdAccel::StdAccel id,
+ TDEAccelAction* insert( TDEStdAccel::StdAccel id,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable = true, bool bEnabled = true );
@@ -237,7 +237,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
* @param sAction the name of the action
* @return the action's shortcut, or a null shortcut if not found
*/
- const KShortcut& shortcut( const TQString& sAction ) const;
+ const TDEShortcut& shortcut( const TQString& sAction ) const;
/**
* Set the shortcut to be associated with the action named by @p sAction.
@@ -245,7 +245,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
* @param shortcut the shortcut to set
* @return true if successful, false otherwise
*/
- bool setShortcut( const TQString& sAction, const KShortcut &shortcut );
+ bool setShortcut( const TQString& sAction, const TDEShortcut &shortcut );
/**
* Set the slot to be called when the shortcut of the action named
@@ -329,7 +329,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
/**
* @deprecated use insert
*/
- bool insertStdItem( KStdAccel::StdAccel id, const TQString& descr = TQString::null ) KDE_DEPRECATED;
+ bool insertStdItem( TDEStdAccel::StdAccel id, const TQString& descr = TQString::null ) KDE_DEPRECATED;
/**
* @deprecated use insert
*/
@@ -338,7 +338,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
* @deprecated use insert( accel, pObjSlot, psMethodSlot );
*
*/
- KDE_DEPRECATED bool connectItem( KStdAccel::StdAccel accel, const TQObject* pObjSlot, const char* psMethodSlot )
+ KDE_DEPRECATED bool connectItem( TDEStdAccel::StdAccel accel, const TQObject* pObjSlot, const char* psMethodSlot )
{ return insert( accel, pObjSlot, psMethodSlot ); }
/**
* @deprecated use remove
@@ -355,7 +355,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
/**
* @deprecated see KDE3PORTING.html
*/
- void changeMenuAccel( TQPopupMenu *menu, int id, KStdAccel::StdAccel accel ) KDE_DEPRECATED;
+ void changeMenuAccel( TQPopupMenu *menu, int id, TDEStdAccel::StdAccel accel ) KDE_DEPRECATED;
/**
* @deprecated
*/
@@ -383,8 +383,8 @@ class TDECORE_EXPORT KAccel : public TQAccel
/** \internal */
virtual void virtual_hook( int id, void* data );
private:
- class KAccelPrivate* d;
- friend class KAccelPrivate;
+ class TDEAccelPrivate* d;
+ friend class TDEAccelPrivate;
};
#endif // _KACCEL_H
diff --git a/tdecore/kaccelaction.cpp b/tdecore/kaccelaction.cpp
index 34448fe9..d3ec59be 100644
--- a/tdecore/kaccelaction.cpp
+++ b/tdecore/kaccelaction.cpp
@@ -21,7 +21,7 @@
*/
#include "kaccelaction.h"
-#include "kaccelbase.h" // for KAccelBase::slotRemoveAction() & emitSignal()
+#include "kaccelbase.h" // for TDEAccelBase::slotRemoveAction() & emitSignal()
#include <tqkeycode.h>
@@ -34,19 +34,19 @@
#include <kshortcutlist.h>
//---------------------------------------------------------------------
-// KAccelAction
+// TDEAccelAction
//---------------------------------------------------------------------
-class KAccelActionPrivate
+class TDEAccelActionPrivate
{
public:
uint m_nConnections;
};
-KAccelAction::KAccelAction()
+TDEAccelAction::TDEAccelAction()
{
- //kdDebug(125) << "KAccelAction(): this = " << this << endl;
- d = new KAccelActionPrivate;
+ //kdDebug(125) << "TDEAccelAction(): this = " << this << endl;
+ d = new TDEAccelActionPrivate;
m_pObjSlot = 0;
m_psMethodSlot = 0;
m_bConfigurable = true;
@@ -55,33 +55,33 @@ KAccelAction::KAccelAction()
d->m_nConnections = 0;
}
-KAccelAction::KAccelAction( const KAccelAction& action )
+TDEAccelAction::TDEAccelAction( const TDEAccelAction& action )
{
- //kdDebug(125) << "KAccelAction( copy from \"" << action.m_sName << "\" ): this = " << this << endl;
- d = new KAccelActionPrivate;
+ //kdDebug(125) << "TDEAccelAction( copy from \"" << action.m_sName << "\" ): this = " << this << endl;
+ d = new TDEAccelActionPrivate;
*this = action;
}
-KAccelAction::KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& cutDef3, const KShortcut& cutDef4,
+TDEAccelAction::TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled )
{
- //kdDebug(125) << "KAccelAction( \"" << sName << "\" ): this = " << this << endl;
- d = new KAccelActionPrivate;
+ //kdDebug(125) << "TDEAccelAction( \"" << sName << "\" ): this = " << this << endl;
+ d = new TDEAccelActionPrivate;
init( sName, sLabel, sWhatsThis,
cutDef3, cutDef4,
pObjSlot, psMethodSlot,
bConfigurable, bEnabled );
}
-KAccelAction::~KAccelAction()
+TDEAccelAction::~TDEAccelAction()
{
- //kdDebug(125) << "\t\t\tKAccelAction::~KAccelAction( \"" << m_sName << "\" ): this = " << this << endl;
+ //kdDebug(125) << "\t\t\tTDEAccelAction::~TDEAccelAction( \"" << m_sName << "\" ): this = " << this << endl;
delete d;
}
-void KAccelAction::clear()
+void TDEAccelAction::clear()
{
m_cut.clear();
m_pObjSlot = 0;
@@ -92,8 +92,8 @@ void KAccelAction::clear()
d->m_nConnections = 0;
}
-bool KAccelAction::init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+bool TDEAccelAction::init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled )
{
@@ -110,11 +110,11 @@ bool KAccelAction::init( const TQString& sName, const TQString& sLabel, const TQ
m_cut = shortcutDefault();
d->m_nConnections = 0;
if( !m_bEnabled )
- kdDebug(125) << "KAccelAction::init( \"" << sName << "\" ): created with enabled = false" << endl;
+ kdDebug(125) << "TDEAccelAction::init( \"" << sName << "\" ): created with enabled = false" << endl;
return true;
}
-KAccelAction& KAccelAction::operator =( const KAccelAction& action )
+TDEAccelAction& TDEAccelAction::operator =( const TDEAccelAction& action )
{
m_sName = action.m_sName;
m_sLabel = action.m_sLabel;
@@ -132,37 +132,37 @@ KAccelAction& KAccelAction::operator =( const KAccelAction& action )
return *this;
}
-void KAccelAction::setName( const TQString& s )
+void TDEAccelAction::setName( const TQString& s )
{ m_sName = s; }
-void KAccelAction::setLabel( const TQString& s )
+void TDEAccelAction::setLabel( const TQString& s )
{ m_sLabel = s; }
-void KAccelAction::setWhatsThis( const TQString& s )
+void TDEAccelAction::setWhatsThis( const TQString& s )
{ m_sWhatsThis = s; }
-bool KAccelAction::setShortcut( const KShortcut& cut )
+bool TDEAccelAction::setShortcut( const TDEShortcut& cut )
{
m_cut = cut;
return true;
}
-void KAccelAction::setSlot( const TQObject* pObjSlot, const char* psMethodSlot )
+void TDEAccelAction::setSlot( const TQObject* pObjSlot, const char* psMethodSlot )
{
m_pObjSlot = pObjSlot;
m_psMethodSlot = psMethodSlot;
}
-void KAccelAction::setConfigurable( bool b )
+void TDEAccelAction::setConfigurable( bool b )
{ m_bConfigurable = b; }
-void KAccelAction::setEnabled( bool b )
+void TDEAccelAction::setEnabled( bool b )
{ m_bEnabled = b; }
-TQString KAccelAction::toString() const
+TQString TDEAccelAction::toString() const
{ return m_cut.toString(); }
-TQString KAccelAction::toStringInternal() const
+TQString TDEAccelAction::toStringInternal() const
{ return m_cut.toStringInternal( &shortcutDefault() ); }
-bool KAccelAction::setKeySequence( uint i, const KKeySequence& seq )
+bool TDEAccelAction::setKeySequence( uint i, const KKeySequence& seq )
{
if( i < m_cut.count() ) {
m_cut.setSeq( i, seq );
@@ -172,12 +172,12 @@ bool KAccelAction::setKeySequence( uint i, const KKeySequence& seq )
return false;
}
-void KAccelAction::clearShortcut()
+void TDEAccelAction::clearShortcut()
{
m_cut.clear();
}
-bool KAccelAction::contains( const KKeySequence& seq )
+bool TDEAccelAction::contains( const KKeySequence& seq )
{
return m_cut.contains( seq );
for( uint i = 0; i < m_cut.count(); i++ ) {
@@ -187,90 +187,90 @@ bool KAccelAction::contains( const KKeySequence& seq )
return false;
}
-const KShortcut& KAccelAction::shortcutDefault() const
+const TDEShortcut& TDEAccelAction::shortcutDefault() const
{ return (useFourModifierKeys()) ? m_cutDefault4 : m_cutDefault3; }
-bool KAccelAction::isConnected() const
+bool TDEAccelAction::isConnected() const
{ return d->m_nConnections; }
-void KAccelAction::incConnections()
+void TDEAccelAction::incConnections()
{ d->m_nConnections++; }
-void KAccelAction::decConnections()
+void TDEAccelAction::decConnections()
{ if( d->m_nConnections > 0 ) d->m_nConnections--; }
// Indicate whether to default to the 3- or 4- modifier keyboard schemes
-int KAccelAction::g_bUseFourModifierKeys = -1;
+int TDEAccelAction::g_bUseFourModifierKeys = -1;
-bool KAccelAction::useFourModifierKeys()
+bool TDEAccelAction::useFourModifierKeys()
{
- if( KAccelAction::g_bUseFourModifierKeys == -1 ) {
+ if( TDEAccelAction::g_bUseFourModifierKeys == -1 ) {
// Read in whether to use 4 modifier keys
TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
bool b = TDEGlobal::config()->readBoolEntry( "Use Four Modifier Keys", false );
- KAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey();
+ TDEAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey();
}
- return KAccelAction::g_bUseFourModifierKeys == 1;
+ return TDEAccelAction::g_bUseFourModifierKeys == 1;
}
-void KAccelAction::useFourModifierKeys( bool b )
+void TDEAccelAction::useFourModifierKeys( bool b )
{
- if( KAccelAction::g_bUseFourModifierKeys != (int)b ) {
- KAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey();
+ if( TDEAccelAction::g_bUseFourModifierKeys != (int)b ) {
+ TDEAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey();
// If we're 'turning off' the meta key or, if we're turning it on,
// the keyboard must actually have a meta key.
if( b && !KKeyNative::keyboardHasWinKey() )
kdDebug(125) << "Tried to use four modifier keys on a keyboard layout without a Meta key.\n";
}
TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
- TDEGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true);
+ TDEGlobal::config()->writeEntry( "Use Four Modifier Keys", TDEAccelAction::g_bUseFourModifierKeys, true, true);
- kdDebug(125) << "bUseFourModifierKeys = " << KAccelAction::g_bUseFourModifierKeys << endl;
+ kdDebug(125) << "bUseFourModifierKeys = " << TDEAccelAction::g_bUseFourModifierKeys << endl;
}
//---------------------------------------------------------------------
-// KAccelActions
+// TDEAccelActions
//---------------------------------------------------------------------
-class KAccelActionsPrivate
+class TDEAccelActionsPrivate
{
public:
};
-KAccelActions::KAccelActions()
+TDEAccelActions::TDEAccelActions()
{
- kdDebug(125) << "KAccelActions(): this = " << this << endl;
+ kdDebug(125) << "TDEAccelActions(): this = " << this << endl;
initPrivate( 0 );
}
-KAccelActions::KAccelActions( const KAccelActions& actions )
+TDEAccelActions::TDEAccelActions( const TDEAccelActions& actions )
{
- kdDebug(125) << "KAccelActions( actions = " << &actions << " ): this = " << this << endl;
+ kdDebug(125) << "TDEAccelActions( actions = " << &actions << " ): this = " << this << endl;
initPrivate( 0 );
init( actions );
}
-KAccelActions::KAccelActions( KAccelBase* pKAccelBase )
+TDEAccelActions::TDEAccelActions( TDEAccelBase* pTDEAccelBase )
{
- kdDebug(125) << "KAccelActions( KAccelBase = " << pKAccelBase << " ): this = " << this << endl;
- initPrivate( pKAccelBase );
+ kdDebug(125) << "TDEAccelActions( TDEAccelBase = " << pTDEAccelBase << " ): this = " << this << endl;
+ initPrivate( pTDEAccelBase );
}
-KAccelActions::~KAccelActions()
+TDEAccelActions::~TDEAccelActions()
{
- //kdDebug(125) << "KAccelActions::~KAccelActions(): this = " << this << endl;
+ //kdDebug(125) << "TDEAccelActions::~TDEAccelActions(): this = " << this << endl;
clear();
//delete d;
}
-void KAccelActions::initPrivate( KAccelBase* pKAccelBase )
+void TDEAccelActions::initPrivate( TDEAccelBase* pTDEAccelBase )
{
- m_pKAccelBase = pKAccelBase;
+ m_pTDEAccelBase = pTDEAccelBase;
m_nSizeAllocated = m_nSize = 0;
m_prgActions = 0;
- //d = new KAccelActionsPrivate;
+ //d = new TDEAccelActionsPrivate;
}
-void KAccelActions::clear()
+void TDEAccelActions::clear()
{
- kdDebug(125) << "\tKAccelActions::clear()" << endl;
+ kdDebug(125) << "\tTDEAccelActions::clear()" << endl;
for( uint i = 0; i < m_nSize; i++ )
delete m_prgActions[i];
delete[] m_prgActions;
@@ -279,14 +279,14 @@ void KAccelActions::clear()
m_prgActions = 0;
}
-bool KAccelActions::init( const KAccelActions& actions )
+bool TDEAccelActions::init( const TDEAccelActions& actions )
{
clear();
resize( actions.count() );
for( uint i = 0; i < m_nSize; i++ ) {
- KAccelAction* pAction = actions.m_prgActions[i];
+ TDEAccelAction* pAction = actions.m_prgActions[i];
if( pAction )
- m_prgActions[i] = new KAccelAction( *pAction );
+ m_prgActions[i] = new TDEAccelAction( *pAction );
else
m_prgActions[i] = 0;
}
@@ -294,22 +294,22 @@ bool KAccelActions::init( const KAccelActions& actions )
return true;
}
-bool KAccelActions::init( TDEConfigBase& config, const TQString& sGroup )
+bool TDEAccelActions::init( TDEConfigBase& config, const TQString& sGroup )
{
- kdDebug(125) << "KAccelActions::init( " << sGroup << " )" << endl;
+ kdDebug(125) << "TDEAccelActions::init( " << sGroup << " )" << endl;
TQMap<TQString, TQString> mapEntry = config.entryMap( sGroup );
resize( mapEntry.count() );
TQMap<TQString, TQString>::Iterator it( mapEntry.begin() );
for( uint i = 0; it != mapEntry.end(); ++it, i++ ) {
TQString sShortcuts = *it;
- KShortcut cuts;
+ TDEShortcut cuts;
kdDebug(125) << it.key() << " = " << sShortcuts << endl;
if( !sShortcuts.isEmpty() && sShortcuts != "none" )
cuts.init( sShortcuts );
- m_prgActions[i] = new KAccelAction( it.key(), it.key(), it.key(),
+ m_prgActions[i] = new TDEAccelAction( it.key(), it.key(), it.key(),
cuts, cuts,
0, 0, // pObjSlot, psMethodSlot,
true, false ); // bConfigurable, bEnabled
@@ -318,11 +318,11 @@ bool KAccelActions::init( TDEConfigBase& config, const TQString& sGroup )
return true;
}
-void KAccelActions::resize( uint nSize )
+void TDEAccelActions::resize( uint nSize )
{
if( nSize > m_nSizeAllocated ) {
uint nSizeAllocated = ((nSize/10) + 1) * 10;
- KAccelAction** prgActions = new KAccelAction* [nSizeAllocated];
+ TDEAccelAction** prgActions = new TDEAccelAction* [nSizeAllocated];
// Copy pointers over to new array
for( uint i = 0; i < m_nSizeAllocated; i++ )
@@ -340,21 +340,21 @@ void KAccelActions::resize( uint nSize )
m_nSize = nSize;
}
-void KAccelActions::insertPtr( KAccelAction* pAction )
+void TDEAccelActions::insertPtr( TDEAccelAction* pAction )
{
resize( m_nSize + 1 );
m_prgActions[m_nSize-1] = pAction;
}
-void KAccelActions::updateShortcuts( KAccelActions& actions2 )
+void TDEAccelActions::updateShortcuts( TDEAccelActions& actions2 )
{
- kdDebug(125) << "KAccelActions::updateShortcuts()" << endl;
+ kdDebug(125) << "TDEAccelActions::updateShortcuts()" << endl;
bool bChanged = false;
for( uint i = 0; i < m_nSize; i++ ) {
- KAccelAction* pAction = m_prgActions[i];
+ TDEAccelAction* pAction = m_prgActions[i];
if( pAction && pAction->m_bConfigurable ) {
- KAccelAction* pAction2 = actions2.actionPtr( pAction->m_sName );
+ TDEAccelAction* pAction2 = actions2.actionPtr( pAction->m_sName );
if( pAction2 ) {
TQString sOld = pAction->m_cut.toStringInternal();
pAction->m_cut = pAction2->m_cut;
@@ -371,68 +371,68 @@ void KAccelActions::updateShortcuts( KAccelActions& actions2 )
emitKeycodeChanged();
}
-int KAccelActions::actionIndex( const TQString& sAction ) const
+int TDEAccelActions::actionIndex( const TQString& sAction ) const
{
for( uint i = 0; i < m_nSize; i++ ) {
if( m_prgActions[i] == 0 )
- kdWarning(125) << "KAccelActions::actionPtr( " << sAction << " ): encountered null pointer at m_prgActions[" << i << "]" << endl;
+ kdWarning(125) << "TDEAccelActions::actionPtr( " << sAction << " ): encountered null pointer at m_prgActions[" << i << "]" << endl;
else if( m_prgActions[i]->m_sName == sAction )
return (int) i;
}
return -1;
}
-KAccelAction* KAccelActions::actionPtr( uint i )
+TDEAccelAction* TDEAccelActions::actionPtr( uint i )
{
return m_prgActions[i];
}
-const KAccelAction* KAccelActions::actionPtr( uint i ) const
+const TDEAccelAction* TDEAccelActions::actionPtr( uint i ) const
{
return m_prgActions[i];
}
-KAccelAction* KAccelActions::actionPtr( const TQString& sAction )
+TDEAccelAction* TDEAccelActions::actionPtr( const TQString& sAction )
{
int i = actionIndex( sAction );
return (i >= 0) ? m_prgActions[i] : 0;
}
-const KAccelAction* KAccelActions::actionPtr( const TQString& sAction ) const
+const TDEAccelAction* TDEAccelActions::actionPtr( const TQString& sAction ) const
{
int i = actionIndex( sAction );
return (i >= 0) ? m_prgActions[i] : 0;
}
-KAccelAction* KAccelActions::actionPtr( KKeySequence cut )
+TDEAccelAction* TDEAccelActions::actionPtr( KKeySequence cut )
{
for( uint i = 0; i < m_nSize; i++ ) {
if( m_prgActions[i] == 0 )
- kdWarning(125) << "KAccelActions::actionPtr( " << cut.toStringInternal() << " ): encountered null pointer at m_prgActions[" << i << "]" << endl;
+ kdWarning(125) << "TDEAccelActions::actionPtr( " << cut.toStringInternal() << " ): encountered null pointer at m_prgActions[" << i << "]" << endl;
else if( m_prgActions[i]->contains( cut ) )
return m_prgActions[i];
}
return 0;
}
-KAccelAction& KAccelActions::operator []( uint i )
+TDEAccelAction& TDEAccelActions::operator []( uint i )
{
return *actionPtr( i );
}
-const KAccelAction& KAccelActions::operator []( uint i ) const
+const TDEAccelAction& TDEAccelActions::operator []( uint i ) const
{
return *actionPtr( i );
}
-KAccelAction* KAccelActions::insert( const TQString& sName, const TQString& sLabel )
+TDEAccelAction* TDEAccelActions::insert( const TQString& sName, const TQString& sLabel )
{
if( actionPtr( sName ) ) {
- kdWarning(125) << "KAccelActions::insertLabel( " << sName << ", " << sLabel << " ): action with same name already present." << endl;
+ kdWarning(125) << "TDEAccelActions::insertLabel( " << sName << ", " << sLabel << " ): action with same name already present." << endl;
return 0;
}
- KAccelAction* pAction = new KAccelAction;
+ TDEAccelAction* pAction = new TDEAccelAction;
pAction->m_sName = sName;
pAction->m_sLabel = sLabel;
pAction->m_bConfigurable = false;
@@ -442,38 +442,38 @@ KAccelAction* KAccelActions::insert( const TQString& sName, const TQString& sLab
return pAction;
}
-KAccelAction* KAccelActions::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+TDEAccelAction* TDEAccelActions::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled )
{
- //kdDebug(125) << "KAccelActions::insert()2 begin" << endl;
+ //kdDebug(125) << "TDEAccelActions::insert()2 begin" << endl;
if( actionPtr( sAction ) ) {
- kdWarning(125) << "KAccelActions::insert( " << sAction << " ): action with same name already present." << endl;
+ kdWarning(125) << "TDEAccelActions::insert( " << sAction << " ): action with same name already present." << endl;
return 0;
}
- KAccelAction* pAction = new KAccelAction(
+ TDEAccelAction* pAction = new TDEAccelAction(
sAction, sLabel, sWhatsThis,
rgCutDefaults3, rgCutDefaults4,
pObjSlot, psMethodSlot,
bConfigurable, bEnabled );
insertPtr( pAction );
- //kdDebug(125) << "KAccelActions::insert()2 end" << endl;
+ //kdDebug(125) << "TDEAccelActions::insert()2 end" << endl;
return pAction;
}
-bool KAccelActions::remove( const TQString& sAction )
+bool TDEAccelActions::remove( const TQString& sAction )
{
- kdDebug(125) << "KAccelActions::remove( \"" << sAction << "\" ): this = " << this << " m_pKAccelBase = " << m_pKAccelBase << endl;
+ kdDebug(125) << "TDEAccelActions::remove( \"" << sAction << "\" ): this = " << this << " m_pTDEAccelBase = " << m_pTDEAccelBase << endl;
int iAction = actionIndex( sAction );
if( iAction < 0 )
return false;
- if( m_pKAccelBase )
- m_pKAccelBase->slotRemoveAction( m_prgActions[iAction] );
+ if( m_pTDEAccelBase )
+ m_pTDEAccelBase->slotRemoveAction( m_prgActions[iAction] );
delete m_prgActions[iAction];
for( uint i = iAction; i < m_nSize - 1; i++ )
@@ -483,39 +483,39 @@ bool KAccelActions::remove( const TQString& sAction )
return true;
}
-bool KAccelActions::readActions( const TQString& sConfigGroup, TDEConfigBase* pConfig )
+bool TDEAccelActions::readActions( const TQString& sConfigGroup, TDEConfigBase* pConfig )
{
- KAccelShortcutList accelList(*this, false);
+ TDEAccelShortcutList accelList(*this, false);
return accelList.readSettings( sConfigGroup, pConfig );
}
/*
- 1) KAccelAction = "Something"
+ 1) TDEAccelAction = "Something"
1) KKeySequence = "Meta+X,Asterisk"
- 1) KAccelSequence = "Meta+X"
+ 1) TDEAccelSequence = "Meta+X"
1) KKeySequence = Meta+X
- 2) KAccelSequence = "Asterisk"
+ 2) TDEAccelSequence = "Asterisk"
1) KKeySequence = Shift+8 (English layout)
2) KKeySequence = Keypad_Asterisk
2) KKeySequence = "Alt+F2"
- 1) KAccelSequence = "Alt+F2"
+ 1) TDEAccelSequence = "Alt+F2"
1) KKeySequence = Alt+F2
-> "Something=Meta+X,Asterisk;Alt+F2"
*/
-bool KAccelActions::writeActions( const TQString &sGroup, TDEConfigBase* pConfig,
+bool TDEAccelActions::writeActions( const TQString &sGroup, TDEConfigBase* pConfig,
bool bWriteAll, bool bGlobal ) const
{
- kdDebug(125) << "KAccelActions::writeActions( " << sGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
+ kdDebug(125) << "TDEAccelActions::writeActions( " << sGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
if( !pConfig )
pConfig = TDEGlobal::config();
TDEConfigGroupSaver cs( pConfig, sGroup );
for( uint i = 0; i < m_nSize; i++ ) {
if( m_prgActions[i] == 0 ) {
- kdWarning(125) << "KAccelActions::writeActions(): encountered null pointer at m_prgActions[" << i << "]" << endl;
+ kdWarning(125) << "TDEAccelActions::writeActions(): encountered null pointer at m_prgActions[" << i << "]" << endl;
continue;
}
- const KAccelAction& action = *m_prgActions[i];
+ const TDEAccelAction& action = *m_prgActions[i];
TQString s;
bool bConfigHasAction = !pConfig->readEntry( action.m_sName ).isEmpty();
@@ -555,11 +555,11 @@ bool KAccelActions::writeActions( const TQString &sGroup, TDEConfigBase* pConfig
return true;
}
-void KAccelActions::emitKeycodeChanged()
+void TDEAccelActions::emitKeycodeChanged()
{
- if( m_pKAccelBase )
- m_pKAccelBase->emitSignal( KAccelBase::KEYCODE_CHANGED );
+ if( m_pTDEAccelBase )
+ m_pTDEAccelBase->emitSignal( TDEAccelBase::KEYCODE_CHANGED );
}
-uint KAccelActions::count() const
+uint TDEAccelActions::count() const
{ return m_nSize; }
diff --git a/tdecore/kaccelaction.h b/tdecore/kaccelaction.h
index 9cca25d4..809533ff 100644
--- a/tdecore/kaccelaction.h
+++ b/tdecore/kaccelaction.h
@@ -27,7 +27,7 @@
#include <kshortcut.h>
-class KAccelBase;
+class TDEAccelBase;
class TQObject;
class TDEConfig;
@@ -35,27 +35,27 @@ class TDEConfigBase;
/**
* @internal
- * A KAccelAction prepresents an action that can be executed using
- * an accelerator key. Each KAccelAction has a name, a label, a
- * "What's this" string and a KShortcut. The user can configure and
+ * A TDEAccelAction prepresents an action that can be executed using
+ * an accelerator key. Each TDEAccelAction has a name, a label, a
+ * "What's this" string and a TDEShortcut. The user can configure and
* enable/disable them using KKeyDialog.
*
* \code
- * 1) KAccelAction = "Run Command"
+ * 1) TDEAccelAction = "Run Command"
* Default3 = "Alt+F2"
* Default4 = "Meta+Enter;Alt+F2"
- * 1) KShortcut = "Meta+Enter"
+ * 1) TDEShortcut = "Meta+Enter"
* 1) KKeySequence = "Meta+Enter"
* 1) KKey = "Meta+Enter"
* 1) Meta+Enter
* 2) Meta+Keypad_Enter
- * 2) KShortcut = "Alt+F2"
+ * 2) TDEShortcut = "Alt+F2"
* 1) KKeySequence = "Alt+F2"
* 1) Alt+F2
- * 2) KAccelAction = "Something"
+ * 2) TDEAccelAction = "Something"
* Default3 = ""
* Default4 = ""
- * 1) KShortcut = "Meta+X,Asterisk"
+ * 1) TDEShortcut = "Meta+X,Asterisk"
* 1) KKeySequence = "Meta+X,Asterisk"
* 1) KKey = "Meta+X"
* 1) Meta+X
@@ -64,27 +64,27 @@ class TDEConfigBase;
* 2) Keypad_Asterisk
* \endcode
* @short An accelerator action
- * @see KAccel
+ * @see TDEAccel
* @see TDEGlobalAccel
* @see KKeyChooser
* @see KKeyDialog
*/
-class TDECORE_EXPORT KAccelAction
+class TDECORE_EXPORT TDEAccelAction
{
public:
/**
- * Creates an empty KAccelAction.
+ * Creates an empty TDEAccelAction.
* @see clear()
*/
- KAccelAction();
+ TDEAccelAction();
/**
* Copy constructor.
*/
- KAccelAction( const KAccelAction& );
+ TDEAccelAction( const TDEAccelAction& );
/**
- * Creates a new KAccelAction.
+ * Creates a new TDEAccelAction.
* @param sName the name of the accelerator
* @param sLabel the label of the accelerator (i18n!)
* @param sWhatsThis the What's This text (18n!)
@@ -97,11 +97,11 @@ class TDECORE_EXPORT KAccelAction
* @param bConfigurable if true the user can configure the shortcut
* @param bEnabled true if the accelerator should be enabled
*/
- KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& cutDef3, const KShortcut& cutDef4,
+ TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled );
- ~KAccelAction();
+ ~TDEAccelAction();
/**
* Clears the accelerator.
@@ -109,7 +109,7 @@ class TDECORE_EXPORT KAccelAction
void clear();
/**
- * Re-initialized the KAccelAction.
+ * Re-initialized the TDEAccelAction.
* @param sName the name of the accelerator
* @param sLabel the label of the accelerator (i18n!)
* @param sWhatsThis the What's This text (18n!)
@@ -124,14 +124,14 @@ class TDECORE_EXPORT KAccelAction
* @return true if successful, false otherwise
*/
bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& cutDef3, const KShortcut& cutDef4,
+ const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled );
/**
- * Copies this KAccelAction.
+ * Copies this TDEAccelAction.
*/
- KAccelAction& operator=( const KAccelAction& );
+ TDEAccelAction& operator=( const TDEAccelAction& );
/**
* Returns the name of the accelerator action.
@@ -156,10 +156,10 @@ class TDECORE_EXPORT KAccelAction
/**
* The shortcut that is actually used (may be used configured).
- * @return the shortcut of the KAccelAction, can be null if not set
+ * @return the shortcut of the TDEAccelAction, can be null if not set
* @see shortcutDefault()
*/
- const KShortcut& shortcut() const { return m_cut; }
+ const TDEShortcut& shortcut() const { return m_cut; }
/**
* The default shortcut for this system.
@@ -168,7 +168,7 @@ class TDECORE_EXPORT KAccelAction
* @see shortcutDefault3()
* @see shortcutDefault4()
*/
- const KShortcut& shortcutDefault() const;
+ const TDEShortcut& shortcutDefault() const;
/**
* The default shortcut for 3 modifier systems.
@@ -178,7 +178,7 @@ class TDECORE_EXPORT KAccelAction
* @see shortcutDefault4()
* @see useFourModifierKeys()
*/
- const KShortcut& shortcutDefault3() const { return m_cutDefault3; }
+ const TDEShortcut& shortcutDefault3() const { return m_cutDefault3; }
/**
* The default shortcut for 4 modifier systems.
@@ -188,7 +188,7 @@ class TDECORE_EXPORT KAccelAction
* @see shortcutDefault3()
* @see useFourModifierKeys()
*/
- const KShortcut& shortcutDefault4() const { return m_cutDefault4; }
+ const TDEShortcut& shortcutDefault4() const { return m_cutDefault4; }
/**
* Returns the receiver of signals.
@@ -237,7 +237,7 @@ class TDECORE_EXPORT KAccelAction
* @param rgCuts the shortcut to set
* @return true if successful, false otherwise
*/
- bool setShortcut( const KShortcut& rgCuts );
+ bool setShortcut( const TDEShortcut& rgCuts );
/**
* Sets the slot of the accelerator action.
@@ -284,14 +284,14 @@ class TDECORE_EXPORT KAccelAction
* @param i the position of the sequence
* @param keySeq the new new sequence
* @return true if successful, false otherwise
- * @see KShortcut::setSeq()
+ * @see TDEShortcut::setSeq()
*/
bool setKeySequence( uint i, const KKeySequence &keySeq );
/**
* Clears the action's shortcut. It will not contain any sequences after
* calling this method.
- * @see KShortcut::clear()
+ * @see TDEShortcut::clear()
*/
void clearShortcut();
@@ -299,14 +299,14 @@ class TDECORE_EXPORT KAccelAction
* Checks whether the action's shortcut contains the given key sequence.
* @param keySeq the key sequence to check
* @return true if the shortcut contains the given sequence
- * @see KShortcut::contains()
+ * @see TDEShortcut::contains()
*/
bool contains( const KKeySequence &keySeq );
/**
* Returns the string representation of the action's shortcut.
* @return the string representation of the action's shortcut.
- * @see KShortcut::toString()
+ * @see TDEShortcut::toString()
*/
TQString toString() const;
@@ -332,8 +332,8 @@ class TDECORE_EXPORT KAccelAction
TQString m_sName /**< Name of accel. @sa setName() */,
m_sLabel /**< Label of accel. User-visible. */,
m_sWhatsThis /**< WhatsThis help for accel. User-visible. */;
- KShortcut m_cut /**< Shortcut actually assigned. */;
- KShortcut m_cutDefault3 /**< Default shortcut in 3-modifier layout */,
+ TDEShortcut m_cut /**< Shortcut actually assigned. */;
+ TDEShortcut m_cutDefault3 /**< Default shortcut in 3-modifier layout */,
m_cutDefault4 /**< Default shortcur in 4-modifier layout */;
const TQObject* m_pObjSlot /**< Object we will send signals to. */;
const char* m_psMethodSlot /**< Slot we send signals to, in m_pObjSlot */;
@@ -349,36 +349,36 @@ class TDECORE_EXPORT KAccelAction
private:
static int g_bUseFourModifierKeys;
- class KAccelActionPrivate* d;
+ class TDEAccelActionPrivate* d;
- friend class KAccelActions;
- friend class KAccelBase;
+ friend class TDEAccelActions;
+ friend class TDEAccelBase;
};
//---------------------------------------------------------------------
-// KAccelActions
+// TDEAccelActions
//---------------------------------------------------------------------
/**
* @internal
- * This class represents a collection of KAccelAction objects.
+ * This class represents a collection of TDEAccelAction objects.
*
* @short A collection of accelerator actions
- * @see KAccelAction
+ * @see TDEAccelAction
*/
-class TDECORE_EXPORT KAccelActions
+class TDECORE_EXPORT TDEAccelActions
{
public:
/**
- * Creates a new, empty KAccelActions object.
+ * Creates a new, empty TDEAccelActions object.
*/
- KAccelActions();
+ TDEAccelActions();
/**
* Copy constructor (deep copy).
*/
- KAccelActions( const KAccelActions& );
- virtual ~KAccelActions();
+ TDEAccelActions( const TDEAccelActions& );
+ virtual ~TDEAccelActions();
/**
* Removes all items from this collection.
@@ -391,7 +391,7 @@ class TDECORE_EXPORT KAccelActions
* @param actions the actions to copy
* @return true if successful, false otherwise
*/
- bool init( const KAccelActions &actions );
+ bool init( const TDEAccelActions &actions );
/**
* Loads the actions from the given configuration file.
@@ -408,7 +408,7 @@ class TDECORE_EXPORT KAccelActions
* @param shortcuts the collection that contains the new
* shortcuts
*/
- void updateShortcuts( KAccelActions &shortcuts );
+ void updateShortcuts( TDEAccelActions &shortcuts );
/**
* Retrieves the index of the action with the given name.
@@ -421,63 +421,63 @@ class TDECORE_EXPORT KAccelActions
* Returns the action with the given @p index.
* @param index the index of an action. You must not
* use an index that is too high.
- * @return the KAccelAction with the given index
+ * @return the TDEAccelAction with the given index
* @see count()
*/
- KAccelAction* actionPtr( uint index );
+ TDEAccelAction* actionPtr( uint index );
/**
* Returns the action with the given @p index.
* @param index the index of an action. You must not
* use an index that is too high.
- * @return the KAccelAction with the given index
+ * @return the TDEAccelAction with the given index
* @see count()
*/
- const KAccelAction* actionPtr( uint index ) const;
+ const TDEAccelAction* actionPtr( uint index ) const;
/**
* Returns the action with the given name.
* @param sAction the name of the action to search
- * @return the KAccelAction with the given name, or 0
+ * @return the TDEAccelAction with the given name, or 0
* if not found
*/
- KAccelAction* actionPtr( const TQString& sAction );
+ TDEAccelAction* actionPtr( const TQString& sAction );
/**
* Returns the action with the given name.
* @param sAction the name of the action to search
- * @return the KAccelAction with the given name, or 0
+ * @return the TDEAccelAction with the given name, or 0
* if not found
*/
- const KAccelAction* actionPtr( const TQString& sAction ) const;
+ const TDEAccelAction* actionPtr( const TQString& sAction ) const;
/**
* Returns the action with the given key sequence.
* @param cut the sequence to search for
- * @return the KAccelAction with the given sequence, or 0
+ * @return the TDEAccelAction with the given sequence, or 0
* if not found
*/
- KAccelAction* actionPtr( KKeySequence cut );
+ TDEAccelAction* actionPtr( KKeySequence cut );
/**
* Returns the action with the given @p index.
* @param index the index of an action. You must not
* use an index that is too high.
- * @return the KAccelAction with the given index
+ * @return the TDEAccelAction with the given index
* @see actionPtr()
* @see count()
*/
- KAccelAction& operator []( uint index );
+ TDEAccelAction& operator []( uint index );
/**
* Returns the action with the given @p index.
* @param index the index of an action. You must not
* use an index that is too high.
- * @return the KAccelAction with the given index
+ * @return the TDEAccelAction with the given index
* @see actionPtr()
* @see count()
*/
- const KAccelAction& operator []( uint index ) const;
+ const TDEAccelAction& operator []( uint index ) const;
/**
* Inserts an action into the collection.
@@ -494,8 +494,8 @@ class TDECORE_EXPORT KAccelActions
* @param bEnabled if true the accelerator should be enabled
* @return the new action
*/
- KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+ TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
const TQObject* pObjSlot = 0, const char* psMethodSlot = 0,
bool bConfigurable = true, bool bEnabled = true );
@@ -505,7 +505,7 @@ class TDECORE_EXPORT KAccelActions
* @param sLabel the label of the accelerator (i18n!)
* @return the new action
*/
- KAccelAction* insert( const TQString& sName, const TQString& sLabel );
+ TDEAccelAction* insert( const TQString& sName, const TQString& sLabel );
/**
* Removes the given action.
@@ -548,9 +548,9 @@ class TDECORE_EXPORT KAccelActions
protected:
/** Base object that proxies signals from us. */
- KAccelBase* m_pKAccelBase;
+ TDEAccelBase* m_pTDEAccelBase;
/** Array of actions we're hanging on to. */
- KAccelAction** m_prgActions;
+ TDEAccelAction** m_prgActions;
uint m_nSizeAllocated /**< Allocated size of the array. */,
m_nSize /**< Amount in use. */ ;
@@ -561,16 +561,16 @@ class TDECORE_EXPORT KAccelActions
*/
void resize( uint new_size );
/** Add a action to this collection. @todo Document ownership. */
- void insertPtr( KAccelAction* );
+ void insertPtr( TDEAccelAction* );
private:
- class KAccelActionsPrivate* d;
+ class TDEAccelActionsPrivate* d;
- KAccelActions( KAccelBase* );
- void initPrivate( KAccelBase* );
- KAccelActions& operator =( KAccelActions& );
+ TDEAccelActions( TDEAccelBase* );
+ void initPrivate( TDEAccelBase* );
+ TDEAccelActions& operator =( TDEAccelActions& );
- friend class KAccelBase;
+ friend class TDEAccelBase;
};
#endif // _KACCELACTION_H
diff --git a/tdecore/kaccelbase.cpp b/tdecore/kaccelbase.cpp
index 75810b2e..23580313 100644
--- a/tdecore/kaccelbase.cpp
+++ b/tdecore/kaccelbase.cpp
@@ -36,17 +36,17 @@
#include "kshortcutmenu.h"
//---------------------------------------------------------------------
-// class KAccelBase::ActionInfo
+// class TDEAccelBase::ActionInfo
//---------------------------------------------------------------------
//---------------------------------------------------------------------
-// class KAccelBase
+// class TDEAccelBase
//---------------------------------------------------------------------
-KAccelBase::KAccelBase( int fInitCode )
+TDEAccelBase::TDEAccelBase( int fInitCode )
: m_rgActions( this )
{
- kdDebug(125) << "KAccelBase(): this = " << this << endl;
+ kdDebug(125) << "TDEAccelBase(): this = " << this << endl;
m_bNativeKeys = fInitCode & NATIVE_KEYS;
m_bEnabled = true;
m_sConfigGroup = "Shortcuts";
@@ -55,27 +55,27 @@ KAccelBase::KAccelBase( int fInitCode )
mtemp_pActionRemoving = 0;
}
-KAccelBase::~KAccelBase()
+TDEAccelBase::~TDEAccelBase()
{
- kdDebug(125) << "~KAccelBase(): this = " << this << endl;
+ kdDebug(125) << "~TDEAccelBase(): this = " << this << endl;
}
-uint KAccelBase::actionCount() const { return m_rgActions.count(); }
-KAccelActions& KAccelBase::actions() { return m_rgActions; }
-bool KAccelBase::isEnabled() const { return m_bEnabled; }
+uint TDEAccelBase::actionCount() const { return m_rgActions.count(); }
+TDEAccelActions& TDEAccelBase::actions() { return m_rgActions; }
+bool TDEAccelBase::isEnabled() const { return m_bEnabled; }
// see TDEGlobalAccel::blockShortcuts() stuff - it's to temporarily block
// all global shortcuts, so that the key grabs are released, but from the app's
// point of view the TDEGlobalAccel is still enabled, so TDEGlobalAccel needs
// to disable key grabbing even if enabled
-bool KAccelBase::isEnabledInternal() const { return isEnabled(); }
+bool TDEAccelBase::isEnabledInternal() const { return isEnabled(); }
-KAccelAction* KAccelBase::actionPtr( const TQString& sAction )
+TDEAccelAction* TDEAccelBase::actionPtr( const TQString& sAction )
{ return m_rgActions.actionPtr( sAction ); }
-const KAccelAction* KAccelBase::actionPtr( const TQString& sAction ) const
+const TDEAccelAction* TDEAccelBase::actionPtr( const TQString& sAction ) const
{ return m_rgActions.actionPtr( sAction ); }
-KAccelAction* KAccelBase::actionPtr( const KKeyServer::Key& key )
+TDEAccelAction* TDEAccelBase::actionPtr( const KKeyServer::Key& key )
{
if( !m_mapKeyToAction.contains( key ) )
return 0;
@@ -83,25 +83,25 @@ KAccelAction* KAccelBase::actionPtr( const KKeyServer::Key& key )
return m_mapKeyToAction[key].pAction;
}
-KAccelAction* KAccelBase::actionPtr( const KKey& key )
+TDEAccelAction* TDEAccelBase::actionPtr( const KKey& key )
{
KKeyServer::Key k2;
k2.init( key, !m_bNativeKeys );
return actionPtr( k2 );
}
-void KAccelBase::setConfigGroup( const TQString& sConfigGroup )
+void TDEAccelBase::setConfigGroup( const TQString& sConfigGroup )
{ m_sConfigGroup = sConfigGroup; }
-void KAccelBase::setConfigGlobal( bool global )
+void TDEAccelBase::setConfigGlobal( bool global )
{ m_bConfigIsGlobal = global; }
-bool KAccelBase::setActionEnabled( const TQString& sAction, bool bEnable )
+bool TDEAccelBase::setActionEnabled( const TQString& sAction, bool bEnable )
{
- KAccelAction* pAction = actionPtr( sAction );
+ TDEAccelAction* pAction = actionPtr( sAction );
if( pAction ) {
if( pAction->m_bEnabled != bEnable ) {
- kdDebug(125) << "KAccelBase::setActionEnabled( " << sAction << ", " << bEnable << " )" << endl;
+ kdDebug(125) << "TDEAccelBase::setActionEnabled( " << sAction << ", " << bEnable << " )" << endl;
pAction->m_bEnabled = bEnable;
if( m_bAutoUpdate ) {
// FIXME: the action may already have it's connections inserted!
@@ -116,9 +116,9 @@ bool KAccelBase::setActionEnabled( const TQString& sAction, bool bEnable )
return false;
}
-bool KAccelBase::setAutoUpdate( bool bAuto )
+bool TDEAccelBase::setAutoUpdate( bool bAuto )
{
- kdDebug(125) << "KAccelBase::setAutoUpdate( " << bAuto << " ): m_bAutoUpdate on entrance = " << m_bAutoUpdate << endl;
+ kdDebug(125) << "TDEAccelBase::setAutoUpdate( " << bAuto << " ): m_bAutoUpdate on entrance = " << m_bAutoUpdate << endl;
bool b = m_bAutoUpdate;
if( !m_bAutoUpdate && bAuto )
updateConnections();
@@ -126,13 +126,13 @@ bool KAccelBase::setAutoUpdate( bool bAuto )
return b;
}
-KAccelAction* KAccelBase::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
- const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+TDEAccelAction* TDEAccelBase::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
+ const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled )
{
- //kdDebug(125) << "KAccelBase::insert() begin" << endl;
- KAccelAction* pAction = m_rgActions.insert(
+ //kdDebug(125) << "TDEAccelBase::insert() begin" << endl;
+ TDEAccelAction* pAction = m_rgActions.insert(
sAction, sDesc, sHelp,
rgCutDefaults3, rgCutDefaults4,
pObjSlot, psMethodSlot,
@@ -141,27 +141,27 @@ KAccelAction* KAccelBase::insert( const TQString& sAction, const TQString& sDesc
if( pAction && m_bAutoUpdate )
insertConnection( pAction );
- //kdDebug(125) << "KAccelBase::insert() end" << endl;
+ //kdDebug(125) << "TDEAccelBase::insert() end" << endl;
return pAction;
}
-KAccelAction* KAccelBase::insert( const TQString& sName, const TQString& sDesc )
+TDEAccelAction* TDEAccelBase::insert( const TQString& sName, const TQString& sDesc )
{ return m_rgActions.insert( sName, sDesc ); }
-bool KAccelBase::remove( const TQString& sAction )
+bool TDEAccelBase::remove( const TQString& sAction )
{
return m_rgActions.remove( sAction );
}
-void KAccelBase::slotRemoveAction( KAccelAction* pAction )
+void TDEAccelBase::slotRemoveAction( TDEAccelAction* pAction )
{
removeConnection( pAction );
}
-bool KAccelBase::setActionSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
+bool TDEAccelBase::setActionSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
{
- kdDebug(125) << "KAccelBase::setActionSlot( " << sAction << ", " << pObjSlot << ", " << psMethodSlot << " )\n";
- KAccelAction* pAction = m_rgActions.actionPtr( sAction );
+ kdDebug(125) << "TDEAccelBase::setActionSlot( " << sAction << ", " << pObjSlot << ", " << psMethodSlot << " )\n";
+ TDEAccelAction* pAction = m_rgActions.actionPtr( sAction );
if( pAction ) {
// If there was a previous connection, remove it.
if( m_bAutoUpdate && pAction->isConnected() ) {
@@ -182,24 +182,24 @@ bool KAccelBase::setActionSlot( const TQString& sAction, const TQObject* pObjSlo
}
/*
-KAccelBase
+TDEAccelBase
Run Command=Meta+Enter;Alt+F2
- KAccelAction = "Run Command"
- 1) KAccelKeySeries = "Meta+Enter"
+ TDEAccelAction = "Run Command"
+ 1) TDEAccelKeySeries = "Meta+Enter"
1a) Meta+Enter
1b) Meta+Keypad_Enter
- 2) KAccelKeySeries = "Alt+F2"
+ 2) TDEAccelKeySeries = "Alt+F2"
1a) Alt+F2
Konqueror=Meta+I,I
- KAccelAction = "Konqueror"
- 1) KAccelKeySeries = "Meta+I,I"
+ TDEAccelAction = "Konqueror"
+ 1) TDEAccelKeySeries = "Meta+I,I"
1a) Meta+I
2a) I
Something=Meta+Asterisk,X
- KAccelAction = "Something"
- 1) KAccelKeySeries = "Meta+Asterisk,X"
+ TDEAccelAction = "Something"
+ 1) TDEAccelKeySeries = "Meta+Asterisk,X"
1a) Meta+Shift+8
1b) Meta+Keypad_8
2a) X
@@ -215,25 +215,25 @@ connect new key sequences
/*
{
For {
- for( KAccelAction::iterator itAction = m_rgActions.begin(); itAction != m_rgActions.end(); ++itAction ) {
- KAccelAction& action = *itAction;
- for( KAccelSeries::iterator itSeries = action.m_rgSeries.begin(); itSeries != action.m_rgSeries.end(); ++itSeries ) {
- KAccelSeries& series = *itSeries;
+ for( TDEAccelAction::iterator itAction = m_rgActions.begin(); itAction != m_rgActions.end(); ++itAction ) {
+ TDEAccelAction& action = *itAction;
+ for( TDEAccelSeries::iterator itSeries = action.m_rgSeries.begin(); itSeries != action.m_rgSeries.end(); ++itSeries ) {
+ TDEAccelSeries& series = *itSeries;
if(
}
}
}
Sort by: iVariation, iSequence, iSeries, iAction
- 1) KAccelAction = "Run Command"
- 1) KAccelKeySeries = "Meta+Enter"
+ 1) TDEAccelAction = "Run Command"
+ 1) TDEAccelKeySeries = "Meta+Enter"
1a) Meta+Enter
1b) Meta+Keypad_Enter
- 2) KAccelKeySeries = "Alt+F2"
+ 2) TDEAccelKeySeries = "Alt+F2"
1a) Alt+F2
- 2) KAccelAction = "Enter Calculation"
- 1) KAccelKeySeries = "Meta+Keypad_Enter"
+ 2) TDEAccelAction = "Enter Calculation"
+ 1) TDEAccelKeySeries = "Meta+Keypad_Enter"
1a) Meta+Keypad_Enter
List =
@@ -246,7 +246,7 @@ connect new key sequences
*/
#ifdef Q_WS_X11
-struct KAccelBase::X
+struct TDEAccelBase::X
{
uint iAction, iSeq, iVari;
KKeyServer::Key key;
@@ -312,10 +312,10 @@ struct KAccelBase::X
Ctrl+KP_Add => #2
*/
-bool KAccelBase::updateConnections()
+bool TDEAccelBase::updateConnections()
{
#ifdef Q_WS_X11
- kdDebug(125) << "KAccelBase::updateConnections() this = " << this << endl;
+ kdDebug(125) << "TDEAccelBase::updateConnections() this = " << this << endl;
// Retrieve the list of keys to be connected, sorted by priority.
// (key, variation, seq)
TQValueVector<X> rgKeys;
@@ -356,7 +356,7 @@ bool KAccelBase::updateConnections()
if( bNonUnique ) {
// Remove connection to single action if there is one
if( m_mapKeyToAction.contains( key ) ) {
- KAccelAction* pAction = m_mapKeyToAction[key].pAction;
+ TDEAccelAction* pAction = m_mapKeyToAction[key].pAction;
if( pAction ) {
m_mapKeyToAction.remove( key );
disconnectKey( *pAction, key );
@@ -376,7 +376,7 @@ bool KAccelBase::updateConnections()
// Disconnect keys which no longer have bindings:
for( KKeyToActionMap::iterator it = m_mapKeyToAction.begin(); it != m_mapKeyToAction.end(); ++it ) {
const KKeyServer::Key& key = it.key();
- KAccelAction* pAction = (*it).pAction;
+ TDEAccelAction* pAction = (*it).pAction;
// If this key is longer used or it points to a different action now,
if( !mapKeyToAction.contains( key ) || mapKeyToAction[key].pAction != pAction ) {
if( pAction ) {
@@ -392,7 +392,7 @@ bool KAccelBase::updateConnections()
// new action map, but which are _not_ present in the old one.
for( KKeyToActionMap::iterator it = mapKeyToAction.begin(); it != mapKeyToAction.end(); ++it ) {
const KKeyServer::Key& key = it.key();
- KAccelAction* pAction = (*it).pAction;
+ TDEAccelAction* pAction = (*it).pAction;
if( !m_mapKeyToAction.contains( key ) || m_mapKeyToAction[key].pAction != pAction ) {
// TODO: Decide what to do if connect fails.
// Probably should remove this item from map.
@@ -419,16 +419,16 @@ bool KAccelBase::updateConnections()
#ifdef Q_WS_X11
// Construct a list of keys to be connected, sorted highest priority first.
-void KAccelBase::createKeyList( TQValueVector<struct X>& rgKeys )
+void TDEAccelBase::createKeyList( TQValueVector<struct X>& rgKeys )
{
- //kdDebug(125) << "KAccelBase::createKeyList()" << endl;
+ //kdDebug(125) << "TDEAccelBase::createKeyList()" << endl;
if( !isEnabledInternal())
return;
// create the list
// For each action
for( uint iAction = 0; iAction < m_rgActions.count(); iAction++ ) {
- KAccelAction* pAction = m_rgActions.actionPtr( iAction );
+ TDEAccelAction* pAction = m_rgActions.actionPtr( iAction );
if( pAction && pAction->m_pObjSlot && pAction->m_psMethodSlot && pAction != mtemp_pActionRemoving ) {
// For each key sequence associated with action
for( uint iSeq = 0; iSeq < pAction->shortcut().count(); iSeq++ ) {
@@ -453,12 +453,12 @@ void KAccelBase::createKeyList( TQValueVector<struct X>& rgKeys )
}
#endif //Q_WS_X11
-bool KAccelBase::insertConnection( KAccelAction* pAction )
+bool TDEAccelBase::insertConnection( TDEAccelAction* pAction )
{
if( !pAction->m_pObjSlot || !pAction->m_psMethodSlot )
return true;
- kdDebug(125) << "KAccelBase::insertConnection( " << pAction << "=\"" << pAction->m_sName << "\"; shortcut = " << pAction->shortcut().toStringInternal() << " ) this = " << this << endl;
+ kdDebug(125) << "TDEAccelBase::insertConnection( " << pAction << "=\"" << pAction->m_sName << "\"; shortcut = " << pAction->shortcut().toStringInternal() << " ) this = " << this << endl;
// For each sequence associated with the given action:
for( uint iSeq = 0; iSeq < pAction->shortcut().count(); iSeq++ ) {
@@ -502,7 +502,7 @@ bool KAccelBase::insertConnection( KAccelAction* pAction )
}
//kdDebug(125) << "\tActions = " << m_rgActions.size() << endl;
- //for( KAccelActions::const_iterator it = m_rgActions.begin(); it != m_rgActions.end(); ++it ) {
+ //for( TDEAccelActions::const_iterator it = m_rgActions.begin(); it != m_rgActions.end(); ++it ) {
// kdDebug(125) << "\t" << &(*it) << " '" << (*it).m_sName << "'" << endl;
//}
@@ -516,9 +516,9 @@ bool KAccelBase::insertConnection( KAccelAction* pAction )
return true;
}
-bool KAccelBase::removeConnection( KAccelAction* pAction )
+bool TDEAccelBase::removeConnection( TDEAccelAction* pAction )
{
- kdDebug(125) << "KAccelBase::removeConnection( " << pAction << " = \"" << pAction->m_sName << "\"; shortcut = " << pAction->m_cut.toStringInternal() << " ): this = " << this << endl;
+ kdDebug(125) << "TDEAccelBase::removeConnection( " << pAction << " = \"" << pAction->m_sName << "\"; shortcut = " << pAction->m_cut.toStringInternal() << " ): this = " << this << endl;
//for( KKeyToActionMap::iterator it = m_mapKeyToAction.begin(); it != m_mapKeyToAction.end(); ++it )
// kdDebug(125) << "\tKey: " << it.key().toString() << " => '" << (*it)->m_sName << "'" << " " << *it << endl;
@@ -548,9 +548,9 @@ bool KAccelBase::removeConnection( KAccelAction* pAction )
return true;
}
-bool KAccelBase::setShortcut( const TQString& sAction, const KShortcut& cut )
+bool TDEAccelBase::setShortcut( const TQString& sAction, const TDEShortcut& cut )
{
- KAccelAction* pAction = actionPtr( sAction );
+ TDEAccelAction* pAction = actionPtr( sAction );
if( pAction ) {
if( m_bAutoUpdate )
removeConnection( pAction );
@@ -564,26 +564,26 @@ bool KAccelBase::setShortcut( const TQString& sAction, const KShortcut& cut )
return false;
}
-void KAccelBase::readSettings( TDEConfigBase* pConfig )
+void TDEAccelBase::readSettings( TDEConfigBase* pConfig )
{
m_rgActions.readActions( m_sConfigGroup, pConfig );
if( m_bAutoUpdate )
updateConnections();
}
-void KAccelBase::writeSettings( TDEConfigBase* pConfig ) const
+void TDEAccelBase::writeSettings( TDEConfigBase* pConfig ) const
{
m_rgActions.writeActions( m_sConfigGroup, pConfig, m_bConfigIsGlobal, m_bConfigIsGlobal );
}
-TQPopupMenu* KAccelBase::createPopupMenu( TQWidget* pParent, const KKeySequence& seq )
+TQPopupMenu* TDEAccelBase::createPopupMenu( TQWidget* pParent, const KKeySequence& seq )
{
- KShortcutMenu* pMenu = new KShortcutMenu( pParent, &actions(), seq );
+ TDEShortcutMenu* pMenu = new TDEShortcutMenu( pParent, &actions(), seq );
bool bActionInserted = false;
bool bInsertSeparator = false;
for( uint i = 0; i < actionCount(); i++ ) {
- const KAccelAction* pAction = actions().actionPtr( i );
+ const TDEAccelAction* pAction = actions().actionPtr( i );
if( !pAction->isEnabled() )
continue;
diff --git a/tdecore/kaccelbase.h b/tdecore/kaccelbase.h
index 132a6aa5..3d7180c4 100644
--- a/tdecore/kaccelbase.h
+++ b/tdecore/kaccelbase.h
@@ -42,7 +42,7 @@ class TQWidget;
* key bindings through application configuration files or through the
* KKeyChooser GUI.
*
- * A KAccel contains a list of accelerator items. Each accelerator item
+ * A TDEAccel contains a list of accelerator items. Each accelerator item
* consists of an action name and a keyboard code combined with modifiers
* (Shift, Ctrl and Alt.)
*
@@ -55,7 +55,7 @@ class TQWidget;
* connected. Accelerator items can be connected so that a key will activate
* two different slots.
*
- * A KAccel object handles key events sent to its parent widget and to all
+ * A TDEAccel object handles key events sent to its parent widget and to all
* children of this parent widget.
*
* Key binding reconfiguration during run time can be prevented by specifying
@@ -74,33 +74,33 @@ class TQWidget;
* The translated first argument for insertItem() is used only
* in the configuration dialog.
*\code
- * KAccel *a = new KAccel( myWindow );
+ * TDEAccel *a = new TDEAccel( myWindow );
* // Insert an action "Scroll Up" which is associated with the "Up" key:
* a->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
* // Insert an action "Scroll Down" which is not associated with any key:
* a->insertItem( i18n("Scroll Down"), "Scroll Down", 0);
* a->connectItem( "Scroll up", myWindow, TQT_SLOT( scrollUp() ) );
- * // a->insertStdItem( KStdAccel::Print ); //not necessary, since it
+ * // a->insertStdItem( TDEStdAccel::Print ); //not necessary, since it
* // is done automatially with the
* // connect below!
- * a->connectItem(KStdAccel::Print, myWindow, TQT_SLOT( printDoc() ) );
+ * a->connectItem(TDEStdAccel::Print, myWindow, TQT_SLOT( printDoc() ) );
*
* a->readSettings();
*\endcode
*
* If a shortcut has a menu entry as well, you could insert them like
- * this. The example is again the KStdAccel::Print from above.
+ * this. The example is again the TDEStdAccel::Print from above.
*
* \code
* int id;
* id = popup->insertItem("&Print",this, TQT_SLOT(printDoc()));
- * a->changeMenuAccel(popup, id, KStdAccel::Print );
+ * a->changeMenuAccel(popup, id, TDEStdAccel::Print );
* \endcode
*
* If you want a somewhat "exotic" name for your standard print action, like
* id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc()));
* it might be a good idea to insert the standard action before as
- * a->insertStdItem( KStdAccel::Print, i18n("Print Document") )
+ * a->insertStdItem( TDEStdAccel::Print, i18n("Print Document") )
* as well, so that the user can easily find the corresponding function.
*
* This technique works for other actions as well. Your "scroll up" function
@@ -118,10 +118,10 @@ class TQWidget;
* @short Configurable key binding support.
*/
-class TDECORE_EXPORT KAccelBase
+class TDECORE_EXPORT TDEAccelBase
{
public:
- /** Initialization mode of the KAccelBase, used in constructor. */
+ /** Initialization mode of the TDEAccelBase, used in constructor. */
enum Init { QT_KEYS = 0x00, NATIVE_KEYS = 0x01 };
/** Enum for kinds of signals which may be emitted. */
@@ -130,32 +130,32 @@ class TDECORE_EXPORT KAccelBase
/** Constructor. @p fInitCode should be a bitwise OR of
* values from the Init enum.
*/
- KAccelBase( int fInitCode );
- virtual ~KAccelBase();
+ TDEAccelBase( int fInitCode );
+ virtual ~TDEAccelBase();
/** Returns number of actions in this handler. */
uint actionCount() const;
/** Returns a list of all the actions in this handler. */
- KAccelActions& actions();
+ TDEAccelActions& actions();
/** Returns whether this accelerator handler is enabled or not. */
bool isEnabled() const;
- /** Returns a pointer to the KAccelAction named @p sAction. */
- KAccelAction* actionPtr( const TQString& sAction );
+ /** Returns a pointer to the TDEAccelAction named @p sAction. */
+ TDEAccelAction* actionPtr( const TQString& sAction );
/** Const version of the above. */
- const KAccelAction* actionPtr( const TQString& sAction ) const;
- /** Returns a pointer to the KAccelAction associated with
+ const TDEAccelAction* actionPtr( const TQString& sAction ) const;
+ /** Returns a pointer to the TDEAccelAction associated with
* the key @p key. This function takes into account the
* key mapping defined in the constructor.
*
* May return 0 if no (or more than one)
* action is associated with the key.
*/
- KAccelAction* actionPtr( const KKey& key );
+ TDEAccelAction* actionPtr( const KKey& key );
/** Basically the same as above, except a KKeyServer::Key
* already has a key mapping defined (either NATIVE_KEYS or not).
*/
- KAccelAction* actionPtr( const KKeyServer::Key& key );
+ TDEAccelAction* actionPtr( const KKeyServer::Key& key );
/** Returns the name of the configuration group these
* accelerators are stored in. The default is "Shortcuts".
@@ -181,10 +181,10 @@ class TDECORE_EXPORT KAccelBase
// Procedures for manipulating Actions.
//void clearActions();
- KAccelAction* insert( const TQString& sName, const TQString& sDesc );
- KAccelAction* insert(
+ TDEAccelAction* insert( const TQString& sName, const TQString& sDesc );
+ TDEAccelAction* insert(
const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
- const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+ const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable = true, bool bEnabled = true );
bool remove( const TQString& sAction );
@@ -192,7 +192,7 @@ class TDECORE_EXPORT KAccelBase
bool updateConnections();
- bool setShortcut( const TQString& sAction, const KShortcut& cut );
+ bool setShortcut( const TQString& sAction, const TDEShortcut& cut );
// Modify individual Action sub-items
bool setActionEnabled( const TQString& sAction, bool bEnable );
@@ -218,7 +218,7 @@ class TDECORE_EXPORT KAccelBase
// Protected methods
protected:
- void slotRemoveAction( KAccelAction* );
+ void slotRemoveAction( TDEAccelAction* );
struct X;
@@ -226,8 +226,8 @@ class TDECORE_EXPORT KAccelBase
* @param rgKeys constructed list of keys
*/
void createKeyList( TQValueVector<struct X>& rgKeys );
- bool insertConnection( KAccelAction* );
- bool removeConnection( KAccelAction* );
+ bool insertConnection( TDEAccelAction* );
+ bool removeConnection( TDEAccelAction* );
/** Emits a signal.
* @param signal signal to be emitted
@@ -237,14 +237,14 @@ class TDECORE_EXPORT KAccelBase
* @param action action to be executed when key is pressed
* @param key key which causes the action to be executed
*/
- virtual bool connectKey( KAccelAction& action, const KKeyServer::Key& key ) = 0;
+ virtual bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key ) = 0;
/** Defines a key which activates the accelerator
* @param key key which causes the action to be executed
*/
virtual bool connectKey( const KKeyServer::Key& key) = 0;
/** Removes the key from accelerator so it no longer executes the action
*/
- virtual bool disconnectKey( KAccelAction&, const KKeyServer::Key& ) = 0;
+ virtual bool disconnectKey( TDEAccelAction&, const KKeyServer::Key& ) = 0;
/** Removes the key from accelerator
*/
virtual bool disconnectKey( const KKeyServer::Key& ) = 0;
@@ -253,30 +253,30 @@ class TDECORE_EXPORT KAccelBase
virtual bool isEnabledInternal() const;
struct ActionInfo
{
- KAccelAction* pAction;
+ TDEAccelAction* pAction;
uint iSeq, iVariation;
//ActionInfo* pInfoNext; // nil if only one action uses this key.
ActionInfo() { pAction = 0; iSeq = 0xffff; iVariation = 0xffff; }
- ActionInfo( KAccelAction* _pAction, uint _iSeq, uint _iVariation )
+ ActionInfo( TDEAccelAction* _pAction, uint _iSeq, uint _iVariation )
{ pAction = _pAction; iSeq = _iSeq; iVariation = _iVariation; }
};
typedef TQMap<KKeyServer::Key, ActionInfo> KKeyToActionMap;
- KAccelActions m_rgActions;
+ TDEAccelActions m_rgActions;
KKeyToActionMap m_mapKeyToAction;
- TQValueList<KAccelAction*> m_rgActionsNonUnique;
+ TQValueList<TDEAccelAction*> m_rgActionsNonUnique;
bool m_bNativeKeys; // Use native key codes instead of Qt codes
bool m_bEnabled;
bool m_bConfigIsGlobal;
TQString m_sConfigGroup;
bool m_bAutoUpdate;
- KAccelAction* mtemp_pActionRemoving;
+ TDEAccelAction* mtemp_pActionRemoving;
private:
- KAccelBase& operator =( const KAccelBase& );
+ TDEAccelBase& operator =( const TDEAccelBase& );
- friend class KAccelActions;
+ friend class TDEAccelActions;
};
#endif // _KACCELBASE_H
diff --git a/tdecore/kaccelmanager.cpp b/tdecore/kaccelmanager.cpp
index 6c2233c8..9ac4dbda 100644
--- a/tdecore/kaccelmanager.cpp
+++ b/tdecore/kaccelmanager.cpp
@@ -63,7 +63,7 @@
/*********************************************************************
- class KAcceleratorManagerPrivate - internal helper class
+ class TDEAcceleratorManagerPrivate - internal helper class
This class does all the work to find accelerators for a hierarchy of
widgets.
@@ -71,7 +71,7 @@
*********************************************************************/
-class KAcceleratorManagerPrivate
+class TDEAcceleratorManagerPrivate
{
public:
@@ -79,7 +79,7 @@ public:
static bool programmers_mode;
static bool standardName(const TQString &str);
- static bool checkChange(const KAccelString &as) {
+ static bool checkChange(const TDEAccelString &as) {
TQString t2 = as.accelerated();
TQString t1 = as.originalText();
if (t1 != t2)
@@ -125,7 +125,7 @@ private:
void addChild(Item *item);
TQWidget *m_widget;
- KAccelString m_content;
+ TDEAccelString m_content;
ItemList *m_children;
int m_index;
@@ -133,28 +133,28 @@ private:
};
-bool KAcceleratorManagerPrivate::programmers_mode = false;
-TQString KAcceleratorManagerPrivate::changed_string;
-TQString KAcceleratorManagerPrivate::added_string;
-TQString KAcceleratorManagerPrivate::removed_string;
+bool TDEAcceleratorManagerPrivate::programmers_mode = false;
+TQString TDEAcceleratorManagerPrivate::changed_string;
+TQString TDEAcceleratorManagerPrivate::added_string;
+TQString TDEAcceleratorManagerPrivate::removed_string;
static TQStringList *kaccmp_sns = 0;
static KStaticDeleter<TQStringList> kaccmp_sns_d;
-TQMap<TQWidget*, int> KAcceleratorManagerPrivate::ignored_widgets;
+TQMap<TQWidget*, int> TDEAcceleratorManagerPrivate::ignored_widgets;
-bool KAcceleratorManagerPrivate::standardName(const TQString &str)
+bool TDEAcceleratorManagerPrivate::standardName(const TQString &str)
{
if (!kaccmp_sns)
kaccmp_sns_d.setObject(kaccmp_sns, new TQStringList(KStdAction::internal_stdNames()));
return kaccmp_sns->contains(str);
}
-KAcceleratorManagerPrivate::Item::~Item()
+TDEAcceleratorManagerPrivate::Item::~Item()
{
delete m_children;
}
-void KAcceleratorManagerPrivate::Item::addChild(Item *item)
+void TDEAcceleratorManagerPrivate::Item::addChild(Item *item)
{
if (!m_children) {
m_children = new ItemList;
@@ -164,7 +164,7 @@ void KAcceleratorManagerPrivate::Item::addChild(Item *item)
m_children->append(item);
}
-void KAcceleratorManagerPrivate::manage(TQWidget *widget)
+void TDEAcceleratorManagerPrivate::manage(TQWidget *widget)
{
if (!widget)
{
@@ -175,7 +175,7 @@ void KAcceleratorManagerPrivate::manage(TQWidget *widget)
if (dynamic_cast<TQPopupMenu*>(widget))
{
// create a popup accel manager that can deal with dynamic menus
- KPopupAccelManager::manage(static_cast<TQPopupMenu*>(widget));
+ TDEPopupAccelManager::manage(static_cast<TQPopupMenu*>(widget));
return;
}
@@ -189,13 +189,13 @@ void KAcceleratorManagerPrivate::manage(TQWidget *widget)
}
-void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &used)
+void TDEAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &used)
{
if (!item->m_children)
return;
// collect the contents
- KAccelStringList contents;
+ TDEAccelStringList contents;
for (Item *it = item->m_children->first(); it != 0;
it = item->m_children->next())
{
@@ -203,7 +203,7 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
}
// find the right accelerators
- KAccelManagerAlgorithm::findAccelerators(contents, used);
+ TDEAccelManagerAlgorithm::findAccelerators(contents, used);
// write them back into the widgets
int cnt = -1;
@@ -261,7 +261,7 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
}
-void KAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
+void TDEAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
{
TQObjectList *childList = widget->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false);
for ( TQObject *it = childList->first(); it; it = childList->next() )
@@ -271,7 +271,7 @@ void KAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) )
continue;
- if ( KAcceleratorManagerPrivate::ignored_widgets.find( w ) != KAcceleratorManagerPrivate::ignored_widgets.end() )
+ if ( TDEAcceleratorManagerPrivate::ignored_widgets.find( w ) != TDEAcceleratorManagerPrivate::ignored_widgets.end() )
continue;
manageWidget(w, item);
@@ -279,7 +279,7 @@ void KAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
delete childList;
}
-void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
+void TDEAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
{
// first treat the special cases
@@ -301,7 +301,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
if (popupMenu)
{
// create a popup accel manager that can deal with dynamic menus
- KPopupAccelManager::manage(popupMenu);
+ TDEPopupAccelManager::manage(popupMenu);
return;
}
@@ -368,26 +368,26 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
i->m_widget = w;
// put some more weight on the usual action elements
- int weight = KAccelManagerAlgorithm::DEFAULT_WEIGHT;
+ int weight = TDEAccelManagerAlgorithm::DEFAULT_WEIGHT;
if (dynamic_cast<TQPushButton*>(w) || dynamic_cast<TQCheckBox*>(w) || dynamic_cast<TQRadioButton*>(w) || dynamic_cast<TQLabel*>(w))
- weight = KAccelManagerAlgorithm::ACTION_ELEMENT_WEIGHT;
+ weight = TDEAccelManagerAlgorithm::ACTION_ELEMENT_WEIGHT;
// don't put weight on group boxes, as usually the contents are more important
if (dynamic_cast<TQGroupBox*>(w))
- weight = KAccelManagerAlgorithm::GROUP_BOX_WEIGHT;
+ weight = TDEAccelManagerAlgorithm::GROUP_BOX_WEIGHT;
// put a lot of extra weight on the KDialogBaseButton's
if (w->inherits("KDialogBaseButton"))
- weight += KAccelManagerAlgorithm::DIALOG_BUTTON_EXTRA_WEIGHT;
+ weight += TDEAccelManagerAlgorithm::DIALOG_BUTTON_EXTRA_WEIGHT;
- i->m_content = KAccelString(content, weight);
+ i->m_content = TDEAccelString(content, weight);
item->addChild(i);
}
}
traverseChildren(w, item);
}
-void KAcceleratorManagerPrivate::manageTabBar(TQTabBar *bar, Item *item)
+void TDEAcceleratorManagerPrivate::manageTabBar(TQTabBar *bar, Item *item)
{
for (int i=0; i<bar->count(); i++)
{
@@ -399,11 +399,11 @@ void KAcceleratorManagerPrivate::manageTabBar(TQTabBar *bar, Item *item)
item->addChild(it);
it->m_widget = bar;
it->m_index = i;
- it->m_content = KAccelString(content);
+ it->m_content = TDEAccelString(content);
}
}
-void KAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item)
+void TDEAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item)
{
TQMenuItem *mitem;
TQString s;
@@ -424,9 +424,9 @@ void KAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item)
Item *it = new Item;
item->addChild(it);
it->m_content =
- KAccelString(s,
+ TDEAccelString(s,
// menu titles are important, so raise the weight
- KAccelManagerAlgorithm::MENU_TITLE_WEIGHT);
+ TDEAccelManagerAlgorithm::MENU_TITLE_WEIGHT);
it->m_widget = mbar;
it->m_index = i;
@@ -434,49 +434,49 @@ void KAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item)
// have a look at the popup as well, if present
if (mitem->popup())
- KPopupAccelManager::manage(mitem->popup());
+ TDEPopupAccelManager::manage(mitem->popup());
}
}
/*********************************************************************
- class KAcceleratorManager - main entry point
+ class TDEAcceleratorManager - main entry point
This class is just here to provide a clean public API...
*********************************************************************/
-void KAcceleratorManager::manage(TQWidget *widget)
+void TDEAcceleratorManager::manage(TQWidget *widget)
{
- KAcceleratorManager::manage(widget, false);
+ TDEAcceleratorManager::manage(widget, false);
}
-void KAcceleratorManager::manage(TQWidget *widget, bool programmers_mode)
+void TDEAcceleratorManager::manage(TQWidget *widget, bool programmers_mode)
{
- kdDebug(131) << "KAcceleratorManager::manage\n";
- KAcceleratorManagerPrivate::changed_string = TQString::null;
- KAcceleratorManagerPrivate::added_string = TQString::null;
- KAcceleratorManagerPrivate::removed_string = TQString::null;
- KAcceleratorManagerPrivate::programmers_mode = programmers_mode;
- KAcceleratorManagerPrivate::manage(widget);
+ kdDebug(131) << "TDEAcceleratorManager::manage\n";
+ TDEAcceleratorManagerPrivate::changed_string = TQString::null;
+ TDEAcceleratorManagerPrivate::added_string = TQString::null;
+ TDEAcceleratorManagerPrivate::removed_string = TQString::null;
+ TDEAcceleratorManagerPrivate::programmers_mode = programmers_mode;
+ TDEAcceleratorManagerPrivate::manage(widget);
}
-void KAcceleratorManager::last_manage(TQString &added, TQString &changed, TQString &removed)
+void TDEAcceleratorManager::last_manage(TQString &added, TQString &changed, TQString &removed)
{
- added = KAcceleratorManagerPrivate::added_string;
- changed = KAcceleratorManagerPrivate::changed_string;
- removed = KAcceleratorManagerPrivate::removed_string;
+ added = TDEAcceleratorManagerPrivate::added_string;
+ changed = TDEAcceleratorManagerPrivate::changed_string;
+ removed = TDEAcceleratorManagerPrivate::removed_string;
}
/*********************************************************************
- class KAccelString - a string with weighted characters
+ class TDEAccelString - a string with weighted characters
*********************************************************************/
-KAccelString::KAccelString(const TQString &input, int initialWeight)
+TDEAccelString::TDEAccelString(const TQString &input, int initialWeight)
: m_pureText(input), m_weight()
{
m_orig_accel = m_pureText.find("(!)&");
@@ -495,7 +495,7 @@ KAccelString::KAccelString(const TQString &input, int initialWeight)
m_orig_accel = m_accel = stripAccelerator(m_pureText);
if (initialWeight == -1)
- initialWeight = KAccelManagerAlgorithm::DEFAULT_WEIGHT;
+ initialWeight = TDEAccelManagerAlgorithm::DEFAULT_WEIGHT;
calculateWeights(initialWeight);
@@ -503,13 +503,13 @@ KAccelString::KAccelString(const TQString &input, int initialWeight)
}
-TQString KAccelString::accelerated() const
+TQString TDEAccelString::accelerated() const
{
TQString result = m_origText;
if (result.isEmpty())
return result;
- if (KAcceleratorManagerPrivate::programmers_mode)
+ if (TDEAcceleratorManagerPrivate::programmers_mode)
{
if (m_accel != m_orig_accel) {
int oa = m_orig_accel;
@@ -532,7 +532,7 @@ TQString KAccelString::accelerated() const
}
-TQChar KAccelString::accelerator() const
+TQChar TDEAccelString::accelerator() const
{
if ((m_accel < 0) || (m_accel > (int)m_pureText.length()))
return TQChar();
@@ -541,7 +541,7 @@ TQChar KAccelString::accelerator() const
}
-void KAccelString::calculateWeights(int initialWeight)
+void TDEAccelString::calculateWeights(int initialWeight)
{
m_weight.resize(m_pureText.length());
@@ -556,12 +556,12 @@ void KAccelString::calculateWeights(int initialWeight)
// add special weight to first character
if (pos == 0)
- weight += KAccelManagerAlgorithm::FIRST_CHARACTER_EXTRA_WEIGHT;
+ weight += TDEAccelManagerAlgorithm::FIRST_CHARACTER_EXTRA_WEIGHT;
// add weight to word beginnings
if (start_character)
{
- weight += KAccelManagerAlgorithm::WORD_BEGINNING_EXTRA_WEIGHT;
+ weight += TDEAccelManagerAlgorithm::WORD_BEGINNING_EXTRA_WEIGHT;
start_character = false;
}
@@ -571,10 +571,10 @@ void KAccelString::calculateWeights(int initialWeight)
// try to preserve the wanted accelarators
if ((int)pos == accel()) {
- weight += KAccelManagerAlgorithm::WANTED_ACCEL_EXTRA_WEIGHT;
- // kdDebug(131) << "wanted " << m_pureText << " " << KAcceleratorManagerPrivate::standardName(m_origText) << endl;
- if (KAcceleratorManagerPrivate::standardName(m_origText)) {
- weight += KAccelManagerAlgorithm::STANDARD_ACCEL;
+ weight += TDEAccelManagerAlgorithm::WANTED_ACCEL_EXTRA_WEIGHT;
+ // kdDebug(131) << "wanted " << m_pureText << " " << TDEAcceleratorManagerPrivate::standardName(m_origText) << endl;
+ if (TDEAcceleratorManagerPrivate::standardName(m_origText)) {
+ weight += TDEAccelManagerAlgorithm::STANDARD_ACCEL;
}
}
@@ -592,7 +592,7 @@ void KAccelString::calculateWeights(int initialWeight)
}
-int KAccelString::stripAccelerator(TQString &text)
+int TDEAccelString::stripAccelerator(TQString &text)
{
// Note: this code is derived from TQAccel::shortcutKey
int p = 0;
@@ -621,7 +621,7 @@ int KAccelString::stripAccelerator(TQString &text)
}
-int KAccelString::maxWeight(int &index, const TQString &used)
+int TDEAccelString::maxWeight(int &index, const TQString &used)
{
int max = 0;
index = -1;
@@ -638,7 +638,7 @@ int KAccelString::maxWeight(int &index, const TQString &used)
}
-void KAccelString::dump()
+void TDEAccelString::dump()
{
TQString s;
for (uint i=0; i<m_weight.count(); ++i)
@@ -680,13 +680,13 @@ void KAccelString::dump()
*********************************************************************/
-void KAccelManagerAlgorithm::findAccelerators(KAccelStringList &result, TQString &used)
+void TDEAccelManagerAlgorithm::findAccelerators(TDEAccelStringList &result, TQString &used)
{
kdDebug(131) << "findAccelerators\n";
- KAccelStringList accel_strings = result;
+ TDEAccelStringList accel_strings = result;
// initally remove all accelerators
- for (KAccelStringList::Iterator it = result.begin(); it != result.end(); ++it) {
+ for (TDEAccelStringList::Iterator it = result.begin(); it != result.end(); ++it) {
(*it).setAccel(-1);
}
@@ -720,18 +720,18 @@ void KAccelManagerAlgorithm::findAccelerators(KAccelStringList &result, TQString
}
// make sure we don't visit this one again
- accel_strings[index] = KAccelString();
+ accel_strings[index] = TDEAccelString();
}
}
/*********************************************************************
- class KPopupAccelManager - managing TQPopupMenu widgets dynamically
+ class TDEPopupAccelManager - managing TQPopupMenu widgets dynamically
*********************************************************************/
-KPopupAccelManager::KPopupAccelManager(TQPopupMenu *popup)
+TDEPopupAccelManager::TDEPopupAccelManager(TQPopupMenu *popup)
: TQObject(popup), m_popup(popup), m_count(-1)
{
aboutToShow(); // do one check and then connect to show
@@ -739,7 +739,7 @@ KPopupAccelManager::KPopupAccelManager(TQPopupMenu *popup)
}
-void KPopupAccelManager::aboutToShow()
+void TDEPopupAccelManager::aboutToShow()
{
// Note: we try to be smart and avoid recalculating the accelerators
// whenever possible. Unfortunately, there is no way to know if an
@@ -754,7 +754,7 @@ void KPopupAccelManager::aboutToShow()
}
else
{
- KAccelStringList entries;
+ TDEAccelStringList entries;
findMenuEntries(entries);
if (entries != m_entries)
{
@@ -765,18 +765,18 @@ void KPopupAccelManager::aboutToShow()
}
-void KPopupAccelManager::calculateAccelerators()
+void TDEPopupAccelManager::calculateAccelerators()
{
// find the new accelerators
TQString used;
- KAccelManagerAlgorithm::findAccelerators(m_entries, used);
+ TDEAccelManagerAlgorithm::findAccelerators(m_entries, used);
// change the menu entries
setMenuEntries(m_entries);
}
-void KPopupAccelManager::findMenuEntries(KAccelStringList &list)
+void TDEPopupAccelManager::findMenuEntries(TDEAccelStringList &list)
{
TQMenuItem *mitem;
TQString s;
@@ -797,16 +797,16 @@ void KPopupAccelManager::findMenuEntries(KAccelStringList &list)
if (s.contains('\t'))
weight = 0;
- list.append(KAccelString(s, weight));
+ list.append(TDEAccelString(s, weight));
// have a look at the popup as well, if present
if (mitem->popup())
- KPopupAccelManager::manage(mitem->popup());
+ TDEPopupAccelManager::manage(mitem->popup());
}
}
-void KPopupAccelManager::setMenuEntries(const KAccelStringList &list)
+void TDEPopupAccelManager::setMenuEntries(const TDEAccelStringList &list)
{
TQMenuItem *mitem;
@@ -817,18 +817,18 @@ void KPopupAccelManager::setMenuEntries(const KAccelStringList &list)
if (mitem->isSeparator())
continue;
- if (KAcceleratorManagerPrivate::checkChange(list[cnt]))
+ if (TDEAcceleratorManagerPrivate::checkChange(list[cnt]))
mitem->setText(list[cnt].accelerated());
cnt++;
}
}
-void KPopupAccelManager::manage(TQPopupMenu *popup)
+void TDEPopupAccelManager::manage(TQPopupMenu *popup)
{
// don't add more than one manager to a popup
- if (popup->child(0, "KPopupAccelManager", false) == 0 )
- new KPopupAccelManager(popup);
+ if (popup->child(0, "TDEPopupAccelManager", false) == 0 )
+ new TDEPopupAccelManager(popup);
}
void QWidgetStackAccelManager::manage( TQWidgetStack *stack )
@@ -847,7 +847,7 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack)
bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e )
{
if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) {
- KAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) );
+ TDEAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) );
watched->removeEventFilter( this );
}
return false;
@@ -864,9 +864,9 @@ void QWidgetStackAccelManager::aboutToShow(TQWidget *child)
child->installEventFilter( this );
}
-void KAcceleratorManager::setNoAccel( TQWidget *widget )
+void TDEAcceleratorManager::setNoAccel( TQWidget *widget )
{
- KAcceleratorManagerPrivate::ignored_widgets[widget] = 1;
+ TDEAcceleratorManagerPrivate::ignored_widgets[widget] = 1;
}
#include "kaccelmanager_private.moc"
diff --git a/tdecore/kaccelmanager.h b/tdecore/kaccelmanager.h
index 29304803..03ee627b 100644
--- a/tdecore/kaccelmanager.h
+++ b/tdecore/kaccelmanager.h
@@ -37,7 +37,7 @@ class TQString;
* @since 3.1
*/
-class TDECORE_EXPORT KAcceleratorManager
+class TDECORE_EXPORT TDEAcceleratorManager
{
public:
@@ -69,7 +69,7 @@ public:
*
* TODO KDE4: merge with the above
* @param widget The toplevel widget you want to manage.
- * @param programmers_mode if true, KAcceleratorManager adds (&) for removed
+ * @param programmers_mode if true, TDEAcceleratorManager adds (&) for removed
* accels and & before added accels
*/
static void manage(TQWidget *widget, bool programmers_mode);
diff --git a/tdecore/kaccelmanager_private.h b/tdecore/kaccelmanager_private.h
index e931b7e3..ed401801 100644
--- a/tdecore/kaccelmanager_private.h
+++ b/tdecore/kaccelmanager_private.h
@@ -39,12 +39,12 @@ class TQWidgetStack;
* @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
*/
-class KAccelString
+class TDEAccelString
{
public:
- KAccelString() : m_pureText(), m_accel(-1) {}
- KAccelString(const TQString &input, int initalWeight=-1);
+ TDEAccelString() : m_pureText(), m_accel(-1) {}
+ TDEAccelString(const TQString &input, int initalWeight=-1);
void calculateWeights(int initialWeight);
@@ -61,7 +61,7 @@ public:
int maxWeight(int &index, const TQString &used);
- bool operator == (const KAccelString &c) const { return m_pureText == c.m_pureText && m_accel == c.m_accel && m_orig_accel == c.m_orig_accel; }
+ bool operator == (const TDEAccelString &c) const { return m_pureText == c.m_pureText && m_accel == c.m_accel && m_orig_accel == c.m_orig_accel; }
private:
@@ -77,7 +77,7 @@ private:
};
-typedef TQValueList<KAccelString> KAccelStringList;
+typedef TQValueList<TDEAccelString> TDEAccelStringList;
/**
@@ -87,7 +87,7 @@ typedef TQValueList<KAccelString> KAccelStringList;
* @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
*/
-class KAccelManagerAlgorithm
+class TDEAccelManagerAlgorithm
{
public:
@@ -114,7 +114,7 @@ public:
};
/// Method to call to find the best distribution of accelerators.
- static void findAccelerators(KAccelStringList &result, TQString &used);
+ static void findAccelerators(TDEAccelStringList &result, TQString &used);
};
@@ -131,7 +131,7 @@ class TQPopupMenu;
* @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
*/
-class KPopupAccelManager : public TQObject
+class TDEPopupAccelManager : public TQObject
{
Q_OBJECT
@@ -142,7 +142,7 @@ public:
protected:
- KPopupAccelManager(TQPopupMenu *popup);
+ TDEPopupAccelManager(TQPopupMenu *popup);
private slots:
@@ -154,11 +154,11 @@ private:
void calculateAccelerators();
- void findMenuEntries(KAccelStringList &list);
- void setMenuEntries(const KAccelStringList &list);
+ void findMenuEntries(TDEAccelStringList &list);
+ void setMenuEntries(const TDEAccelStringList &list);
TQPopupMenu *m_popup;
- KAccelStringList m_entries;
+ TDEAccelStringList m_entries;
int m_count;
};
@@ -188,7 +188,7 @@ private:
void calculateAccelerators();
TQWidgetStack *m_stack;
- KAccelStringList m_entries;
+ TDEAccelStringList m_entries;
};
diff --git a/tdecore/kaccelprivate.h b/tdecore/kaccelprivate.h
index 8d009b95..0d967998 100644
--- a/tdecore/kaccelprivate.h
+++ b/tdecore/kaccelprivate.h
@@ -4,22 +4,22 @@
#include "kkeyserver_x11.h"
#include <tqtimer.h>
-class KAccelAction;
+class TDEAccelAction;
/**
* @internal
*/
-class TDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase
+class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase
{
Q_OBJECT
public:
- KAccel* m_pAccel;
+ TDEAccel* m_pAccel;
TQWidget* m_pWatch;
TQMap<int, int> m_mapIDToKey;
- TQMap<int, KAccelAction*> m_mapIDToAction;
+ TQMap<int, TDEAccelAction*> m_mapIDToAction;
TQTimer m_timerShowMenu;
- KAccelPrivate( KAccel* pParent, TQWidget* pWatch );
+ TDEAccelPrivate( TDEAccel* pParent, TQWidget* pWatch );
virtual void setEnabled( bool bEnabled );
@@ -27,19 +27,19 @@ class TDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase
virtual bool removeAction( const TQString& sAction );
- virtual bool emitSignal( KAccelBase::Signal signal );
- virtual bool connectKey( KAccelAction& action, const KKeyServer::Key& key );
+ virtual bool emitSignal( TDEAccelBase::Signal signal );
+ virtual bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key );
virtual bool connectKey( const KKeyServer::Key& key );
- virtual bool disconnectKey( KAccelAction& action, const KKeyServer::Key& key );
+ virtual bool disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key );
virtual bool disconnectKey( const KKeyServer::Key& key );
signals:
void menuItemActivated();
- void menuItemActivated(KAccelAction*);
+ void menuItemActivated(TDEAccelAction*);
private:
#ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
- void emitActivatedSignal(KAccelAction*);
+ void emitActivatedSignal(TDEAccelAction*);
#endif
private slots:
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index b55f0743..705713a7 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -272,7 +272,7 @@ public:
bool guiEnabled : 1;
/**
* This counter indicates when to exit the application.
- * It starts at 1, is decremented in KMainWindow when the last window is closed, but
+ * It starts at 1, is decremented in TDEMainWindow when the last window is closed, but
* is incremented by operations that should outlive the last window closed
* (e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client).
*/
@@ -468,7 +468,7 @@ void TDEApplication::removeX11EventFilter( const TQWidget* filter )
// FIXME: remove this when we've get a better method of
// customizing accelerator handling -- hopefully in Qt.
// For now, this is set whenever an accelerator is overridden
-// in KAccelEventHandler so that the AccelOverride isn't sent twice. -- ellis, 19/10/02
+// in TDEAccelEventHandler so that the AccelOverride isn't sent twice. -- ellis, 19/10/02
extern bool kde_g_bKillAccelOverride;
bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
@@ -489,7 +489,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
if ((t == TQEvent::AccelOverride) || (t == TQEvent::KeyPress))
{
- static const KShortcut& _selectAll = KStdAccel::selectAll();
+ static const TDEShortcut& _selectAll = TDEStdAccel::selectAll();
TQLineEdit *edit = ::tqqt_cast<TQLineEdit *>(receiver);
if (edit)
{
@@ -1297,7 +1297,7 @@ void TDEApplication::commitData( TQSessionManager& sm )
bool canceled = false;
TQWidget* w = list->first();
while ( !canceled && w ) {
- if ( !w->testWState( WState_ForceHide ) && !w->inherits("KMainWindow") ) {
+ if ( !w->testWState( WState_ForceHide ) && !w->inherits("TDEMainWindow") ) {
TQCloseEvent e;
sendEvent( w, &e );
canceled = !e.isAccepted();
@@ -2458,7 +2458,7 @@ void TDEApplication::kdisplaySetFont()
TQApplication::setFont(TDEGlobalSettings::generalFont(), true);
TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING);
- TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "KPopupTitle");
+ TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TDEPopupTitle");
// "patch" standard TQStyleSheet to follow our fonts
TQStyleSheet* sheet = TQStyleSheet::defaultSheet();
@@ -2544,11 +2544,11 @@ void TDEApplication::installKDEPropertyMap()
kdeMap->insert( "KDateWidget", "date" );
kdeMap->insert( "KDateTimeWidget", "dateTime" );
kdeMap->insert( "KEditListBox", "items" );
- kdeMap->insert( "KFontCombo", "family" );
- kdeMap->insert( "KFontRequester", "font" );
- kdeMap->insert( "KFontChooser", "font" );
+ kdeMap->insert( "TDEFontCombo", "family" );
+ kdeMap->insert( "TDEFontRequester", "font" );
+ kdeMap->insert( "TDEFontChooser", "font" );
kdeMap->insert( "KHistoryCombo", "currentItem" );
- kdeMap->insert( "KListBox", "currentItem" );
+ kdeMap->insert( "TDEListBox", "currentItem" );
kdeMap->insert( "KLineEdit", "text" );
kdeMap->insert( "KRestrictedLine", "text" );
kdeMap->insert( "KSqueezedTextLabel", "text" );
@@ -3033,7 +3033,7 @@ startServiceInternal( const TQCString &function,
function, params, replyType, replyData))
{
if (error)
- *error = i18n("KLauncher could not be reached via DCOP.\n");
+ *error = i18n("TDELauncher could not be reached via DCOP.\n");
if (!kapp)
delete dcopClient;
return -1;
@@ -3255,7 +3255,7 @@ void TDEApplication::setTopWidget( TQWidget *topWidget )
return;
// set the specified caption
- if ( !topWidget->inherits("KMainWindow") ) { // KMainWindow does this already for us
+ if ( !topWidget->inherits("TDEMainWindow") ) { // TDEMainWindow does this already for us
topWidget->setCaption( caption() );
}
@@ -3356,7 +3356,7 @@ bool TDEApplication::authorize(const TQString &genericAction)
return config->readBoolEntry(genericAction, true);
}
-bool TDEApplication::authorizeKAction(const char *action)
+bool TDEApplication::authorizeTDEAction(const char *action)
{
if (!d->actionRestrictions || !action)
return true;
diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h
index eae310c4..f59c307e 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/kapplication.h
@@ -432,10 +432,10 @@ public:
/**
* Returns true if the application is currently saving its session
* data (most probably before KDE logout). This is intended for use
- * mainly in KMainWindow::queryClose() and KMainWindow::queryExit().
+ * mainly in TDEMainWindow::queryClose() and TDEMainWindow::queryExit().
*
- * @see KMainWindow::queryClose
- * @see KMainWindow::queryExit
+ * @see TDEMainWindow::queryClose
+ * @see TDEMainWindow::queryExit
* @since 3.1.1
*/
bool sessionSaving() const;
@@ -482,7 +482,7 @@ public:
* Sets the top widget of the application.
* This means basically applying the right window caption and
* icon. An application may have several top widgets. You don't
- * need to call this function manually when using KMainWindow.
+ * need to call this function manually when using TDEMainWindow.
*
* @param topWidget A top widget of the application.
*
@@ -627,21 +627,21 @@ public slots:
* If the widget with focus provides a clear() slot, call that slot. Thus for a
* simple application clear() can be implemented as:
* \code
- * new KAction( i18n( "Clear" ), "editclear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" );
+ * new TDEAction( i18n( "Clear" ), "editclear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" );
* \endcode
*
* Note that for some widgets, this may not provide the intended bahavior. For
- * example if you make use of the code above and a KListView has the focus, clear()
+ * example if you make use of the code above and a TDEListView has the focus, clear()
* will clear all of the items in the list. If this is not the intened behavior
- * and you want to make use of this slot, you can subclass KListView and reimplement
- * this slot. For example the following code would implement a KListView without this
+ * and you want to make use of this slot, you can subclass TDEListView and reimplement
+ * this slot. For example the following code would implement a TDEListView without this
* behavior:
*
* \code
- * class MyListView : public KListView {
+ * class MyListView : public TDEListView {
* Q_OBJECT
* public:
- * MyListView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) : KListView( parent, name, f ) {}
+ * MyListView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) : TDEListView( parent, name, f ) {}
* virtual ~MyListView() {}
* public slots:
* virtual void clear() {}
@@ -1121,13 +1121,13 @@ public:
bool authorize(const TQString &genericAction);
/**
- * Returns whether a certain KAction is authorized.
+ * Returns whether a certain TDEAction is authorized.
*
- * @param action The name of a KAction action. The name is prepended
+ * @param action The name of a TDEAction action. The name is prepended
* with "action/" before being passed to authorize()
- * @return true if the KAction is authorized
+ * @return true if the TDEAction is authorized
*/
- bool authorizeKAction(const char *action);
+ bool authorizeTDEAction(const char *action);
/**
* Returns whether a certain URL related action is authorized.
@@ -1272,7 +1272,7 @@ protected:
* \endcode
*
* Now in your application calls to MyApplication::deselect() will call this slot on the
- * focused widget if it provides this slot. You can combine this with KAction with:
+ * focused widget if it provides this slot. You can combine this with TDEAction with:
*
* \code
* KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQT_SLOT( cut() ), actionCollection() );
@@ -1438,7 +1438,7 @@ signals:
void appearanceChanged();
/**
- * Emitted when the settings for toolbars have been changed. KToolBar will know what to do.
+ * Emitted when the settings for toolbars have been changed. TDEToolBar will know what to do.
*/
void toolbarAppearanceChanged(int);
@@ -1478,12 +1478,12 @@ signals:
Session management asks you to save the state of your application.
This signal is provided for compatibility only. For new
- applications, simply use KMainWindow. By reimplementing
- KMainWindow::queryClose(), KMainWindow::saveProperties() and
- KMainWindow::readProperties() you can simply handle session
+ applications, simply use TDEMainWindow. By reimplementing
+ TDEMainWindow::queryClose(), TDEMainWindow::saveProperties() and
+ TDEMainWindow::readProperties() you can simply handle session
management for applications with multiple toplevel windows.
- For purposes without KMainWindow, create an instance of
+ For purposes without TDEMainWindow, create an instance of
KSessionManaged and reimplement the functions
KSessionManaged::commitData() and/or
KSessionManaged::saveState()
@@ -1572,12 +1572,12 @@ class KSessionManagedPrivate;
KSessionManaged makes it possible to provide implementations for
TQApplication::commitData() and TQApplication::saveState(), without
- subclassing TDEApplication. KMainWindow internally makes use of this.
+ subclassing TDEApplication. TDEMainWindow internally makes use of this.
You don't need to do anything with this class when using
- KMainWindow. Instead, use KMainWindow::saveProperties(),
- KMainWindow::readProperties(), KMainWindow::queryClose(),
- KMainWindow::queryExit() and friends.
+ TDEMainWindow. Instead, use TDEMainWindow::saveProperties(),
+ TDEMainWindow::readProperties(), TDEMainWindow::queryClose(),
+ TDEMainWindow::queryExit() and friends.
@short Highlevel access to session management.
@author Matthias Ettrich <ettrich@kde.org>
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index 1051cd36..ec11f50a 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -83,7 +83,7 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent )
TDEConfigGroupSaver saver( TDEGlobal::config(), "Development" );
TQString sKey = TDEGlobal::config()->readEntry( "CheckAccelerators" ).stripWhiteSpace();
if( !sKey.isEmpty() ) {
- KShortcut cuts( sKey );
+ TDEShortcut cuts( sKey );
if( cuts.count() > 0 )
key = int(cuts.seq(0).qt());
}
@@ -177,9 +177,9 @@ void KCheckAccelerators::checkAccelerators( bool automatic )
if ( !actWin )
return;
- KAcceleratorManager::manage(actWin);
+ TDEAcceleratorManager::manage(actWin);
TQString a, c, r;
- KAcceleratorManager::last_manage(a, c, r);
+ TDEAcceleratorManager::last_manage(a, c, r);
if (automatic) // for now we only show dialogs on F12 checks
return;
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index 45182bd9..020512b4 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -666,7 +666,7 @@ public:
/**
* Constants that represent the items whose short-cut
* key-binding is programmable. The default key-bindings
- * for these items are defined in KStdAccel.
+ * for these items are defined in TDEStdAccel.
*/
enum KeyBindingType {
/**
@@ -689,7 +689,7 @@ public:
// Map for the key binding types mentioned above.
- typedef TQMap<KeyBindingType, KShortcut> KeyBindingMap;
+ typedef TQMap<KeyBindingType, TDEShortcut> KeyBindingMap;
/**
* Default constructor.
@@ -885,7 +885,7 @@ public:
* @return true if key-binding can successfully be set.
* @see getKeyBinding
*/
- bool setKeyBinding( KeyBindingType item , const KShortcut& key );
+ bool setKeyBinding( KeyBindingType item , const TDEShortcut& key );
/**
* Returns the key-binding used for the specified item.
@@ -899,7 +899,7 @@ public:
* @return the key-binding used for the feature given by @p item.
* @see setKeyBinding
*/
- const KShortcut& getKeyBinding( KeyBindingType item ) const {
+ const TDEShortcut& getKeyBinding( KeyBindingType item ) const {
return m_delegate ? m_delegate->getKeyBinding( item ) : m_keyMap[ item ];
}
diff --git a/tdecore/kcompletionbase.cpp b/tdecore/kcompletionbase.cpp
index 7589d842..67644842 100644
--- a/tdecore/kcompletionbase.cpp
+++ b/tdecore/kcompletionbase.cpp
@@ -112,7 +112,7 @@ void KCompletionBase::setCompletionMode( TDEGlobalSettings::Completion mode )
m_pCompObj->setCompletionMode( m_iCompletionMode );
}
-bool KCompletionBase::setKeyBinding( KeyBindingType item, const KShortcut& cut )
+bool KCompletionBase::setKeyBinding( KeyBindingType item, const TDEShortcut& cut )
{
if ( m_delegate )
return m_delegate->setKeyBinding( item, cut );
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 9998163e..831b06fd 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -5,13 +5,13 @@
#
#Format : number<tab>description
-125 tdecore (KAccel)
+125 tdecore (TDEAccel)
126 tdecore (KURL)
127 kio (KProtocolInfo)
128 tdecore (KRegExp)
-129 tdecore (KAction)
+129 tdecore (TDEAction)
130 kio (KPasswdServer)
-131 tdecore (KAcceleratorManager)
+131 tdecore (TDEAcceleratorManager)
150 tdecore (KLibLoader)
160 tdecore (KNotifyClient)
170 tdecore (KNetwork socket)
@@ -25,8 +25,8 @@
178 tdecore (TDEConfigDialogManager)
179 tdecore (KNetwork resolver)
180 tdecore (tdelibs)
-200 tdeui (KMainWindow)
-220 tdeui (KToolBar)
+200 tdeui (TDEMainWindow)
+220 tdeui (TDEToolBar)
230 tdeui (KCommand)
240 tdeui (tdelibs)
250 tdefile (tdelibs)
@@ -42,7 +42,7 @@
293 tdeui (KLineEdit)
294 tdeui (KEdit)
295 tdeui (KMenuBar)
-296 tdeui (KPopupMenu)
+296 tdeui (TDEPopupMenu)
298 tdeui (KDatePicker)
399 kimgio
400 artskde
@@ -236,7 +236,7 @@
7013 kio (KPing)
7014 kio (TDETrader)
7015 kio (KAutoMount)
-7016 kio (KLauncher)
+7016 kio (TDELauncher)
7017 kio (KIOConnection)
7018 kio (KMimeMagic)
7019 kio (tdeioslave)
diff --git a/tdecore/kdebugrc b/tdecore/kdebugrc
index c697da03..0335f4e5 100644
--- a/tdecore/kdebugrc
+++ b/tdecore/kdebugrc
@@ -32,7 +32,7 @@
# AbortFatal=1
#
-# KAccel debug info off
+# TDEAccel debug info off
[125]
InfoOutput=4
@@ -40,7 +40,7 @@ InfoOutput=4
[131]
InfoOutput=4
-# KAction debug info off
+# TDEAction debug info off
[129]
InfoOutput=4
@@ -52,7 +52,7 @@ InfoOutput=4
[173]
InfoOutput=4
-# KMainWindow debug info off
+# TDEMainWindow debug info off
[200]
InfoOutput=4
diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp
index 3d759466..eb1b5632 100644
--- a/tdecore/kglobalaccel.cpp
+++ b/tdecore/kglobalaccel.cpp
@@ -53,14 +53,14 @@ TDEGlobalAccel::~TDEGlobalAccel()
void TDEGlobalAccel::clear()
{ d->clearActions(); }
*/
-KAccelActions& TDEGlobalAccel::actions()
- { return d->KAccelBase::actions(); }
+TDEAccelActions& TDEGlobalAccel::actions()
+ { return d->TDEAccelBase::actions(); }
-const KAccelActions& TDEGlobalAccel::actions() const
- { return d->KAccelBase::actions(); }
+const TDEAccelActions& TDEGlobalAccel::actions() const
+ { return d->TDEAccelBase::actions(); }
bool TDEGlobalAccel::isEnabled()
- { return ((KAccelBase*)d)->isEnabled(); }
+ { return ((TDEAccelBase*)d)->isEnabled(); }
void TDEGlobalAccel::setEnabled( bool bEnabled )
{ d->setEnabled( bEnabled ); }
@@ -74,8 +74,8 @@ void TDEGlobalAccel::blockShortcuts( bool block )
void TDEGlobalAccel::disableBlocking( bool disable )
{ d->disableBlocking( disable ); }
-KAccelAction* TDEGlobalAccel::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
- const KShortcut& cutDef3, const KShortcut& cutDef4,
+TDEAccelAction* TDEGlobalAccel::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
+ const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled )
{
@@ -85,7 +85,7 @@ KAccelAction* TDEGlobalAccel::insert( const TQString& sAction, const TQString& s
bConfigurable, bEnabled );
}
-KAccelAction* TDEGlobalAccel::insert( const TQString& sName, const TQString& sDesc )
+TDEAccelAction* TDEGlobalAccel::insert( const TQString& sName, const TQString& sDesc )
{ return d->insert( sName, sDesc ); }
bool TDEGlobalAccel::updateConnections()
{ return d->updateConnections(); }
@@ -93,19 +93,19 @@ bool TDEGlobalAccel::updateConnections()
bool TDEGlobalAccel::remove( const TQString& sAction )
{ return d->remove( sAction ); }
-const KShortcut& TDEGlobalAccel::shortcut( const TQString& sAction ) const
+const TDEShortcut& TDEGlobalAccel::shortcut( const TQString& sAction ) const
{
- const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction );
- return (pAction) ? pAction->shortcut() : KShortcut::null();
+ const TDEAccelAction* pAction = d->TDEAccelBase::actions().actionPtr( sAction );
+ return (pAction) ? pAction->shortcut() : TDEShortcut::null();
}
-bool TDEGlobalAccel::setShortcut( const TQString& sAction, const KShortcut& cut )
+bool TDEGlobalAccel::setShortcut( const TQString& sAction, const TDEShortcut& cut )
{ return d->setShortcut( sAction, cut ); }
bool TDEGlobalAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
{ return d->setActionSlot( sAction, pObjSlot, psMethodSlot ); }
TQString TDEGlobalAccel::label( const TQString& sAction ) const
{
- const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction );
+ const TDEAccelAction* pAction = d->TDEAccelBase::actions().actionPtr( sAction );
return (pAction) ? pAction->label() : TQString();
}
bool TDEGlobalAccel::setActionEnabled( const TQString& sAction, bool bEnable )
@@ -131,7 +131,7 @@ bool TDEGlobalAccel::writeSettings( TDEConfigBase* pConfig, bool bGlobal ) const
}
bool TDEGlobalAccel::useFourModifierKeys()
- { return KAccelAction::useFourModifierKeys(); }
+ { return TDEAccelAction::useFourModifierKeys(); }
void TDEGlobalAccel::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index fdda08f5..9606b8af 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -25,19 +25,19 @@
class TQPopupMenu;
class TQWidget;
-class KAccelAction;
-class KAccelActions;
+class TDEAccelAction;
+class TDEAccelActions;
class TDEConfigBase;
class TDEGlobalAccelPrivate;
/**
* TDEGlobalAccel allows you to have global accelerators that are independent of
-* the focused window. Unlike KAccel it does not matter which window is
+* the focused window. Unlike TDEAccel it does not matter which window is
* currently active.
*
-* @see KAccel
-* @see KAccelShortcutList
+* @see TDEAccel
+* @see TDEAccelShortcutList
* @see KKeyChooser
* @see KKeyDialog
* @short Configurable global shortcut support
@@ -90,8 +90,8 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
* @param bConfigurable Allow the user to change this shortcut if set to 'true'.
* @param bEnabled The action will be activated by the shortcut if set to 'true'.
*/
- KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& cutDef3, const KShortcut& cutDef4,
+ TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable = true, bool bEnabled = true );
@@ -108,9 +108,9 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
* displayed when the user configures shortcuts.
* @param sName of the of the action to insert
* @param sLabel a user-readable (i18n!) name for the action
- * @return the KAccelAction of the action
+ * @return the TDEAccelAction of the action
*/
- KAccelAction* insert( const TQString& sName, const TQString& sLabel );
+ TDEAccelAction* insert( const TQString& sName, const TQString& sLabel );
/**
* Updates the connections of the accelerations after changing them.
@@ -123,14 +123,14 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
* @param sAction the name of the action
* @return the shortcut. If the action does not exist a null shortcut will be returned.
*/
- const KShortcut& shortcut( const TQString& sAction ) const;
+ const TDEShortcut& shortcut( const TQString& sAction ) const;
/**
* Set the shortcut to be associated with the action named by @p sAction.
* @param sAction the name of the action
* @param shortcut the shortcut for the action
* @return true if successful, false otherwise
*/
- bool setShortcut( const TQString& sAction, const KShortcut &shortcut );
+ bool setShortcut( const TQString& sAction, const TDEShortcut &shortcut );
/**
* Set the slot to be called when the shortcut of the action named
* by @p sAction is pressed.
@@ -203,7 +203,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
/**
* @internal -- this a wrapper function to
- * KAccelActions::useFourModifierKeys().
+ * TDEAccelActions::useFourModifierKeys().
*/
static bool useFourModifierKeys();
@@ -224,11 +224,11 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
private:
- KAccelActions& actions();
- const KAccelActions& actions() const;
+ TDEAccelActions& actions();
+ const TDEAccelActions& actions() const;
friend class TDEGlobalAccelPrivate;
- friend class KAccelShortcutList;
+ friend class TDEAccelShortcutList;
protected:
/** \internal */
virtual void virtual_hook( int id, void* data );
diff --git a/tdecore/kglobalaccel_emb.h b/tdecore/kglobalaccel_emb.h
index 8a535281..e4feb601 100644
--- a/tdecore/kglobalaccel_emb.h
+++ b/tdecore/kglobalaccel_emb.h
@@ -11,8 +11,8 @@ public:
virtual void setEnabled( bool bEnabled );
- virtual bool connectKey( KAccelAction&, KKeySequence );
- virtual bool disconnectKey( KAccelAction&, KKeySequence );
+ virtual bool connectKey( TDEAccelAction&, KKeySequence );
+ virtual bool disconnectKey( TDEAccelAction&, KKeySequence );
};
#endif // _KGLOBALACCEL_EMB_H
diff --git a/tdecore/kglobalaccel_mac.h b/tdecore/kglobalaccel_mac.h
index c82bdc17..82fe332b 100644
--- a/tdecore/kglobalaccel_mac.h
+++ b/tdecore/kglobalaccel_mac.h
@@ -6,11 +6,11 @@
#include "kshortcut.h"
#include "kaccelbase.h"
-class TDEGlobalAccelPrivate: public KAccelBase
+class TDEGlobalAccelPrivate: public TDEAccelBase
{
public:
TDEGlobalAccelPrivate()
- : KAccelBase(KAccelBase::NATIVE_KEYS)
+ : TDEAccelBase(TDEAccelBase::NATIVE_KEYS)
{}
// reimplemented pure virtuals
@@ -18,11 +18,11 @@ public:
{ Q_UNUSED(bEnabled); }
bool emitSignal( Signal signal )
{ Q_UNUSED(signal); return false; }
- bool connectKey( KAccelAction& action, const KKeyServer::Key& key)
+ bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key)
{ Q_UNUSED(action); Q_UNUSED(key); return false; }
bool connectKey( const KKeyServer::Key& key)
{ Q_UNUSED(key); return false; }
- bool disconnectKey( KAccelAction&, const KKeyServer::Key& key)
+ bool disconnectKey( TDEAccelAction&, const KKeyServer::Key& key)
{ Q_UNUSED(key); return false; }
bool disconnectKey( const KKeyServer::Key& )
{ return false; }
diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp
index 1ea3f025..0393bdd8 100644
--- a/tdecore/kglobalaccel_win.cpp
+++ b/tdecore/kglobalaccel_win.cpp
@@ -40,7 +40,7 @@
static TQValueList< TDEGlobalAccelPrivate* >* all_accels = 0;
TDEGlobalAccelPrivate::TDEGlobalAccelPrivate()
-: KAccelBase( KAccelBase::NATIVE_KEYS )
+: TDEAccelBase( TDEAccelBase::NATIVE_KEYS )
, m_blocked( false )
, m_blockingDisabled( false )
{
@@ -91,7 +91,7 @@ void TDEGlobalAccelPrivate::disableBlocking( bool block )
bool TDEGlobalAccelPrivate::isEnabledInternal() const
{
- return KAccelBase::isEnabled() && !m_blocked;
+ return TDEAccelBase::isEnabled() && !m_blocked;
}
bool TDEGlobalAccelPrivate::emitSignal( Signal )
@@ -99,16 +99,16 @@ bool TDEGlobalAccelPrivate::emitSignal( Signal )
return false;
}
-bool TDEGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key& key )
{ return grabKey( key, true, &action ); }
bool TDEGlobalAccelPrivate::connectKey( const KKeyServer::Key& key )
{ return grabKey( key, true, 0 ); }
-bool TDEGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key )
{ return grabKey( key, false, &action ); }
bool TDEGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key )
{ return grabKey( key, false, 0 ); }
-bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction )
+bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDEAccelAction* pAction )
{
/*
if( !key.code() ) {
@@ -268,7 +268,7 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
if( !m_rgCodeModToAction.contains( codemod ) ) {
#ifndef NDEBUG
for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
- KAccelAction* pAction = *it;
+ TDEAccelAction* pAction = *it;
kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16)
<< (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString::null)
<< endl;
@@ -276,7 +276,7 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
#endif
return false;
}
- KAccelAction* pAction = m_rgCodeModToAction[codemod];
+ TDEAccelAction* pAction = m_rgCodeModToAction[codemod];
if( !pAction ) {
static bool recursion_block = false;
@@ -297,7 +297,7 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
return true;
}*/
-void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq )
+void TDEGlobalAccelPrivate::activate( TDEAccelAction* pAction, const KKeySequence& seq )
{
kdDebug(125) << "TDEGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl;
@@ -335,7 +335,7 @@ void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence&
void TDEGlobalAccelPrivate::slotActivated( int iAction )
{
- KAccelAction* pAction = actions().actionPtr( iAction );
+ TDEAccelAction* pAction = actions().actionPtr( iAction );
if( pAction )
activate( pAction, KKeySequence() );
}
diff --git a/tdecore/kglobalaccel_win.h b/tdecore/kglobalaccel_win.h
index cde46c47..0a938cbf 100644
--- a/tdecore/kglobalaccel_win.h
+++ b/tdecore/kglobalaccel_win.h
@@ -30,7 +30,7 @@
/**
* @internal
*/
-class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase
+class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase
{
friend class TDEGlobalAccel;
Q_OBJECT
@@ -41,9 +41,9 @@ class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase
virtual void setEnabled( bool bEnabled );
virtual bool emitSignal( Signal signal );
- virtual bool connectKey( KAccelAction& action, const KKeyServer::Key& key );
+ virtual bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key );
virtual bool connectKey( const KKeyServer::Key& key );
- virtual bool disconnectKey( KAccelAction& action, const KKeyServer::Key& key );
+ virtual bool disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key );
virtual bool disconnectKey( const KKeyServer::Key& key );
protected:
@@ -51,7 +51,7 @@ class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase
/**
* @param bGrab Set to true to grab key, false to ungrab key.
*/
- bool grabKey( const KKeyServer::Key&, bool bGrab, KAccelAction* );
+ bool grabKey( const KKeyServer::Key&, bool bGrab, TDEAccelAction* );
/**
* Filters X11 events ev for key bindings in the accelerator dictionary.
@@ -63,7 +63,7 @@ class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase
// virtual bool x11Event( XEvent* );
// void x11MappingNotify();
// bool x11KeyPress( const XEvent *pEvent );
- void activate( KAccelAction* pAction, const KKeySequence& seq );
+ void activate( TDEAccelAction* pAction, const KKeySequence& seq );
virtual bool isEnabledInternal() const;
static void blockShortcuts( bool block );
void disableBlocking( bool disable );
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp
index 701c954f..64af9057 100644
--- a/tdecore/kglobalaccel_x11.cpp
+++ b/tdecore/kglobalaccel_x11.cpp
@@ -80,7 +80,7 @@ static void calculateGrabMasks()
static TQValueList< TDEGlobalAccelPrivate* >* all_accels = 0;
TDEGlobalAccelPrivate::TDEGlobalAccelPrivate()
-: KAccelBase( KAccelBase::NATIVE_KEYS )
+: TDEAccelBase( TDEAccelBase::NATIVE_KEYS )
, m_blocked( false )
, m_blockingDisabled( false )
, m_suspended( false )
@@ -133,7 +133,7 @@ void TDEGlobalAccelPrivate::disableBlocking( bool block )
bool TDEGlobalAccelPrivate::isEnabledInternal() const
{
- return KAccelBase::isEnabled() && !m_blocked;
+ return TDEAccelBase::isEnabled() && !m_blocked;
}
// see #117169 - the bug is hard to reproduce, probably somewhere in X, testcase would be probably
@@ -148,16 +148,16 @@ bool TDEGlobalAccelPrivate::emitSignal( Signal )
return false;
}
-bool TDEGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key& key )
{ return grabKey( key, true, &action ); }
bool TDEGlobalAccelPrivate::connectKey( const KKeyServer::Key& key )
{ return grabKey( key, true, 0 ); }
-bool TDEGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key )
{ return grabKey( key, false, &action ); }
bool TDEGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key )
{ return grabKey( key, false, 0 ); }
-bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction )
+bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDEAccelAction* pAction )
{
if( !key.code() ) {
kdWarning(125) << "TDEGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl;
@@ -286,7 +286,7 @@ void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
if( !m_rgCodeModToAction.contains( codemod ) ) {
#ifndef NDEBUG
for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
- KAccelAction* pAction = *it;
+ TDEAccelAction* pAction = *it;
kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16)
<< (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString())
<< endl;
@@ -295,7 +295,7 @@ void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
return;
}
- KAccelAction* pAction = m_rgCodeModToAction[codemod];
+ TDEAccelAction* pAction = m_rgCodeModToAction[codemod];
if( !pAction ) {
static bool recursion_block = false;
@@ -364,7 +364,7 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
if( !m_rgCodeModToAction.contains( codemod ) ) {
#ifndef NDEBUG
for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
- KAccelAction* pAction = *it;
+ TDEAccelAction* pAction = *it;
kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16)
<< (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString())
<< endl;
@@ -373,7 +373,7 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
return false;
}
- KAccelAction* pAction = m_rgCodeModToAction[codemod];
+ TDEAccelAction* pAction = m_rgCodeModToAction[codemod];
if( !pAction ) {
static bool recursion_block = false;
@@ -394,7 +394,7 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
return true;
}
-void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq )
+void TDEGlobalAccelPrivate::activate( TDEAccelAction* pAction, const KKeySequence& seq )
{
kdDebug(125) << "TDEGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl;
@@ -432,7 +432,7 @@ void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence&
void TDEGlobalAccelPrivate::slotActivated( int iAction )
{
- KAccelAction* pAction = KAccelBase::actions().actionPtr( iAction );
+ TDEAccelAction* pAction = TDEAccelBase::actions().actionPtr( iAction );
if( pAction )
activate( pAction, KKeySequence() );
}
diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/kglobalaccel_x11.h
index e28df060..df1f5442 100644
--- a/tdecore/kglobalaccel_x11.h
+++ b/tdecore/kglobalaccel_x11.h
@@ -30,7 +30,7 @@
/**
* @internal
*/
-class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase
+class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase
{
friend class TDEGlobalAccel;
Q_OBJECT
@@ -41,9 +41,9 @@ class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase
virtual void setEnabled( bool bEnabled );
virtual bool emitSignal( Signal signal );
- virtual bool connectKey( KAccelAction& action, const KKeyServer::Key& key );
+ virtual bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key );
virtual bool connectKey( const KKeyServer::Key& key );
- virtual bool disconnectKey( KAccelAction& action, const KKeyServer::Key& key );
+ virtual bool disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key );
virtual bool disconnectKey( const KKeyServer::Key& key );
protected:
@@ -73,14 +73,14 @@ class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase
return false;
}
};
- typedef TQMap<CodeMod, KAccelAction*> CodeModMap;
+ typedef TQMap<CodeMod, TDEAccelAction*> CodeModMap;
CodeModMap m_rgCodeModToAction;
/**
* @param bGrab Set to true to grab key, false to ungrab key.
*/
- bool grabKey( const KKeyServer::Key&, bool bGrab, KAccelAction* );
+ bool grabKey( const KKeyServer::Key&, bool bGrab, TDEAccelAction* );
/**
* Filters X11 events ev for key bindings in the accelerator dictionary.
@@ -92,7 +92,7 @@ class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase
virtual bool x11Event( XEvent* );
void x11MappingNotify();
bool x11KeyPress( const XEvent *pEvent );
- void activate( KAccelAction* pAction, const KKeySequence& seq );
+ void activate( TDEAccelAction* pAction, const KKeySequence& seq );
virtual bool isEnabledInternal() const;
static void blockShortcuts( bool block );
void disableBlocking( bool disable );
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index 58eeff41..f9774a88 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -186,7 +186,7 @@ bool TDEGlobalSettings::showContextMenusOnPress ()
int TDEGlobalSettings::contextMenuKey ()
{
TDEConfigGroup g(TDEGlobal::config(), "Shortcuts");
- KShortcut cut (g.readEntry ("PopupMenuContext", "Menu"));
+ TDEShortcut cut (g.readEntry ("PopupMenuContext", "Menu"));
return cut.keyCodeQt();
}
diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h
index 7a9c4290..ee893f97 100644
--- a/tdecore/kglobalsettings.h
+++ b/tdecore/kglobalsettings.h
@@ -111,7 +111,7 @@ class TDECORE_EXPORT TDEGlobalSettings
/**
* This enum describes the return type for insertTearOffHandle() whether to insert
* a handle or not. Applications who independently want to use handles in their popup menus
- * should test for Application level before calling the appropriate function in KPopupMenu.
+ * should test for Application level before calling the appropriate function in TDEPopupMenu.
* @since 3.1
**/
enum TearOffHandle {
@@ -121,8 +121,8 @@ class TDECORE_EXPORT TDEGlobalSettings
};
/**
- * Returns whether tear-off handles are inserted in KPopupMenus.
- * @return whether tear-off handles are inserted in KPopupMenus.
+ * Returns whether tear-off handles are inserted in TDEPopupMenus.
+ * @return whether tear-off handles are inserted in TDEPopupMenus.
* @since 3.1
**/
static TearOffHandle insertTearOffHandle();
@@ -346,8 +346,8 @@ class TDECORE_EXPORT TDEGlobalSettings
static TQColor highlightColor();
/**
- * Returns the alternate background color used by KListView with
- * KListViewItem. Any other list that uses alternating background
+ * Returns the alternate background color used by TDEListView with
+ * TDEListViewItem. Any other list that uses alternating background
* colors should use this too, to obey to the user's preferences. Returns
* an invalid color if the user doesn't want alternating backgrounds.
* @return the alternate background color
@@ -365,7 +365,7 @@ class TDECORE_EXPORT TDEGlobalSettings
static TQColor calculateAlternateBackgroundColor(const TQColor& base);
/**
- * Returns if the sorted column in a KListView shall be drawn with a
+ * Returns if the sorted column in a TDEListView shall be drawn with a
* shaded background color.
* @return true if the sorted column shall be shaded
* @since 3.4
diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp
index 75dde5c9..15e273d6 100644
--- a/tdecore/kmanagerselection.cpp
+++ b/tdecore/kmanagerselection.cpp
@@ -51,57 +51,57 @@ DEALINGS IN THE SOFTWARE.
#include <kxerrorhandler.h>
#include <X11/Xatom.h>
-class KSelectionOwnerPrivate
+class TDESelectionOwnerPrivate
: public QWidget
{
public:
- KSelectionOwnerPrivate( KSelectionOwner* owner );
+ TDESelectionOwnerPrivate( TDESelectionOwner* owner );
protected:
virtual bool x11Event( XEvent* ev );
private:
- KSelectionOwner* owner;
+ TDESelectionOwner* owner;
};
-KSelectionOwnerPrivate::KSelectionOwnerPrivate( KSelectionOwner* owner_P )
+TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P )
: owner( owner_P )
{
kapp->installX11EventFilter( TQT_TQWIDGET(this) );
}
-bool KSelectionOwnerPrivate::x11Event( XEvent* ev_P )
+bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P )
{
return owner->filterEvent( ev_P );
}
-KSelectionOwner::KSelectionOwner( Atom selection_P, int screen_P, TQObject* parent_P )
+TDESelectionOwner::TDESelectionOwner( Atom selection_P, int screen_P, TQObject* parent_P )
: TQObject( parent_P ),
selection( selection_P ),
screen( screen_P >= 0 ? screen_P : DefaultScreen( tqt_xdisplay())),
window( None ),
timestamp( CurrentTime ),
extra1( 0 ), extra2( 0 ),
- d( new KSelectionOwnerPrivate( this ))
+ d( new TDESelectionOwnerPrivate( this ))
{
}
-KSelectionOwner::KSelectionOwner( const char* selection_P, int screen_P, TQObject* parent_P )
+TDESelectionOwner::TDESelectionOwner( const char* selection_P, int screen_P, TQObject* parent_P )
: TQObject( parent_P ),
selection( XInternAtom( tqt_xdisplay(), selection_P, False )),
screen( screen_P >= 0 ? screen_P : DefaultScreen( tqt_xdisplay())),
window( None ),
timestamp( CurrentTime ),
extra1( 0 ), extra2( 0 ),
- d( new KSelectionOwnerPrivate( this ))
+ d( new TDESelectionOwnerPrivate( this ))
{
}
-KSelectionOwner::~KSelectionOwner()
+TDESelectionOwner::~TDESelectionOwner()
{
release();
delete d;
}
-bool KSelectionOwner::claim( bool force_P, bool force_kill_P )
+bool TDESelectionOwner::claim( bool force_P, bool force_kill_P )
{
if( manager_atom == None )
getAtoms();
@@ -179,7 +179,7 @@ bool KSelectionOwner::claim( bool force_P, bool force_kill_P )
}
// destroy resource first
-void KSelectionOwner::release()
+void TDESelectionOwner::release()
{
if( timestamp == CurrentTime )
return;
@@ -188,20 +188,20 @@ void KSelectionOwner::release()
timestamp = CurrentTime;
}
-Window KSelectionOwner::ownerWindow() const
+Window TDESelectionOwner::ownerWindow() const
{
if( timestamp == CurrentTime )
return None;
return window;
}
-void KSelectionOwner::setData( long extra1_P, long extra2_P )
+void TDESelectionOwner::setData( long extra1_P, long extra2_P )
{
extra1 = extra1_P;
extra2 = extra2_P;
}
-bool KSelectionOwner::filterEvent( XEvent* ev_P )
+bool TDESelectionOwner::filterEvent( XEvent* ev_P )
{
if( timestamp != CurrentTime && ev_P->xany.window == window )
{
@@ -244,12 +244,12 @@ bool KSelectionOwner::filterEvent( XEvent* ev_P )
return false;
}
-bool KSelectionOwner::handleMessage( XEvent* )
+bool TDESelectionOwner::handleMessage( XEvent* )
{
return false;
}
-void KSelectionOwner::filter_selection_request( XSelectionRequestEvent& ev_P )
+void TDESelectionOwner::filter_selection_request( XSelectionRequestEvent& ev_P )
{
if( timestamp == CurrentTime || ev_P.selection != selection )
return;
@@ -311,7 +311,7 @@ void KSelectionOwner::filter_selection_request( XSelectionRequestEvent& ev_P )
XSendEvent( tqt_xdisplay(), ev_P.requestor, False, 0, &ev );
}
-bool KSelectionOwner::handle_selection( Atom target_P, Atom property_P, Window requestor_P )
+bool TDESelectionOwner::handle_selection( Atom target_P, Atom property_P, Window requestor_P )
{
if( target_P == xa_timestamp )
{
@@ -328,7 +328,7 @@ bool KSelectionOwner::handle_selection( Atom target_P, Atom property_P, Window r
return true;
}
-void KSelectionOwner::replyTargets( Atom property_P, Window requestor_P )
+void TDESelectionOwner::replyTargets( Atom property_P, Window requestor_P )
{
Atom atoms[ 3 ] = { xa_multiple, xa_timestamp, xa_targets };
// kdDebug() << "Handling targets request" << endl;
@@ -336,12 +336,12 @@ void KSelectionOwner::replyTargets( Atom property_P, Window requestor_P )
reinterpret_cast< unsigned char* >( atoms ), 3 );
}
-bool KSelectionOwner::genericReply( Atom, Atom, Window )
+bool TDESelectionOwner::genericReply( Atom, Atom, Window )
{
return false;
}
-void KSelectionOwner::getAtoms()
+void TDESelectionOwner::getAtoms()
{
if( manager_atom == None )
{
@@ -356,66 +356,66 @@ void KSelectionOwner::getAtoms()
}
}
-Atom KSelectionOwner::manager_atom = None;
-Atom KSelectionOwner::xa_multiple = None;
-Atom KSelectionOwner::xa_targets = None;
-Atom KSelectionOwner::xa_timestamp = None;
+Atom TDESelectionOwner::manager_atom = None;
+Atom TDESelectionOwner::xa_multiple = None;
+Atom TDESelectionOwner::xa_targets = None;
+Atom TDESelectionOwner::xa_timestamp = None;
//*******************************************
-// KSelectionWatcher
+// TDESelectionWatcher
//*******************************************
-class KSelectionWatcherPrivate
+class TDESelectionWatcherPrivate
: public QWidget
{
public:
- KSelectionWatcherPrivate( KSelectionWatcher* watcher );
+ TDESelectionWatcherPrivate( TDESelectionWatcher* watcher );
protected:
virtual bool x11Event( XEvent* ev );
private:
- KSelectionWatcher* watcher;
+ TDESelectionWatcher* watcher;
};
-KSelectionWatcherPrivate::KSelectionWatcherPrivate( KSelectionWatcher* watcher_P )
+TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P )
: watcher( watcher_P )
{
kapp->installX11EventFilter( TQT_TQWIDGET(this) );
}
-bool KSelectionWatcherPrivate::x11Event( XEvent* ev_P )
+bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P )
{
watcher->filterEvent( ev_P );
return false;
}
-KSelectionWatcher::KSelectionWatcher( Atom selection_P, int screen_P, TQObject* parent_P )
+TDESelectionWatcher::TDESelectionWatcher( Atom selection_P, int screen_P, TQObject* parent_P )
: TQObject( parent_P ),
selection( selection_P ),
screen( screen_P >= 0 ? screen_P : DefaultScreen( tqt_xdisplay())),
selection_owner( None ),
- d( new KSelectionWatcherPrivate( this ))
+ d( new TDESelectionWatcherPrivate( this ))
{
init();
}
-KSelectionWatcher::KSelectionWatcher( const char* selection_P, int screen_P, TQObject* parent_P )
+TDESelectionWatcher::TDESelectionWatcher( const char* selection_P, int screen_P, TQObject* parent_P )
: TQObject( parent_P ),
selection( XInternAtom( tqt_xdisplay(), selection_P, False )),
screen( screen_P >= 0 ? screen_P : DefaultScreen( tqt_xdisplay())),
selection_owner( None ),
- d( new KSelectionWatcherPrivate( this ))
+ d( new TDESelectionWatcherPrivate( this ))
{
init();
}
-KSelectionWatcher::~KSelectionWatcher()
+TDESelectionWatcher::~TDESelectionWatcher()
{
delete d;
}
-void KSelectionWatcher::init()
+void TDESelectionWatcher::init()
{
if( manager_atom == None )
{
@@ -429,7 +429,7 @@ void KSelectionWatcher::init()
}
}
-Window KSelectionWatcher::owner()
+Window TDESelectionWatcher::owner()
{
Display* const dpy = tqt_xdisplay();
KXErrorHandler handler;
@@ -451,7 +451,7 @@ Window KSelectionWatcher::owner()
}
// void return value in order to allow more watchers in one process
-void KSelectionWatcher::filterEvent( XEvent* ev_P )
+void TDESelectionWatcher::filterEvent( XEvent* ev_P )
{
if( ev_P->type == ClientMessage )
{
@@ -478,12 +478,12 @@ void KSelectionWatcher::filterEvent( XEvent* ev_P )
return;
}
-Atom KSelectionWatcher::manager_atom = None;
+Atom TDESelectionWatcher::manager_atom = None;
-void KSelectionOwner::virtual_hook( int, void* )
+void TDESelectionOwner::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
-void KSelectionWatcher::virtual_hook( int, void* )
+void TDESelectionWatcher::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
#include "kmanagerselection.moc"
diff --git a/tdecore/kmanagerselection.h b/tdecore/kmanagerselection.h
index 5b46488a..de294187 100644
--- a/tdecore/kmanagerselection.h
+++ b/tdecore/kmanagerselection.h
@@ -36,7 +36,7 @@ DEALINGS IN THE SOFTWARE.
#include <X11/Xlib.h>
-class KSelectionOwnerPrivate;
+class TDESelectionOwnerPrivate;
/**
This class implements claiming and owning manager selections, as described
@@ -47,7 +47,7 @@ class KSelectionOwnerPrivate;
@since 3.2
@short ICCCM manager selection owner
*/
-class TDECORE_EXPORT KSelectionOwner
+class TDECORE_EXPORT TDESelectionOwner
: public TQObject
{
Q_OBJECT
@@ -60,7 +60,7 @@ class TDECORE_EXPORT KSelectionOwner
* @param screen X screen, or -1 for default
* @param parent parent object, or NULL if there is none
*/
- KSelectionOwner( Atom selection, int screen = -1, TQObject* parent = NULL );
+ TDESelectionOwner( Atom selection, int screen = -1, TQObject* parent = NULL );
/**
* @overload
* This constructor accepts the selection name and creates the appropriate atom
@@ -70,11 +70,11 @@ class TDECORE_EXPORT KSelectionOwner
* @param screen X screen, or -1 for default
* @param parent parent object, or NULL if there is none
*/
- KSelectionOwner( const char* selection, int screen = -1, TQObject* parent = NULL );
+ TDESelectionOwner( const char* selection, int screen = -1, TQObject* parent = NULL );
/**
* Destructor. Calls release().
*/
- virtual ~KSelectionOwner();
+ virtual ~TDESelectionOwner();
/**
* This function attemps to claim ownership of the manager selection, using
* the current X timestamp. If @p force is false, and the selection is already
@@ -157,10 +157,10 @@ class TDECORE_EXPORT KSelectionOwner
protected:
virtual void virtual_hook( int id, void* data );
private:
- KSelectionOwnerPrivate* d;
+ TDESelectionOwnerPrivate* d;
};
-class KSelectionWatcherPrivate;
+class TDESelectionWatcherPrivate;
/**
This class implements watching manager selections, as described in the ICCCM
@@ -170,7 +170,7 @@ class KSelectionWatcherPrivate;
@since 3.2
@short ICCCM manager selection watching
*/
-class TDECORE_EXPORT KSelectionWatcher
+class TDECORE_EXPORT TDESelectionWatcher
: public TQObject
{
Q_OBJECT
@@ -183,7 +183,7 @@ class TDECORE_EXPORT KSelectionWatcher
* @param screen X screen, or -1 for default
* @param parent parent object, or NULL if there is none
*/
- KSelectionWatcher( Atom selection, int screen = -1, TQObject* parent = NULL );
+ TDESelectionWatcher( Atom selection, int screen = -1, TQObject* parent = NULL );
/**
* @overload
* This constructor accepts the selection name and creates the appropriate atom
@@ -193,8 +193,8 @@ class TDECORE_EXPORT KSelectionWatcher
* @param screen X screen, or -1 for default
* @param parent parent object, or NULL if there is none
*/
- KSelectionWatcher( const char* selection, int screen = -1, TQObject* parent = NULL );
- virtual ~KSelectionWatcher();
+ TDESelectionWatcher( const char* selection, int screen = -1, TQObject* parent = NULL );
+ virtual ~TDESelectionWatcher();
/**
* Return the current owner of the manager selection, if any.
*/
@@ -226,7 +226,7 @@ class TDECORE_EXPORT KSelectionWatcher
protected:
virtual void virtual_hook( int id, void* data );
private:
- KSelectionWatcherPrivate* d;
+ TDESelectionWatcherPrivate* d;
};
#endif
diff --git a/tdecore/kshortcut.cpp b/tdecore/kshortcut.cpp
index 10c6c31f..ae568d5b 100644
--- a/tdecore/kshortcut.cpp
+++ b/tdecore/kshortcut.cpp
@@ -33,7 +33,7 @@
static KKey* g_pspec = 0;
static KKeySequence* g_pseq = 0;
-static KShortcut* g_pcut = 0;
+static TDEShortcut* g_pcut = 0;
//----------------------------------------------------
// KKey
@@ -396,28 +396,28 @@ KKeySequence& KKeySequence::null()
}
//---------------------------------------------------------------------
-// KShortcut
+// TDEShortcut
//---------------------------------------------------------------------
-KShortcut::KShortcut() { clear(); }
-KShortcut::KShortcut( int keyQt ) { init( keyQt ); }
-KShortcut::KShortcut( const TQKeySequence& key ) { init( key ); }
-KShortcut::KShortcut( const KKey& key ) { init( key ); }
-KShortcut::KShortcut( const KKeySequence& seq ) { init( seq ); }
-KShortcut::KShortcut( const KShortcut& cut ) { init( cut ); }
-KShortcut::KShortcut( const char* ps ) { init( TQString(ps) ); }
-KShortcut::KShortcut( const TQString& s ) { init( s ); }
+TDEShortcut::TDEShortcut() { clear(); }
+TDEShortcut::TDEShortcut( int keyQt ) { init( keyQt ); }
+TDEShortcut::TDEShortcut( const TQKeySequence& key ) { init( key ); }
+TDEShortcut::TDEShortcut( const KKey& key ) { init( key ); }
+TDEShortcut::TDEShortcut( const KKeySequence& seq ) { init( seq ); }
+TDEShortcut::TDEShortcut( const TDEShortcut& cut ) { init( cut ); }
+TDEShortcut::TDEShortcut( const char* ps ) { init( TQString(ps) ); }
+TDEShortcut::TDEShortcut( const TQString& s ) { init( s ); }
-KShortcut::~KShortcut()
+TDEShortcut::~TDEShortcut()
{
}
-void KShortcut::clear()
+void TDEShortcut::clear()
{
m_nSeqs = 0;
}
-bool KShortcut::init( int keyQt )
+bool TDEShortcut::init( int keyQt )
{
if( keyQt ) {
m_nSeqs = 1;
@@ -427,28 +427,28 @@ bool KShortcut::init( int keyQt )
return true;
}
-bool KShortcut::init( const TQKeySequence& key )
+bool TDEShortcut::init( const TQKeySequence& key )
{
m_nSeqs = 1;
m_rgseq[0].init( key );
return true;
}
-bool KShortcut::init( const KKey& spec )
+bool TDEShortcut::init( const KKey& spec )
{
m_nSeqs = 1;
m_rgseq[0].init( spec );
return true;
}
-bool KShortcut::init( const KKeySequence& seq )
+bool TDEShortcut::init( const KKeySequence& seq )
{
m_nSeqs = 1;
m_rgseq[0] = seq;
return true;
}
-bool KShortcut::init( const KShortcut& cut )
+bool TDEShortcut::init( const TDEShortcut& cut )
{
m_nSeqs = cut.m_nSeqs;
for( uint i = 0; i < m_nSeqs; i++ )
@@ -456,7 +456,7 @@ bool KShortcut::init( const KShortcut& cut )
return true;
}
-bool KShortcut::init( const TQString& s )
+bool TDEShortcut::init( const TQString& s )
{
bool bRet = true;
TQStringList rgs = TQStringList::split( ';', s );
@@ -480,7 +480,7 @@ bool KShortcut::init( const TQString& s )
if( !s.isEmpty() ) {
TQString sDebug;
TQTextStream os( &sDebug, IO_WriteOnly );
- os << "KShortcut::init( \"" << s << "\" ): ";
+ os << "TDEShortcut::init( \"" << s << "\" ): ";
for( uint i = 0; i < m_nSeqs; i++ ) {
os << " m_rgseq[" << i << "]: ";
KKeyServer::Variations vars;
@@ -494,29 +494,29 @@ bool KShortcut::init( const TQString& s )
return bRet;
}
-uint KShortcut::count() const
+uint TDEShortcut::count() const
{
return m_nSeqs;
}
-const KKeySequence& KShortcut::seq( uint i ) const
+const KKeySequence& TDEShortcut::seq( uint i ) const
{
return (i < m_nSeqs) ? m_rgseq[i] : KKeySequence::null();
}
-int KShortcut::keyCodeQt() const
+int TDEShortcut::keyCodeQt() const
{
if( m_nSeqs >= 1 )
return m_rgseq[0].keyCodeQt();
return TQKeySequence();
}
-bool KShortcut::isNull() const
+bool TDEShortcut::isNull() const
{
return m_nSeqs == 0;
}
-int KShortcut::compare( const KShortcut& cut ) const
+int TDEShortcut::compare( const TDEShortcut& cut ) const
{
for( uint i = 0; i < m_nSeqs && i < cut.m_nSeqs; i++ ) {
int ret = m_rgseq[i].compare( cut.m_rgseq[i] );
@@ -526,12 +526,12 @@ int KShortcut::compare( const KShortcut& cut ) const
return m_nSeqs - cut.m_nSeqs;
}
-bool KShortcut::contains( const KKey& key ) const
+bool TDEShortcut::contains( const KKey& key ) const
{
return contains( KKeySequence(key) );
}
-bool KShortcut::contains( const KKeyNative& keyNative ) const
+bool TDEShortcut::contains( const KKeyNative& keyNative ) const
{
KKey key = keyNative.key();
key.simplify();
@@ -545,7 +545,7 @@ bool KShortcut::contains( const KKeyNative& keyNative ) const
return false;
}
-bool KShortcut::contains( const KKeySequence& seq ) const
+bool TDEShortcut::contains( const KKeySequence& seq ) const
{
for( uint i = 0; i < count(); i++ ) {
if( !m_rgseq[i].isNull() && m_rgseq[i] == seq )
@@ -554,7 +554,7 @@ bool KShortcut::contains( const KKeySequence& seq ) const
return false;
}
-bool KShortcut::setSeq( uint iSeq, const KKeySequence& seq )
+bool TDEShortcut::setSeq( uint iSeq, const KKeySequence& seq )
{
// TODO: check if seq is null, and act accordingly.
if( iSeq <= m_nSeqs && iSeq < MAX_SEQUENCES ) {
@@ -566,7 +566,7 @@ bool KShortcut::setSeq( uint iSeq, const KKeySequence& seq )
return false;
}
-void KShortcut::remove( const KKeySequence& seq )
+void TDEShortcut::remove( const KKeySequence& seq )
{
if (seq.isNull()) return;
@@ -581,7 +581,7 @@ void KShortcut::remove( const KKeySequence& seq )
}
}
-bool KShortcut::append( const KKeySequence& seq )
+bool TDEShortcut::append( const KKeySequence& seq )
{
if( m_nSeqs < MAX_SEQUENCES ) {
if( !seq.isNull() ) {
@@ -593,7 +593,7 @@ bool KShortcut::append( const KKeySequence& seq )
return false;
}
-bool KShortcut::append( const KKey& spec )
+bool TDEShortcut::append( const KKey& spec )
{
if( m_nSeqs < MAX_SEQUENCES ) {
m_rgseq[m_nSeqs].init( spec );
@@ -603,7 +603,7 @@ bool KShortcut::append( const KKey& spec )
return false;
}
-bool KShortcut::append( const KShortcut& cut )
+bool TDEShortcut::append( const TDEShortcut& cut )
{
uint seqs = m_nSeqs, co = cut.count();
for( uint i=0; i<co; i++ ) {
@@ -621,7 +621,7 @@ bool KShortcut::append( const KShortcut& cut )
return true;
}
-KShortcut::operator TQKeySequence () const
+TDEShortcut::operator TQKeySequence () const
{
if( count() >= 1 )
return m_rgseq[0].qt();
@@ -629,7 +629,7 @@ KShortcut::operator TQKeySequence () const
return TQKeySequence();
}
-TQString KShortcut::toString() const
+TQString TDEShortcut::toString() const
{
TQString s;
@@ -642,7 +642,7 @@ TQString KShortcut::toString() const
return s;
}
-TQString KShortcut::toStringInternal( const KShortcut* pcutDefault ) const
+TQString TDEShortcut::toStringInternal( const TDEShortcut* pcutDefault ) const
{
TQString s;
@@ -661,10 +661,10 @@ TQString KShortcut::toStringInternal( const KShortcut* pcutDefault ) const
return s;
}
-KShortcut& KShortcut::null()
+TDEShortcut& TDEShortcut::null()
{
if( !g_pcut )
- g_pcut = new KShortcut;
+ g_pcut = new TDEShortcut;
if( !g_pcut->isNull() )
g_pcut->clear();
return *g_pcut;
diff --git a/tdecore/kshortcut.h b/tdecore/kshortcut.h
index 9baf31b0..e98a007b 100644
--- a/tdecore/kshortcut.h
+++ b/tdecore/kshortcut.h
@@ -34,7 +34,7 @@ class KKeyNative;
* by the underlying system (e.g. X11).
* @see KKeyNative
* @see KKeySequence
-* @see KShortcut
+* @see TDEShortcut
*/
class TDECORE_EXPORT KKey
@@ -282,7 +282,7 @@ class TDECORE_EXPORT KKey
* A KKeySequence object holds a sequence of up to 4 keys.
* Ex: Ctrl+X,I
* @see KKey
-* @see KShortcut
+* @see TDEShortcut
*/
class TDECORE_EXPORT KKeySequence
@@ -518,18 +518,18 @@ class TDECORE_EXPORT KKeySequence
};
/**
-* The KShortcut class is used to represent a keyboard shortcut to an action.
+* The TDEShortcut class is used to represent a keyboard shortcut to an action.
* A shortcut is normally a single key with modifiers, such as Ctrl+V.
-* A KShortcut object may also contain an alternate key which will also
+* A TDEShortcut object may also contain an alternate key which will also
* activate the action it's associated to, as long as no other actions have
* defined that key as their primary key. Ex: Ctrl+V;Shift+Insert.
*
-* This can be used to add additional accelerators to a KAction. For example,
+* This can be used to add additional accelerators to a TDEAction. For example,
* the below code binds the escape key to the close action.
*
* \code
-* KAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() );
-* KShortcut closeShortcut = closeAction->shortcut();
+* TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() );
+* TDEShortcut closeShortcut = closeAction->shortcut();
* closeShortcut.append( KKey(Key_Escape));
* closeAction->setShortcut(closeShortcut);
* \endcode
@@ -540,12 +540,12 @@ class TDECORE_EXPORT KKeySequence
*
*/
-class TDECORE_EXPORT KShortcut
+class TDECORE_EXPORT TDEShortcut
{
public:
/**
* The maximum number of key sequences that can be contained in
- * a KShortcut.
+ * a TDEShortcut.
*/
enum { MAX_SEQUENCES = 2 };
@@ -555,7 +555,7 @@ class TDECORE_EXPORT KShortcut
* @see isNull()
* @see clear()
*/
- KShortcut();
+ TDEShortcut();
/**
* Creates a new shortcut with the given Qt key code
@@ -563,34 +563,34 @@ class TDECORE_EXPORT KShortcut
* @param keyQt the qt keycode
* @see Qt::Key
*/
- KShortcut( int keyQt );
+ TDEShortcut( int keyQt );
/**
* Creates a new shortcut that contains only the given qt key
* sequence.
* @param keySeq the qt key sequence to add
*/
- KShortcut( const TQKeySequence& keySeq );
+ TDEShortcut( const TQKeySequence& keySeq );
/**
* Creates a new shortcut that contains only the given key
* in its only sequence.
* @param key the key to add
*/
- KShortcut( const KKey& key );
+ TDEShortcut( const KKey& key );
/**
* Creates a new shortcut that contains only the given key
* sequence.
* @param keySeq the key sequence to add
*/
- KShortcut( const KKeySequence& keySeq );
+ TDEShortcut( const KKeySequence& keySeq );
/**
* Copies the given shortcut.
* @param shortcut the shortcut to add
*/
- KShortcut( const KShortcut& shortcut );
+ TDEShortcut( const TDEShortcut& shortcut );
/**
* Creates a new key sequence that contains the given key sequence.
@@ -599,7 +599,7 @@ class TDECORE_EXPORT KShortcut
* @param shortcut the description of the key
* @see KKeySequence::KKeySequence(const TQString&)
*/
- KShortcut( const char* shortcut );
+ TDEShortcut( const char* shortcut );
/**
* Creates a new key sequence that contains the given key sequence.
@@ -608,8 +608,8 @@ class TDECORE_EXPORT KShortcut
* @param shortcut the description of the key
* @see KKeySequence::KKeySequence(const TQString&)
*/
- KShortcut( const TQString& shortcut );
- ~KShortcut();
+ TDEShortcut( const TQString& shortcut );
+ ~TDEShortcut();
/**
* Clears the shortcut. The shortcut is null after calling this
@@ -648,7 +648,7 @@ class TDECORE_EXPORT KShortcut
* Copies the given shortcut.
* @param shortcut the shortcut to add
*/
- bool init( const KShortcut& shortcut );
+ bool init( const TDEShortcut& shortcut );
/**
* Initializes the key sequence with the given key sequence.
@@ -662,7 +662,7 @@ class TDECORE_EXPORT KShortcut
/**
* Copies the given shortcut over this shortcut.
*/
- KShortcut& operator =( const KShortcut& cut )
+ TDEShortcut& operator =( const TDEShortcut& cut )
{ init( cut ); return *this; }
/**
@@ -708,32 +708,32 @@ class TDECORE_EXPORT KShortcut
* beginning until an unequal key sequences has been found. If a shortcut
* contains more key sequences, it is considered larger.
* @param shortcut the shortcut to compare to
- * @return a negative number if the given KShortcut is larger, 0 if
- * they are equal and a positive number this KShortcut is larger
+ * @return a negative number if the given TDEShortcut is larger, 0 if
+ * they are equal and a positive number this TDEShortcut is larger
* @see KKey::compare()
* @see KKeyShortcut::compare()
*/
- int compare( const KShortcut& shortcut ) const;
+ int compare( const TDEShortcut& shortcut ) const;
/**
* Compares the sequences of both shortcuts.
* @see compare()
*/
- bool operator == ( const KShortcut& cut ) const
+ bool operator == ( const TDEShortcut& cut ) const
{ return compare( cut ) == 0; }
/**
* Compares the sequences of both shortcuts.
* @see compare()
*/
- bool operator != ( const KShortcut& cut ) const
+ bool operator != ( const TDEShortcut& cut ) const
{ return compare( cut ) != 0; }
/**
* Compares the sequences of both shortcuts.
* @see compare()
*/
- bool operator < ( const KShortcut& cut ) const
+ bool operator < ( const TDEShortcut& cut ) const
{ return compare( cut ) < 0; }
/**
@@ -804,7 +804,7 @@ class TDECORE_EXPORT KShortcut
* @see MAX_SEQUENCES
* @since 3.2
*/
- bool append( const KShortcut& cut );
+ bool append( const TDEShortcut& cut );
/**
* Converts this shortcut to a key sequence. The first key sequence
@@ -824,7 +824,7 @@ class TDECORE_EXPORT KShortcut
/**
* @internal
*/
- TQString toStringInternal( const KShortcut* pcutDefault = 0 ) const;
+ TQString toStringInternal( const TDEShortcut* pcutDefault = 0 ) const;
/**
* Returns a null shortcut.
@@ -832,14 +832,14 @@ class TDECORE_EXPORT KShortcut
* @see isNull()
* @see clear()
*/
- static KShortcut& null();
+ static TDEShortcut& null();
protected:
uint m_nSeqs;
KKeySequence m_rgseq[MAX_SEQUENCES];
private:
- class KShortcutPrivate* d;
+ class TDEShortcutPrivate* d;
friend class KKeyNative;
#ifndef KDE_NO_COMPAT
diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp
index dd171062..d32df889 100644
--- a/tdecore/kshortcutlist.cpp
+++ b/tdecore/kshortcutlist.cpp
@@ -12,23 +12,23 @@
#include "kshortcutlist.h"
//---------------------------------------------------------------------
-// KShortcutList
+// TDEShortcutList
//---------------------------------------------------------------------
-KShortcutList::KShortcutList()
+TDEShortcutList::TDEShortcutList()
{
}
-KShortcutList::~KShortcutList()
+TDEShortcutList::~TDEShortcutList()
{
}
-bool KShortcutList::isGlobal( uint ) const
+bool TDEShortcutList::isGlobal( uint ) const
{
return false;
}
-int KShortcutList::index( const TQString& sName ) const
+int TDEShortcutList::index( const TQString& sName ) const
{
uint nSize = count();
for( uint i = 0;
@@ -39,7 +39,7 @@ int KShortcutList::index( const TQString& sName ) const
return -1;
}
-int KShortcutList::index( const KKeySequence& seq ) const
+int TDEShortcutList::index( const KKeySequence& seq ) const
{
if( seq.isNull() )
return -1;
@@ -53,24 +53,24 @@ int KShortcutList::index( const KKeySequence& seq ) const
return -1;
}
-const TDEInstance* KShortcutList::instance() const
+const TDEInstance* TDEShortcutList::instance() const
{
return 0;
}
-TQVariant KShortcutList::getOther( Other, uint ) const
+TQVariant TDEShortcutList::getOther( Other, uint ) const
{
return TQVariant();
}
-bool KShortcutList::setOther( Other, uint, TQVariant )
+bool TDEShortcutList::setOther( Other, uint, TQVariant )
{
return false;
}
-bool KShortcutList::readSettings( const TQString& sConfigGroup, TDEConfigBase* pConfig )
+bool TDEShortcutList::readSettings( const TQString& sConfigGroup, TDEConfigBase* pConfig )
{
- kdDebug(125) << "KShortcutList::readSettings( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl;
+ kdDebug(125) << "TDEShortcutList::readSettings( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl;
if( !pConfig )
pConfig = TDEGlobal::config();
TQString sGroup = (!sConfigGroup.isEmpty()) ? sConfigGroup : TQString("Shortcuts");
@@ -92,9 +92,9 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, TDEConfigBase* p
TQString sEntry = pConfig->readEntry( name(i) );
if( !sEntry.isEmpty() ) {
if( sEntry == "none" )
- setShortcut( i, KShortcut() );
+ setShortcut( i, TDEShortcut() );
else
- setShortcut( i, KShortcut(sEntry) );
+ setShortcut( i, TDEShortcut(sEntry) );
}
else // default shortcut
setShortcut( i, shortcutDefault(i) );
@@ -102,13 +102,13 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, TDEConfigBase* p
}
}
- kdDebug(125) << "KShortcutList::readSettings done" << endl;
+ kdDebug(125) << "TDEShortcutList::readSettings done" << endl;
return true;
}
-bool KShortcutList::writeSettings( const TQString &sConfigGroup, TDEConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const
+bool TDEShortcutList::writeSettings( const TQString &sConfigGroup, TDEConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const
{
- kdDebug(125) << "KShortcutList::writeSettings( " << sConfigGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
+ kdDebug(125) << "TDEShortcutList::writeSettings( " << sConfigGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
if( !pConfig )
pConfig = TDEGlobal::config();
@@ -149,72 +149,72 @@ bool KShortcutList::writeSettings( const TQString &sConfigGroup, TDEConfigBase*
}
//---------------------------------------------------------------------
-// KAccelShortcutList
+// TDEAccelShortcutList
//---------------------------------------------------------------------
-class KAccelShortcutListPrivate
+class TDEAccelShortcutListPrivate
{
public:
TQString m_configGroup;
};
-KAccelShortcutList::KAccelShortcutList( KAccel* pAccel )
+TDEAccelShortcutList::TDEAccelShortcutList( TDEAccel* pAccel )
: m_actions( pAccel->actions() )
{
- d=new KAccelShortcutListPrivate;
+ d=new TDEAccelShortcutListPrivate;
m_bGlobal = false;
d->m_configGroup=pAccel->configGroup();
}
-KAccelShortcutList::KAccelShortcutList( TDEGlobalAccel* pAccel )
+TDEAccelShortcutList::TDEAccelShortcutList( TDEGlobalAccel* pAccel )
: m_actions( pAccel->actions() )
{
- d=new KAccelShortcutListPrivate;
+ d=new TDEAccelShortcutListPrivate;
m_bGlobal = true;
d->m_configGroup=pAccel->configGroup();
}
-KAccelShortcutList::KAccelShortcutList( KAccelActions& actions, bool bGlobal )
+TDEAccelShortcutList::TDEAccelShortcutList( TDEAccelActions& actions, bool bGlobal )
: m_actions( actions )
{
- d=new KAccelShortcutListPrivate;
+ d=new TDEAccelShortcutListPrivate;
m_bGlobal = bGlobal;
}
-KAccelShortcutList::~KAccelShortcutList()
+TDEAccelShortcutList::~TDEAccelShortcutList()
{ delete d;}
-uint KAccelShortcutList::count() const
+uint TDEAccelShortcutList::count() const
{ return m_actions.count(); }
-TQString KAccelShortcutList::name( uint i ) const
+TQString TDEAccelShortcutList::name( uint i ) const
{ return m_actions.actionPtr(i)->name(); }
-TQString KAccelShortcutList::label( uint i ) const
+TQString TDEAccelShortcutList::label( uint i ) const
{ return m_actions.actionPtr(i)->label(); }
-TQString KAccelShortcutList::whatsThis( uint i ) const
+TQString TDEAccelShortcutList::whatsThis( uint i ) const
{ return m_actions.actionPtr(i)->whatsThis(); }
-const KShortcut& KAccelShortcutList::shortcut( uint i ) const
+const TDEShortcut& TDEAccelShortcutList::shortcut( uint i ) const
{ return m_actions.actionPtr(i)->shortcut(); }
-const KShortcut& KAccelShortcutList::shortcutDefault( uint i ) const
+const TDEShortcut& TDEAccelShortcutList::shortcutDefault( uint i ) const
{ return m_actions.actionPtr(i)->shortcutDefault(); }
-bool KAccelShortcutList::isConfigurable( uint i ) const
+bool TDEAccelShortcutList::isConfigurable( uint i ) const
{ return m_actions.actionPtr(i)->isConfigurable(); }
-bool KAccelShortcutList::setShortcut( uint i, const KShortcut& cut )
+bool TDEAccelShortcutList::setShortcut( uint i, const TDEShortcut& cut )
{ return m_actions.actionPtr(i)->setShortcut( cut ); }
-TQVariant KAccelShortcutList::getOther( Other, uint ) const
+TQVariant TDEAccelShortcutList::getOther( Other, uint ) const
{ return TQVariant(); }
-bool KAccelShortcutList::isGlobal( uint ) const
+bool TDEAccelShortcutList::isGlobal( uint ) const
{ return m_bGlobal; }
-bool KAccelShortcutList::setOther( Other, uint, TQVariant )
+bool TDEAccelShortcutList::setOther( Other, uint, TQVariant )
{ return false; }
-bool KAccelShortcutList::save() const
+bool TDEAccelShortcutList::save() const
{ return writeSettings( d->m_configGroup ); }
-void KShortcutList::virtual_hook( int, void* )
+void TDEShortcutList::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
-void KAccelShortcutList::virtual_hook( int id, void* data )
-{ KShortcutList::virtual_hook( id, data ); }
+void TDEAccelShortcutList::virtual_hook( int id, void* data )
+{ TDEShortcutList::virtual_hook( id, data ); }
-void KStdAccel::ShortcutList::virtual_hook( int id, void* data )
-{ KShortcutList::virtual_hook( id, data ); }
+void TDEStdAccel::ShortcutList::virtual_hook( int id, void* data )
+{ TDEShortcutList::virtual_hook( id, data ); }
diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h
index 7f4caa07..99e83766 100644
--- a/tdecore/kshortcutlist.h
+++ b/tdecore/kshortcutlist.h
@@ -28,31 +28,31 @@ class TQVariant;
class TDEConfigBase;
class TDEInstance;
class KKeySequence;
-class KShortcut;
+class TDEShortcut;
/**********************************************************************
* This is a wrapper class which allows a function to use one interface
-* to KActionCollection, KAccelActions, and KActionPtrList.
+* to TDEActionCollection, TDEAccelActions, and TDEActionPtrList.
**********************************************************************/
/**
- * KShortcutList is an abstract base class for
- * KAccelShortcutList and KStdAccel::ShortcutList. It gives
+ * TDEShortcutList is an abstract base class for
+ * TDEAccelShortcutList and TDEStdAccel::ShortcutList. It gives
* you an unified interface for accessing the accelerator lists
- * of KAccel (using KAccelShortcutList),
- * TDEGlobalAccel (using KAccelShortcutList), and
- * KStdAccel (using KStdAccel::ShortcutList).
+ * of TDEAccel (using TDEAccelShortcutList),
+ * TDEGlobalAccel (using TDEAccelShortcutList), and
+ * TDEStdAccel (using TDEStdAccel::ShortcutList).
*
* @short Base class for accessing accelerator lists
*/
-class TDECORE_EXPORT KShortcutList
+class TDECORE_EXPORT TDEShortcutList
{
public:
/**
* Default constructor.
*/
- KShortcutList();
- virtual ~KShortcutList();
+ TDEShortcutList();
+ virtual ~TDEShortcutList();
/**
* Returns the number of entries.
@@ -90,7 +90,7 @@ class TDECORE_EXPORT KShortcutList
* @return the shortcut
* @see shortcutDefault()
*/
- virtual const KShortcut& shortcut( uint index ) const = 0;
+ virtual const TDEShortcut& shortcut( uint index ) const = 0;
/**
* Returns default shortcut with the given @p index.
@@ -98,7 +98,7 @@ class TDECORE_EXPORT KShortcutList
* @return the default shortcut
* @see shortcut()
*/
- virtual const KShortcut& shortcutDefault( uint index ) const = 0;
+ virtual const TDEShortcut& shortcutDefault( uint index ) const = 0;
/**
* Checks whether the shortcut with the given @p index is configurable.
@@ -112,7 +112,7 @@ class TDECORE_EXPORT KShortcutList
* @param index the index of the shortcut (must be < count())
* @param shortcut the shortcut
*/
- virtual bool setShortcut( uint index, const KShortcut &shortcut ) = 0;
+ virtual bool setShortcut( uint index, const TDEShortcut &shortcut ) = 0;
/**
* Checks whether the shortcut with the given @p index is saved in the
@@ -180,56 +180,56 @@ class TDECORE_EXPORT KShortcutList
/// used to extend the interface with virtuals without breaking binary compatibility
virtual void virtual_hook( int id, void* data );
private:
- class KShortcutListPrivate* d;
+ class TDEShortcutListPrivate* d;
};
//---------------------------------------------------------------------
-// KAccelShortcutList
+// TDEAccelShortcutList
//---------------------------------------------------------------------
-class KAccel;
-class KAccelActions;
+class TDEAccel;
+class TDEAccelActions;
class TDEGlobalAccel;
/**
- * KShortcutList implementation to access KAccel and
+ * TDEShortcutList implementation to access TDEAccel and
* TDEGlobalAccel lists.
*/
-class TDECORE_EXPORT KAccelShortcutList : public KShortcutList
+class TDECORE_EXPORT TDEAccelShortcutList : public TDEShortcutList
{
public:
/**
- * Creates a new KShortcutList that accesses the given KAccel.
+ * Creates a new TDEShortcutList that accesses the given TDEAccel.
* @param accel the accelerators to access
*/
- KAccelShortcutList( KAccel* accel );
+ TDEAccelShortcutList( TDEAccel* accel );
/**
- * Creates a new KShortcutList that accesses the given
+ * Creates a new TDEShortcutList that accesses the given
* TDEGlobalAccel.
* @param accel the accelerators to access
*/
- KAccelShortcutList( TDEGlobalAccel* accel );
+ TDEAccelShortcutList( TDEGlobalAccel* accel );
/**
* @internal
- * Creates a new KShortcutList that accesses the given
- * KAccelActions collection.
+ * Creates a new TDEShortcutList that accesses the given
+ * TDEAccelActions collection.
* @param actions the actions to access
* @param bGlobal true to save the actions in the global
* configuration file
*/
- KAccelShortcutList( KAccelActions &actions, bool bGlobal );
- virtual ~KAccelShortcutList();
+ TDEAccelShortcutList( TDEAccelActions &actions, bool bGlobal );
+ virtual ~TDEAccelShortcutList();
virtual uint count() const;
virtual TQString name( uint index ) const;
virtual TQString label( uint index ) const;
virtual TQString whatsThis( uint index ) const;
- virtual const KShortcut& shortcut( uint index ) const;
- virtual const KShortcut& shortcutDefault( uint index ) const;
+ virtual const TDEShortcut& shortcut( uint index ) const;
+ virtual const TDEShortcut& shortcutDefault( uint index ) const;
virtual bool isConfigurable( uint index ) const;
- virtual bool setShortcut( uint index , const KShortcut& shortcut );
+ virtual bool setShortcut( uint index , const TDEShortcut& shortcut );
virtual bool isGlobal( uint index ) const;
/** \internal */
@@ -241,26 +241,26 @@ class TDECORE_EXPORT KAccelShortcutList : public KShortcutList
protected:
/** Actions (collection) for this shortcut list. Set by constructor. */
- KAccelActions& m_actions;
+ TDEAccelActions& m_actions;
/** Is this shortcut list global? Access through isGlobal() */
bool m_bGlobal;
protected:
virtual void virtual_hook( int id, void* data );
private:
- class KAccelShortcutListPrivate* d;
+ class TDEAccelShortcutListPrivate* d;
};
-namespace KStdAccel {
+namespace TDEStdAccel {
//---------------------------------------------------------------------
// ShortcutList
//---------------------------------------------------------------------
/**
- * KShortcutList implementation that accesses KStdAccel
+ * TDEShortcutList implementation that accesses TDEStdAccel
* actions.
*/
-class TDECORE_EXPORT ShortcutList : public KShortcutList
+class TDECORE_EXPORT ShortcutList : public TDEShortcutList
{
public:
/**
@@ -273,10 +273,10 @@ class TDECORE_EXPORT ShortcutList : public KShortcutList
virtual TQString name( uint index ) const;
virtual TQString label( uint index ) const;
virtual TQString whatsThis( uint index ) const;
- virtual const KShortcut& shortcut( uint index ) const;
- virtual const KShortcut& shortcutDefault( uint index ) const;
+ virtual const TDEShortcut& shortcut( uint index ) const;
+ virtual const TDEShortcut& shortcutDefault( uint index ) const;
virtual bool isConfigurable( uint index ) const;
- virtual bool setShortcut( uint index , const KShortcut& shortcut );
+ virtual bool setShortcut( uint index , const TDEShortcut& shortcut );
/** \internal */
virtual TQVariant getOther( Other, uint index ) const;
diff --git a/tdecore/kshortcutmenu.cpp b/tdecore/kshortcutmenu.cpp
index 4bf18d96..be485fb7 100644
--- a/tdecore/kshortcutmenu.cpp
+++ b/tdecore/kshortcutmenu.cpp
@@ -27,7 +27,7 @@
#include "kshortcutmenu.h"
//#include <kkeynative.h>
-KShortcutMenu::KShortcutMenu( TQWidget* pParent, KAccelActions* pActions, KKeySequence seq )
+TDEShortcutMenu::TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq )
: TQPopupMenu( pParent ),
m_pActions( pActions ),
m_seq( seq )
@@ -44,9 +44,9 @@ KShortcutMenu::KShortcutMenu( TQWidget* pParent, KAccelActions* pActions, KKeySe
insertItem( pTitle );
}
-bool KShortcutMenu::insertAction( uint iAction, KKeySequence seq )
+bool TDEShortcutMenu::insertAction( uint iAction, KKeySequence seq )
{
- KAccelAction* pAction = m_pActions->actionPtr( iAction );
+ TDEAccelAction* pAction = m_pActions->actionPtr( iAction );
if( pAction ) {
insertItem( "", iAction );
@@ -57,14 +57,14 @@ bool KShortcutMenu::insertAction( uint iAction, KKeySequence seq )
}
-void KShortcutMenu::updateShortcuts()
+void TDEShortcutMenu::updateShortcuts()
{
pTitle->setText( m_seq.toString() + ",..." );
for( uint iItem = 1; iItem < count(); iItem++ ) {
int iAction = idAt( iItem );
if( iAction >= 0 ) {
- KAccelAction* pAction = m_pActions->actionPtr( iAction );
+ TDEAccelAction* pAction = m_pActions->actionPtr( iAction );
if( pAction ) {
KKeySequence seq = m_seqs[iItem];
TQString sSeq = seq.key(m_seq.count()).toString();
@@ -78,7 +78,7 @@ void KShortcutMenu::updateShortcuts()
}
}
-void KShortcutMenu::keyPressEvent( TQKeyEvent* pEvent )
+void TDEShortcutMenu::keyPressEvent( TQKeyEvent* pEvent )
{
kdDebug() << "keypress; " << pEvent->key() << endl;
KKey key( pEvent );
@@ -117,7 +117,7 @@ void KShortcutMenu::keyPressEvent( TQKeyEvent* pEvent )
}
}
-int KShortcutMenu::searchForKey( KKey key )
+int TDEShortcutMenu::searchForKey( KKey key )
{
int iItemFound = -1; // -1 indicates no match
uint iKey = m_seq.count();
@@ -138,7 +138,7 @@ int KShortcutMenu::searchForKey( KKey key )
return iItemFound;
}
-void KShortcutMenu::keepItemsMatching( KKey key )
+void TDEShortcutMenu::keepItemsMatching( KKey key )
{
kdDebug(125) << "MyAccel::keepItemsMatching( " << key.toStringInternal() << " )" << endl;
diff --git a/tdecore/kshortcutmenu.h b/tdecore/kshortcutmenu.h
index 2c682342..6e01cdd9 100644
--- a/tdecore/kshortcutmenu.h
+++ b/tdecore/kshortcutmenu.h
@@ -27,16 +27,16 @@
class TQLabel;
-class KAccelActions;
+class TDEAccelActions;
/**
* @internal
*/
-class TDECORE_EXPORT KShortcutMenu : public TQPopupMenu
+class TDECORE_EXPORT TDEShortcutMenu : public TQPopupMenu
{
Q_OBJECT
public:
- KShortcutMenu( TQWidget* pParent, KAccelActions* pActions, KKeySequence seq );
+ TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq );
bool insertAction( uint iAction, KKeySequence seq );
@@ -52,7 +52,7 @@ class TDECORE_EXPORT KShortcutMenu : public TQPopupMenu
private:
typedef TQMap<uint, KKeySequence> IndexToKKeySequence;
- KAccelActions* m_pActions;
+ TDEAccelActions* m_pActions;
KKeySequence m_seq;
TQLabel* pTitle;
IndexToKKeySequence m_seqs;
diff --git a/tdecore/kstdaccel.cpp b/tdecore/kstdaccel.cpp
index afc49aac..ac1381c8 100644
--- a/tdecore/kstdaccel.cpp
+++ b/tdecore/kstdaccel.cpp
@@ -30,84 +30,84 @@
#include <kshortcut.h>
#include <kshortcutlist.h>
-namespace KStdAccel
+namespace TDEStdAccel
{
-struct KStdAccelInfo
+struct TDEStdAccelInfo
{
StdAccel id;
const char* psName;
const char* psDesc;
int cutDefault, cutDefault4, cutDefault3B, cutDefault4B;
- KShortcut cut;
+ TDEShortcut cut;
bool bInitialized;
};
-/** Array of predefined KStdAccelInfo objects, which cover all
+/** Array of predefined TDEStdAccelInfo objects, which cover all
the "standard" accelerators. Each enum value from StdAccel
should appear in this table.
*/
-static KStdAccelInfo g_infoStdAccel[] =
+static TDEStdAccelInfo g_infoStdAccel[] =
{
- {AccelNone, "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, KShortcut(), false },
- { Open, I18N_NOOP("Open"), 0, Qt::CTRL+Qt::Key_O, 0, 0, 0, KShortcut(), false },
- { New, I18N_NOOP("New"), 0, Qt::CTRL+Qt::Key_N, 0, 0, 0, KShortcut(), false },
- { Close, I18N_NOOP("Close"), 0, Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, KShortcut(), false },
- { Save, I18N_NOOP("Save"), 0, Qt::CTRL+Qt::Key_S, 0, 0, 0, KShortcut(), false },
- { Print, I18N_NOOP("Print"), 0, Qt::CTRL+Qt::Key_P, 0, 0, 0, KShortcut(), false },
- { Quit, I18N_NOOP("Quit"), 0, Qt::CTRL+Qt::Key_Q, 0, 0, 0, KShortcut(), false },
- {AccelNone, "Group:Edit", I18N_NOOP("Edit"), 0, 0, 0, 0, KShortcut(), false },
- { Undo, I18N_NOOP("Undo"), 0, Qt::CTRL+Qt::Key_Z, 0, 0, 0, KShortcut(), false },
- { Redo, I18N_NOOP("Redo"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Z, 0, 0, 0, KShortcut(), false },
- { Cut, I18N_NOOP("Cut"), 0, Qt::CTRL+Qt::Key_X, 0, Qt::SHIFT+Qt::Key_Delete, 0, KShortcut(), false },
- { Copy, I18N_NOOP("Copy"), 0, Qt::CTRL+Qt::Key_C, 0, Qt::CTRL+Qt::Key_Insert, 0, KShortcut(), false },
- { Paste, I18N_NOOP("Paste"), 0, Qt::CTRL+Qt::Key_V, 0, Qt::SHIFT+Qt::Key_Insert, 0, KShortcut(), false },
- { PasteSelection, I18N_NOOP("Paste Selection"), 0, 0, 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, 0, KShortcut(), false },
- { SelectAll, "SelectAll", I18N_NOOP("Select All"), Qt::CTRL+Qt::Key_A, 0, 0, 0, KShortcut(), false },
- { Deselect, I18N_NOOP("Deselect"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_A, 0, 0, 0, KShortcut(), false },
- { DeleteWordBack, "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), Qt::CTRL+Qt::Key_Backspace, 0, 0, 0, KShortcut(), false },
- { DeleteWordForward, "DeleteWordForward", I18N_NOOP("Delete Word Forward"), Qt::CTRL+Qt::Key_Delete, 0, 0, 0, KShortcut(), false },
- { Find, I18N_NOOP("Find"), 0, Qt::CTRL+Qt::Key_F, 0, 0, 0, KShortcut(), false },
- { FindNext, "FindNext", I18N_NOOP("Find Next"), Qt::Key_F3, 0, 0, 0, KShortcut(), false },
- { FindPrev, "FindPrev", I18N_NOOP("Find Prev"), Qt::SHIFT+Qt::Key_F3, 0, 0, 0, KShortcut(), false },
- { Replace, I18N_NOOP("Replace"), 0, Qt::CTRL+Qt::Key_R, 0, 0, 0, KShortcut(), false },
- {AccelNone, "Group:Navigation", I18N_NOOP("Navigation"), 0, 0, 0, 0, KShortcut(), false },
- { Home, I18N_NOOP2("Opposite to End","Home"), 0, Qt::CTRL+Qt::Key_Home, 0, Qt::Key_HomePage, 0, KShortcut(), false },
- { End, I18N_NOOP("End"), 0, Qt::CTRL+Qt::Key_End, 0, 0, 0, KShortcut(), false },
- { BeginningOfLine, "BeginningOfLine", I18N_NOOP("Beginning of Line"), Qt::Key_Home, 0, 0, 0, KShortcut(), false},
- { EndOfLine, "EndOfLine", I18N_NOOP("End of Line"), Qt::Key_End, 0, 0, 0, KShortcut(), false},
- { Prior, I18N_NOOP("Prior"), 0, TQt::Key_Prior, 0, 0, 0, KShortcut(), false },
- { Next, I18N_NOOP2("Opposite to Prior","Next"), 0, TQt::Key_Next, 0, 0, 0, KShortcut(), false },
- { GotoLine, "GotoLine", I18N_NOOP("Go to Line"), Qt::CTRL+Qt::Key_G, 0, 0, 0, KShortcut(), false },
- { AddBookmark, "AddBookmark", I18N_NOOP("Add Bookmark"), Qt::CTRL+Qt::Key_B, 0, 0, 0, KShortcut(), false },
- { ZoomIn, "ZoomIn", I18N_NOOP("Zoom In"), Qt::CTRL+Qt::Key_Plus, 0, 0, 0, KShortcut(), false },
- { ZoomOut, "ZoomOut", I18N_NOOP("Zoom Out"), Qt::CTRL+Qt::Key_Minus, 0, 0, 0, KShortcut(), false },
- { Up, I18N_NOOP("Up"), 0, Qt::ALT+Qt::Key_Up, 0, 0, 0, KShortcut(), false },
- { Back, I18N_NOOP("Back"), 0, Qt::ALT+Qt::Key_Left, 0, Qt::Key_Back, 0, KShortcut(), false },
- { Forward, I18N_NOOP("Forward"), 0, Qt::ALT+Qt::Key_Right, 0, Qt::Key_Forward, 0, KShortcut(), false },
- { Reload, I18N_NOOP("Reload"), 0, Qt::Key_F5, 0, Qt::Key_Refresh, 0, KShortcut(), false },
- { PopupMenuContext, "PopupMenuContext", I18N_NOOP("Popup Menu Context"), Qt::Key_Menu, 0, 0, 0, KShortcut(), false },
- { ShowMenubar, "ShowMenubar", I18N_NOOP("Show Menu Bar"), Qt::CTRL+Qt::Key_M, 0, 0, 0, KShortcut(), false },
- { BackwardWord, "BackwardWord", I18N_NOOP("Backward Word"), Qt::CTRL+Qt::Key_Left, 0, 0, 0, KShortcut(), false },
- { ForwardWord, "ForwardWord", I18N_NOOP("Forward Word"), Qt::CTRL+Qt::Key_Right, 0, 0, 0, KShortcut(), false },
- { TabNext, I18N_NOOP("Activate Next Tab"), 0, Qt::CTRL+Qt::Key_Period, 0, Qt::CTRL+Qt::Key_BracketRight, 0, KShortcut(), false },
- { TabPrev, I18N_NOOP("Activate Previous Tab"), 0, Qt::CTRL+Qt::Key_Comma, 0, Qt::CTRL+Qt::Key_BracketLeft, 0, KShortcut(), false },
- { FullScreen, "FullScreen", I18N_NOOP("Full Screen Mode"), Qt::CTRL+Qt::SHIFT+Qt::Key_F, 0, 0, 0, KShortcut(), false },
- {AccelNone, "Group:Help", I18N_NOOP("Help"), 0, 0, 0, 0, KShortcut(), false },
- { Help, I18N_NOOP("Help"), 0, Qt::Key_F1, 0, 0, 0, KShortcut(), false },
- { WhatsThis, "WhatsThis", I18N_NOOP("What's This"), Qt::SHIFT+Qt::Key_F1, 0, 0, 0, KShortcut(), false },
- {AccelNone, "Group:TextCompletion", I18N_NOOP("Text Completion"), 0, 0, 0, 0, KShortcut(), false },
- { TextCompletion, "TextCompletion", I18N_NOOP("Text Completion"), Qt::CTRL+Qt::Key_E, 0, 0, 0, KShortcut(), false },
- { PrevCompletion, "PrevCompletion", I18N_NOOP("Previous Completion Match"), Qt::CTRL+Qt::Key_Up, 0, 0, 0, KShortcut(), false },
- { NextCompletion, "NextCompletion", I18N_NOOP("Next Completion Match"), Qt::CTRL+Qt::Key_Down, 0, 0, 0, KShortcut(), false },
- { SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), Qt::CTRL+Qt::Key_T, 0, 0, 0, KShortcut(), false },
- { RotateUp, "RotateUp", I18N_NOOP("Previous Item in List"), Qt::Key_Up, 0, 0, 0, KShortcut(), false },
- { RotateDown, "RotateDown", I18N_NOOP("Next Item in List"), Qt::Key_Down, 0, 0, 0, KShortcut(), false },
- { AccelNone, 0, 0, 0, 0, 0, 0, KShortcut(), false }
+ {AccelNone, "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, TDEShortcut(), false },
+ { Open, I18N_NOOP("Open"), 0, Qt::CTRL+Qt::Key_O, 0, 0, 0, TDEShortcut(), false },
+ { New, I18N_NOOP("New"), 0, Qt::CTRL+Qt::Key_N, 0, 0, 0, TDEShortcut(), false },
+ { Close, I18N_NOOP("Close"), 0, Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, TDEShortcut(), false },
+ { Save, I18N_NOOP("Save"), 0, Qt::CTRL+Qt::Key_S, 0, 0, 0, TDEShortcut(), false },
+ { Print, I18N_NOOP("Print"), 0, Qt::CTRL+Qt::Key_P, 0, 0, 0, TDEShortcut(), false },
+ { Quit, I18N_NOOP("Quit"), 0, Qt::CTRL+Qt::Key_Q, 0, 0, 0, TDEShortcut(), false },
+ {AccelNone, "Group:Edit", I18N_NOOP("Edit"), 0, 0, 0, 0, TDEShortcut(), false },
+ { Undo, I18N_NOOP("Undo"), 0, Qt::CTRL+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false },
+ { Redo, I18N_NOOP("Redo"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false },
+ { Cut, I18N_NOOP("Cut"), 0, Qt::CTRL+Qt::Key_X, 0, Qt::SHIFT+Qt::Key_Delete, 0, TDEShortcut(), false },
+ { Copy, I18N_NOOP("Copy"), 0, Qt::CTRL+Qt::Key_C, 0, Qt::CTRL+Qt::Key_Insert, 0, TDEShortcut(), false },
+ { Paste, I18N_NOOP("Paste"), 0, Qt::CTRL+Qt::Key_V, 0, Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false },
+ { PasteSelection, I18N_NOOP("Paste Selection"), 0, 0, 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false },
+ { SelectAll, "SelectAll", I18N_NOOP("Select All"), Qt::CTRL+Qt::Key_A, 0, 0, 0, TDEShortcut(), false },
+ { Deselect, I18N_NOOP("Deselect"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_A, 0, 0, 0, TDEShortcut(), false },
+ { DeleteWordBack, "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), Qt::CTRL+Qt::Key_Backspace, 0, 0, 0, TDEShortcut(), false },
+ { DeleteWordForward, "DeleteWordForward", I18N_NOOP("Delete Word Forward"), Qt::CTRL+Qt::Key_Delete, 0, 0, 0, TDEShortcut(), false },
+ { Find, I18N_NOOP("Find"), 0, Qt::CTRL+Qt::Key_F, 0, 0, 0, TDEShortcut(), false },
+ { FindNext, "FindNext", I18N_NOOP("Find Next"), Qt::Key_F3, 0, 0, 0, TDEShortcut(), false },
+ { FindPrev, "FindPrev", I18N_NOOP("Find Prev"), Qt::SHIFT+Qt::Key_F3, 0, 0, 0, TDEShortcut(), false },
+ { Replace, I18N_NOOP("Replace"), 0, Qt::CTRL+Qt::Key_R, 0, 0, 0, TDEShortcut(), false },
+ {AccelNone, "Group:Navigation", I18N_NOOP("Navigation"), 0, 0, 0, 0, TDEShortcut(), false },
+ { Home, I18N_NOOP2("Opposite to End","Home"), 0, Qt::CTRL+Qt::Key_Home, 0, Qt::Key_HomePage, 0, TDEShortcut(), false },
+ { End, I18N_NOOP("End"), 0, Qt::CTRL+Qt::Key_End, 0, 0, 0, TDEShortcut(), false },
+ { BeginningOfLine, "BeginningOfLine", I18N_NOOP("Beginning of Line"), Qt::Key_Home, 0, 0, 0, TDEShortcut(), false},
+ { EndOfLine, "EndOfLine", I18N_NOOP("End of Line"), Qt::Key_End, 0, 0, 0, TDEShortcut(), false},
+ { Prior, I18N_NOOP("Prior"), 0, TQt::Key_Prior, 0, 0, 0, TDEShortcut(), false },
+ { Next, I18N_NOOP2("Opposite to Prior","Next"), 0, TQt::Key_Next, 0, 0, 0, TDEShortcut(), false },
+ { GotoLine, "GotoLine", I18N_NOOP("Go to Line"), Qt::CTRL+Qt::Key_G, 0, 0, 0, TDEShortcut(), false },
+ { AddBookmark, "AddBookmark", I18N_NOOP("Add Bookmark"), Qt::CTRL+Qt::Key_B, 0, 0, 0, TDEShortcut(), false },
+ { ZoomIn, "ZoomIn", I18N_NOOP("Zoom In"), Qt::CTRL+Qt::Key_Plus, 0, 0, 0, TDEShortcut(), false },
+ { ZoomOut, "ZoomOut", I18N_NOOP("Zoom Out"), Qt::CTRL+Qt::Key_Minus, 0, 0, 0, TDEShortcut(), false },
+ { Up, I18N_NOOP("Up"), 0, Qt::ALT+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false },
+ { Back, I18N_NOOP("Back"), 0, Qt::ALT+Qt::Key_Left, 0, Qt::Key_Back, 0, TDEShortcut(), false },
+ { Forward, I18N_NOOP("Forward"), 0, Qt::ALT+Qt::Key_Right, 0, Qt::Key_Forward, 0, TDEShortcut(), false },
+ { Reload, I18N_NOOP("Reload"), 0, Qt::Key_F5, 0, Qt::Key_Refresh, 0, TDEShortcut(), false },
+ { PopupMenuContext, "PopupMenuContext", I18N_NOOP("Popup Menu Context"), Qt::Key_Menu, 0, 0, 0, TDEShortcut(), false },
+ { ShowMenubar, "ShowMenubar", I18N_NOOP("Show Menu Bar"), Qt::CTRL+Qt::Key_M, 0, 0, 0, TDEShortcut(), false },
+ { BackwardWord, "BackwardWord", I18N_NOOP("Backward Word"), Qt::CTRL+Qt::Key_Left, 0, 0, 0, TDEShortcut(), false },
+ { ForwardWord, "ForwardWord", I18N_NOOP("Forward Word"), Qt::CTRL+Qt::Key_Right, 0, 0, 0, TDEShortcut(), false },
+ { TabNext, I18N_NOOP("Activate Next Tab"), 0, Qt::CTRL+Qt::Key_Period, 0, Qt::CTRL+Qt::Key_BracketRight, 0, TDEShortcut(), false },
+ { TabPrev, I18N_NOOP("Activate Previous Tab"), 0, Qt::CTRL+Qt::Key_Comma, 0, Qt::CTRL+Qt::Key_BracketLeft, 0, TDEShortcut(), false },
+ { FullScreen, "FullScreen", I18N_NOOP("Full Screen Mode"), Qt::CTRL+Qt::SHIFT+Qt::Key_F, 0, 0, 0, TDEShortcut(), false },
+ {AccelNone, "Group:Help", I18N_NOOP("Help"), 0, 0, 0, 0, TDEShortcut(), false },
+ { Help, I18N_NOOP("Help"), 0, Qt::Key_F1, 0, 0, 0, TDEShortcut(), false },
+ { WhatsThis, "WhatsThis", I18N_NOOP("What's This"), Qt::SHIFT+Qt::Key_F1, 0, 0, 0, TDEShortcut(), false },
+ {AccelNone, "Group:TextCompletion", I18N_NOOP("Text Completion"), 0, 0, 0, 0, TDEShortcut(), false },
+ { TextCompletion, "TextCompletion", I18N_NOOP("Text Completion"), Qt::CTRL+Qt::Key_E, 0, 0, 0, TDEShortcut(), false },
+ { PrevCompletion, "PrevCompletion", I18N_NOOP("Previous Completion Match"), Qt::CTRL+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false },
+ { NextCompletion, "NextCompletion", I18N_NOOP("Next Completion Match"), Qt::CTRL+Qt::Key_Down, 0, 0, 0, TDEShortcut(), false },
+ { SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), Qt::CTRL+Qt::Key_T, 0, 0, 0, TDEShortcut(), false },
+ { RotateUp, "RotateUp", I18N_NOOP("Previous Item in List"), Qt::Key_Up, 0, 0, 0, TDEShortcut(), false },
+ { RotateDown, "RotateDown", I18N_NOOP("Next Item in List"), Qt::Key_Down, 0, 0, 0, TDEShortcut(), false },
+ { AccelNone, 0, 0, 0, 0, 0, 0, TDEShortcut(), false }
};
-/** Search for the KStdAccelInfo object associated with the given @p id. */
-static KStdAccelInfo* infoPtr( StdAccel id )
+/** Search for the TDEStdAccelInfo object associated with the given @p id. */
+static TDEStdAccelInfo* infoPtr( StdAccel id )
{
if( id != AccelNone ) {
// Linear search. Changing the data structure doesn't seem possible
@@ -127,10 +127,10 @@ static KStdAccelInfo* infoPtr( StdAccel id )
static void initialize( StdAccel id )
{
TDEConfigGroupSaver saver( TDEGlobal::config(), "Shortcuts" );
- KStdAccelInfo* pInfo = infoPtr( id );
+ TDEStdAccelInfo* pInfo = infoPtr( id );
if( !pInfo ) {
- kdWarning(125) << "KStdAccel: id not found!" << endl; // -- ellis
+ kdWarning(125) << "TDEStdAccel: id not found!" << endl; // -- ellis
return;
}
@@ -147,7 +147,7 @@ static void initialize( StdAccel id )
TQString name( StdAccel id )
{
- KStdAccelInfo* pInfo = infoPtr( id );
+ TDEStdAccelInfo* pInfo = infoPtr( id );
if( !pInfo )
return TQString::null;
return pInfo->psName;
@@ -155,27 +155,27 @@ TQString name( StdAccel id )
TQString label( StdAccel id )
{
- KStdAccelInfo* pInfo = infoPtr( id );
+ TDEStdAccelInfo* pInfo = infoPtr( id );
if( !pInfo )
return TQString::null;
return i18n((pInfo->psDesc) ? pInfo->psDesc : pInfo->psName);
}
-// TODO: Add psWhatsThis entry to KStdAccelInfo
+// TODO: Add psWhatsThis entry to TDEStdAccelInfo
TQString whatsThis( StdAccel /*id*/ )
{
-// KStdAccelInfo* pInfo = infoPtr( id );
+// TDEStdAccelInfo* pInfo = infoPtr( id );
// if( pInfo && pInfo->psWhatsThis )
// return i18n(pInfo->psWhatsThis);
// else
return TQString::null;
}
-const KShortcut& shortcut( StdAccel id )
+const TDEShortcut& shortcut( StdAccel id )
{
- KStdAccelInfo* pInfo = infoPtr( id );
+ TDEStdAccelInfo* pInfo = infoPtr( id );
if( !pInfo )
- return KShortcut::null();
+ return TDEShortcut::null();
if( !pInfo->bInitialized )
initialize( id );
@@ -199,17 +199,17 @@ StdAccel findStdAccel( const KKeySequence& seq )
return AccelNone;
}
-KShortcut shortcutDefault( StdAccel id )
+TDEShortcut shortcutDefault( StdAccel id )
{
- return (KAccelAction::useFourModifierKeys())
+ return (TDEAccelAction::useFourModifierKeys())
? shortcutDefault4(id) : shortcutDefault3(id);
}
-KShortcut shortcutDefault3( StdAccel id )
+TDEShortcut shortcutDefault3( StdAccel id )
{
- KShortcut cut;
+ TDEShortcut cut;
- KStdAccelInfo* pInfo = infoPtr( id );
+ TDEStdAccelInfo* pInfo = infoPtr( id );
if( pInfo ) {
if( pInfo->cutDefault )
cut.init( pInfo->cutDefault );
@@ -222,13 +222,13 @@ KShortcut shortcutDefault3( StdAccel id )
return cut;
}
-KShortcut shortcutDefault4( StdAccel id )
+TDEShortcut shortcutDefault4( StdAccel id )
{
- KShortcut cut;
+ TDEShortcut cut;
- KStdAccelInfo* pInfo = infoPtr( id );
+ TDEStdAccelInfo* pInfo = infoPtr( id );
if( pInfo ) {
- KStdAccelInfo& info = *pInfo;
+ TDEStdAccelInfo& info = *pInfo;
KKeySequence key2;
cut.init( (info.cutDefault4) ?
@@ -247,13 +247,13 @@ KShortcut shortcutDefault4( StdAccel id )
}
#if 0 // unused
-void createAccelActions( KAccelActions& actions )
+void createAccelActions( TDEAccelActions& actions )
{
actions.clear();
for( uint i = 0; g_infoStdAccel[i].psName != 0; i++ ) {
StdAccel id = g_infoStdAccel[i].id;
- KStdAccelInfo* pInfo = &g_infoStdAccel[i];
+ TDEStdAccelInfo* pInfo = &g_infoStdAccel[i];
if( id != AccelNone ) {
actions.insert( pInfo->psName,
@@ -267,54 +267,54 @@ void createAccelActions( KAccelActions& actions )
}
#endif
-const KShortcut& open() { return shortcut( Open ); }
-const KShortcut& openNew() { return shortcut( New ); }
-const KShortcut& close() { return shortcut( Close ); }
-const KShortcut& save() { return shortcut( Save ); }
-const KShortcut& print() { return shortcut( Print ); }
-const KShortcut& quit() { return shortcut( Quit ); }
-const KShortcut& cut() { return shortcut( Cut ); }
-const KShortcut& copy() { return shortcut( Copy ); }
-const KShortcut& paste() { return shortcut( Paste ); }
-const KShortcut& pasteSelection() { return shortcut( PasteSelection ); }
-const KShortcut& deleteWordBack() { return shortcut( DeleteWordBack ); }
-const KShortcut& deleteWordForward() { return shortcut( DeleteWordForward ); }
-const KShortcut& undo() { return shortcut( Undo ); }
-const KShortcut& redo() { return shortcut( Redo ); }
-const KShortcut& find() { return shortcut( Find ); }
-const KShortcut& findNext() { return shortcut( FindNext ); }
-const KShortcut& findPrev() { return shortcut( FindPrev ); }
-const KShortcut& replace() { return shortcut( Replace ); }
-const KShortcut& home() { return shortcut( Home ); }
-const KShortcut& end() { return shortcut( End ); }
-const KShortcut& beginningOfLine() { return shortcut( BeginningOfLine ); }
-const KShortcut& endOfLine() { return shortcut( EndOfLine ); }
-const KShortcut& prior() { return shortcut( Prior ); }
-const KShortcut& next() { return shortcut( Next ); }
-const KShortcut& backwardWord() { return shortcut( BackwardWord ); }
-const KShortcut& forwardWord() { return shortcut( ForwardWord ); }
-const KShortcut& gotoLine() { return shortcut( GotoLine ); }
-const KShortcut& addBookmark() { return shortcut( AddBookmark ); }
-const KShortcut& tabNext() { return shortcut( TabNext ); }
-const KShortcut& tabPrev() { return shortcut( TabPrev ); }
-const KShortcut& fullScreen() { return shortcut( FullScreen ); }
-const KShortcut& zoomIn() { return shortcut( ZoomIn ); }
-const KShortcut& zoomOut() { return shortcut( ZoomOut ); }
-const KShortcut& help() { return shortcut( Help ); }
-const KShortcut& completion() { return shortcut( TextCompletion ); }
-const KShortcut& prevCompletion() { return shortcut( PrevCompletion ); }
-const KShortcut& nextCompletion() { return shortcut( NextCompletion ); }
-const KShortcut& rotateUp() { return shortcut( RotateUp ); }
-const KShortcut& rotateDown() { return shortcut( RotateDown ); }
-const KShortcut& substringCompletion() { return shortcut( SubstringCompletion ); }
-const KShortcut& popupMenuContext() { return shortcut( PopupMenuContext ); }
-const KShortcut& whatsThis() { return shortcut( WhatsThis ); }
-const KShortcut& reload() { return shortcut( Reload ); }
-const KShortcut& selectAll() { return shortcut( SelectAll ); }
-const KShortcut& up() { return shortcut( Up ); }
-const KShortcut& back() { return shortcut( Back ); }
-const KShortcut& forward() { return shortcut( Forward ); }
-const KShortcut& showMenubar() { return shortcut( ShowMenubar ); }
+const TDEShortcut& open() { return shortcut( Open ); }
+const TDEShortcut& openNew() { return shortcut( New ); }
+const TDEShortcut& close() { return shortcut( Close ); }
+const TDEShortcut& save() { return shortcut( Save ); }
+const TDEShortcut& print() { return shortcut( Print ); }
+const TDEShortcut& quit() { return shortcut( Quit ); }
+const TDEShortcut& cut() { return shortcut( Cut ); }
+const TDEShortcut& copy() { return shortcut( Copy ); }
+const TDEShortcut& paste() { return shortcut( Paste ); }
+const TDEShortcut& pasteSelection() { return shortcut( PasteSelection ); }
+const TDEShortcut& deleteWordBack() { return shortcut( DeleteWordBack ); }
+const TDEShortcut& deleteWordForward() { return shortcut( DeleteWordForward ); }
+const TDEShortcut& undo() { return shortcut( Undo ); }
+const TDEShortcut& redo() { return shortcut( Redo ); }
+const TDEShortcut& find() { return shortcut( Find ); }
+const TDEShortcut& findNext() { return shortcut( FindNext ); }
+const TDEShortcut& findPrev() { return shortcut( FindPrev ); }
+const TDEShortcut& replace() { return shortcut( Replace ); }
+const TDEShortcut& home() { return shortcut( Home ); }
+const TDEShortcut& end() { return shortcut( End ); }
+const TDEShortcut& beginningOfLine() { return shortcut( BeginningOfLine ); }
+const TDEShortcut& endOfLine() { return shortcut( EndOfLine ); }
+const TDEShortcut& prior() { return shortcut( Prior ); }
+const TDEShortcut& next() { return shortcut( Next ); }
+const TDEShortcut& backwardWord() { return shortcut( BackwardWord ); }
+const TDEShortcut& forwardWord() { return shortcut( ForwardWord ); }
+const TDEShortcut& gotoLine() { return shortcut( GotoLine ); }
+const TDEShortcut& addBookmark() { return shortcut( AddBookmark ); }
+const TDEShortcut& tabNext() { return shortcut( TabNext ); }
+const TDEShortcut& tabPrev() { return shortcut( TabPrev ); }
+const TDEShortcut& fullScreen() { return shortcut( FullScreen ); }
+const TDEShortcut& zoomIn() { return shortcut( ZoomIn ); }
+const TDEShortcut& zoomOut() { return shortcut( ZoomOut ); }
+const TDEShortcut& help() { return shortcut( Help ); }
+const TDEShortcut& completion() { return shortcut( TextCompletion ); }
+const TDEShortcut& prevCompletion() { return shortcut( PrevCompletion ); }
+const TDEShortcut& nextCompletion() { return shortcut( NextCompletion ); }
+const TDEShortcut& rotateUp() { return shortcut( RotateUp ); }
+const TDEShortcut& rotateDown() { return shortcut( RotateDown ); }
+const TDEShortcut& substringCompletion() { return shortcut( SubstringCompletion ); }
+const TDEShortcut& popupMenuContext() { return shortcut( PopupMenuContext ); }
+const TDEShortcut& whatsThis() { return shortcut( WhatsThis ); }
+const TDEShortcut& reload() { return shortcut( Reload ); }
+const TDEShortcut& selectAll() { return shortcut( SelectAll ); }
+const TDEShortcut& up() { return shortcut( Up ); }
+const TDEShortcut& back() { return shortcut( Back ); }
+const TDEShortcut& forward() { return shortcut( Forward ); }
+const TDEShortcut& showMenubar() { return shortcut( ShowMenubar ); }
//---------------------------------------------------------------------
// ShortcutList
@@ -345,24 +345,24 @@ TQString ShortcutList::label( uint i ) const
TQString ShortcutList::whatsThis( uint ) const
{ return TQString::null; }
-const KShortcut& ShortcutList::shortcut( uint i ) const
+const TDEShortcut& ShortcutList::shortcut( uint i ) const
{
if( !g_infoStdAccel[i].bInitialized )
initialize( g_infoStdAccel[i].id );
return g_infoStdAccel[i].cut;
}
-const KShortcut& ShortcutList::shortcutDefault( uint i ) const
+const TDEShortcut& ShortcutList::shortcutDefault( uint i ) const
{
- static KShortcut cut;
- cut = KStdAccel::shortcutDefault( g_infoStdAccel[i].id );
+ static TDEShortcut cut;
+ cut = TDEStdAccel::shortcutDefault( g_infoStdAccel[i].id );
return cut;
}
bool ShortcutList::isConfigurable( uint i ) const
{ return (g_infoStdAccel[i].id != AccelNone); }
-bool ShortcutList::setShortcut( uint i, const KShortcut& cut )
+bool ShortcutList::setShortcut( uint i, const TDEShortcut& cut )
{ g_infoStdAccel[i].cut = cut; return true; }
TQVariant ShortcutList::getOther( Other, uint ) const
diff --git a/tdecore/kstdaccel.h b/tdecore/kstdaccel.h
index 813255cc..58020467 100644
--- a/tdecore/kstdaccel.h
+++ b/tdecore/kstdaccel.h
@@ -25,20 +25,20 @@
#include "tdelibs_export.h"
class TQKeyEvent;
-class KAccelActions;
+class TDEAccelActions;
/**
- * \namespace KStdAccel
+ * \namespace TDEStdAccel
* Convenient methods for access to the common accelerator keys in
* the key configuration. These are the standard keybindings that should
* be used in all KDE applications. They will be configurable,
* so do not hardcode the default behavior.
*
* If you want real configurable keybindings in your applications,
- * please checkout the class KAccel in kaccel.h
- * @see KAccelShortcutList
+ * please checkout the class TDEAccel in kaccel.h
+ * @see TDEAccelShortcutList
*/
-namespace KStdAccel
+namespace TDEStdAccel
{
// Always add new std-accels to the end of this enum, never in the middle!
/**
@@ -87,7 +87,7 @@ namespace KStdAccel
* Returns the keybinding for @p accel.
* @param id the id of the accelerator
*/
- TDECORE_EXPORT const KShortcut& shortcut(StdAccel id);
+ TDECORE_EXPORT const TDEShortcut& shortcut(StdAccel id);
/**
* Returns a unique name for the given accel.
@@ -126,326 +126,326 @@ namespace KStdAccel
* @param id the id of the accelerator
* @return the default shortcut of the accelerator
*/
- TDECORE_EXPORT KShortcut shortcutDefault(StdAccel id);
+ TDECORE_EXPORT TDEShortcut shortcutDefault(StdAccel id);
/**
* Returns the hardcoded default 3 modifier shortcut for @p id.
* This does not take into account the user's configuration.
* @param id the id of the accelerator
* @return the default 3 modifier shortcut
*/
- TDECORE_EXPORT KShortcut shortcutDefault3(StdAccel id);
+ TDECORE_EXPORT TDEShortcut shortcutDefault3(StdAccel id);
/**
* Returns the hardcoded default 4 modifier shortcut for @p id.
* This does not take into account the user's configuration.
* @param id the id of the accelerator
* @return the default 4 modifier shortcut
*/
- TDECORE_EXPORT KShortcut shortcutDefault4(StdAccel id);
+ TDECORE_EXPORT TDEShortcut shortcutDefault4(StdAccel id);
/**
* Open file. Default: Ctrl-o
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& open();
+ TDECORE_EXPORT const TDEShortcut& open();
/**
* Create a new document (or whatever). Default: Ctrl-n
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& openNew();
+ TDECORE_EXPORT const TDEShortcut& openNew();
/**
* Close current document. Default: Ctrl-w
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& close();
+ TDECORE_EXPORT const TDEShortcut& close();
/**
* Save current document. Default: Ctrl-s
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& save();
+ TDECORE_EXPORT const TDEShortcut& save();
/**
* Print current document. Default: Ctrl-p
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& print();
+ TDECORE_EXPORT const TDEShortcut& print();
/**
* Quit the program. Default: Ctrl-q
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& quit();
+ TDECORE_EXPORT const TDEShortcut& quit();
/**
* Undo last operation. Default: Ctrl-z
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& undo();
+ TDECORE_EXPORT const TDEShortcut& undo();
/**
* Redo. Default: Shift-Ctrl-z
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& redo();
+ TDECORE_EXPORT const TDEShortcut& redo();
/**
* Cut selected area and store it in the clipboard. Default: Ctrl-x
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& cut();
+ TDECORE_EXPORT const TDEShortcut& cut();
/**
* Copy selected area into the clipboard. Default: Ctrl-c
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& copy();
+ TDECORE_EXPORT const TDEShortcut& copy();
/**
* Paste contents of clipboard at mouse/cursor position. Default: Ctrl-v
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& paste();
+ TDECORE_EXPORT const TDEShortcut& paste();
/**
* Paste the selection at mouse/cursor position. Default: Ctrl-Shift-Insert
* @return the shortcut of the standard accelerator
* @since 3.4
*/
- TDECORE_EXPORT const KShortcut& pasteSelection();
+ TDECORE_EXPORT const TDEShortcut& pasteSelection();
/**
* Reload. Default: Ctrl-A
* @return the shortcut of the standard accelerator
**/
- TDECORE_EXPORT const KShortcut& selectAll();
+ TDECORE_EXPORT const TDEShortcut& selectAll();
/**
* Delete a word back from mouse/cursor position. Default: Ctrl-Backspace
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& deleteWordBack();
+ TDECORE_EXPORT const TDEShortcut& deleteWordBack();
/**
* Delete a word forward from mouse/cursor position. Default: Ctrl-Delete
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& deleteWordForward();
+ TDECORE_EXPORT const TDEShortcut& deleteWordForward();
/**
* Find, search. Default: Ctrl-f
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& find();
+ TDECORE_EXPORT const TDEShortcut& find();
/**
* Find/search next. Default: F3
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& findNext();
+ TDECORE_EXPORT const TDEShortcut& findNext();
/**
* Find/search previous. Default: Shift-F3
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& findPrev();
+ TDECORE_EXPORT const TDEShortcut& findPrev();
/**
* Find and replace matches. Default: Ctrl-r
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& replace();
+ TDECORE_EXPORT const TDEShortcut& replace();
/**
* Zoom in. Default: Ctrl-Plus
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& zoomIn();
+ TDECORE_EXPORT const TDEShortcut& zoomIn();
/**
* Zoom out. Default: Ctrl-Minus
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& zoomOut();
+ TDECORE_EXPORT const TDEShortcut& zoomOut();
/**
* Toggle insert/overwrite (with visual feedback, e.g. in the statusbar). Default: Insert
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& insert();
+ TDECORE_EXPORT const TDEShortcut& insert();
/**
* Goto beginning of the document. Default: Ctrl-Home
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& home();
+ TDECORE_EXPORT const TDEShortcut& home();
/**
* Goto end of the document. Default: Ctrl-End
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& end();
+ TDECORE_EXPORT const TDEShortcut& end();
/**
* Goto beginning of current line. Default: Home
* @return the shortcut of the standard accelerator
* @since 3.3
*/
- TDECORE_EXPORT const KShortcut& beginningOfLine();
+ TDECORE_EXPORT const TDEShortcut& beginningOfLine();
/**
* Goto end of current line. Default: End
* @return the shortcut of the standard accelerator
* @since 3.3
*/
- TDECORE_EXPORT const KShortcut& endOfLine();
+ TDECORE_EXPORT const TDEShortcut& endOfLine();
/**
* Scroll up one page. Default: Prior
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& prior();
+ TDECORE_EXPORT const TDEShortcut& prior();
/**
* Scroll down one page. Default: Next
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& next();
+ TDECORE_EXPORT const TDEShortcut& next();
/**
* Go to line. Default: Ctrl+G
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& gotoLine();
+ TDECORE_EXPORT const TDEShortcut& gotoLine();
/**
* Add current page to bookmarks. Default: Ctrl+B
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& addBookmark();
+ TDECORE_EXPORT const TDEShortcut& addBookmark();
/**
* Next Tab. Default: Ctrl-<
* @return the shortcut of the standard accelerator
* @since 3.2
*/
- TDECORE_EXPORT const KShortcut& tabNext();
+ TDECORE_EXPORT const TDEShortcut& tabNext();
/**
* Previous Tab. Default: Ctrl->
* @return the shortcut of the standard accelerator
* @since 3.2
*/
- TDECORE_EXPORT const KShortcut& tabPrev();
+ TDECORE_EXPORT const TDEShortcut& tabPrev();
/**
* Full Screen Mode. Default: Ctrl+Shift+F
* @return the shortcut of the standard accelerator
* @since 3.2
*/
- TDECORE_EXPORT const KShortcut& fullScreen();
+ TDECORE_EXPORT const TDEShortcut& fullScreen();
/**
* Help the user in the current situation. Default: F1
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& help();
+ TDECORE_EXPORT const TDEShortcut& help();
/**
* Complete text in input widgets. Default Ctrl+E
* @return the shortcut of the standard accelerator
**/
- TDECORE_EXPORT const KShortcut& completion();
+ TDECORE_EXPORT const TDEShortcut& completion();
/**
* Iterate through a list when completion returns
* multiple items. Default: Ctrl+Up
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& prevCompletion();
+ TDECORE_EXPORT const TDEShortcut& prevCompletion();
/**
* Iterate through a list when completion returns
* multiple items. Default: Ctrl+Down
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& nextCompletion();
+ TDECORE_EXPORT const TDEShortcut& nextCompletion();
/**
* Find a string within another string or list of strings.
* Default: Ctrl-T
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& substringCompletion();
+ TDECORE_EXPORT const TDEShortcut& substringCompletion();
/**
* Help users iterate through a list of entries. Default: Up
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& rotateUp();
+ TDECORE_EXPORT const TDEShortcut& rotateUp();
/**
* Help users iterate through a list of entries. Default: Down
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& rotateDown();
+ TDECORE_EXPORT const TDEShortcut& rotateDown();
/**
* popup a context menu. Default: Menu
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& popupMenuContext();
+ TDECORE_EXPORT const TDEShortcut& popupMenuContext();
/**
* What's This button. Default: Shift+F1
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& whatsThis();
+ TDECORE_EXPORT const TDEShortcut& whatsThis();
/**
* Reload. Default: F5
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& reload();
+ TDECORE_EXPORT const TDEShortcut& reload();
/**
* Up. Default: Alt+Up
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& up();
+ TDECORE_EXPORT const TDEShortcut& up();
/**
* Back. Default: Alt+Left
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& back();
+ TDECORE_EXPORT const TDEShortcut& back();
/**
* Forward. Default: ALT+Right
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& forward();
+ TDECORE_EXPORT const TDEShortcut& forward();
/**
* BackwardWord. Default: Ctrl+Left
* @return the shortcut of the standard accelerator
* @since 3.3
*/
- TDECORE_EXPORT const KShortcut& backwardWord();
+ TDECORE_EXPORT const TDEShortcut& backwardWord();
/**
* ForwardWord. Default: Ctrl+Right
* @return the shortcut of the standard accelerator
* @since 3.3
*/
- TDECORE_EXPORT const KShortcut& forwardWord();
+ TDECORE_EXPORT const TDEShortcut& forwardWord();
/**
* Show Menu Bar. Default: Ctrl-M
* @return the shortcut of the standard accelerator
*/
- TDECORE_EXPORT const KShortcut& showMenubar();
+ TDECORE_EXPORT const TDEShortcut& showMenubar();
#if !defined(KDE_NO_COMPAT) && !defined(__KSTDACCEL_CPP_)
/**
diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index c488e43c..ab521868 100644
--- a/tdecore/tdeconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -95,9 +95,9 @@ void TDEConfigDialogManager::init(bool trackChanges)
// KDE
changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int)));
- changedMap.insert( "KFontCombo", TQT_SIGNAL(activated (int)));
- changedMap.insert( "KFontRequester", TQT_SIGNAL(fontSelected(const TQFont &)));
- changedMap.insert( "KFontChooser", TQT_SIGNAL(fontSelected(const TQFont &)));
+ changedMap.insert( "TDEFontCombo", TQT_SIGNAL(activated (int)));
+ changedMap.insert( "TDEFontRequester", TQT_SIGNAL(fontSelected(const TQFont &)));
+ changedMap.insert( "TDEFontChooser", TQT_SIGNAL(fontSelected(const TQFont &)));
changedMap.insert( "KHistoryCombo", TQT_SIGNAL(activated (int)));
changedMap.insert( "KColorButton", TQT_SIGNAL(changed(const TQColor &)));
@@ -105,7 +105,7 @@ void TDEConfigDialogManager::init(bool trackChanges)
changedMap.insert( "KDateWidget", TQT_SIGNAL(changed (TQDate)));
changedMap.insert( "KDateTimeWidget", TQT_SIGNAL(valueChanged (const TQDateTime &)));
changedMap.insert( "KEditListBox", TQT_SIGNAL(changed()));
- changedMap.insert( "KListBox", TQT_SIGNAL(selectionChanged()));
+ changedMap.insert( "TDEListBox", TQT_SIGNAL(selectionChanged()));
changedMap.insert( "KLineEdit", TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert( "KPasswordEdit", TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert( "KRestrictedLine", TQT_SIGNAL(textChanged(const TQString &)));
diff --git a/tdecore/tests/kstdacceltest.cpp b/tdecore/tests/kstdacceltest.cpp
index 4540e89d..a3e2d247 100644
--- a/tdecore/tests/kstdacceltest.cpp
+++ b/tdecore/tests/kstdacceltest.cpp
@@ -26,14 +26,14 @@ int main(int argc, char *argv[])
TDEApplication::disableAutoDcopRegistration();
TDEApplication app(argc,argv,"kstdacceltest",false,false);
- check( "shortcutDefault FullScreen", KStdAccel::shortcutDefault( KStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" );
- check( "shortcutDefault BeginningOfLine", KStdAccel::shortcutDefault( KStdAccel::BeginningOfLine ).toString(), "Home" );
- check( "shortcutDefault EndOfLine", KStdAccel::shortcutDefault( KStdAccel::EndOfLine ).toString(), "End" );
+ check( "shortcutDefault FullScreen", TDEStdAccel::shortcutDefault( TDEStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" );
+ check( "shortcutDefault BeginningOfLine", TDEStdAccel::shortcutDefault( TDEStdAccel::BeginningOfLine ).toString(), "Home" );
+ check( "shortcutDefault EndOfLine", TDEStdAccel::shortcutDefault( TDEStdAccel::EndOfLine ).toString(), "End" );
- check( "name BeginningOfLine", KStdAccel::name( KStdAccel::BeginningOfLine ), "BeginningOfLine" );
- check( "name EndOfLine", KStdAccel::name( KStdAccel::EndOfLine ), "EndOfLine" );
+ check( "name BeginningOfLine", TDEStdAccel::name( TDEStdAccel::BeginningOfLine ), "BeginningOfLine" );
+ check( "name EndOfLine", TDEStdAccel::name( TDEStdAccel::EndOfLine ), "EndOfLine" );
- check( "shortcut method", KStdAccel::shortcut( KStdAccel::ZoomIn ).toString(), KStdAccel::zoomIn().toString() );
+ check( "shortcut method", TDEStdAccel::shortcut( TDEStdAccel::ZoomIn ).toString(), TDEStdAccel::zoomIn().toString() );
return 0;
}
diff --git a/tdehtml/ChangeLog b/tdehtml/ChangeLog
index cf19f1b0..302c414d 100644
--- a/tdehtml/ChangeLog
+++ b/tdehtml/ChangeLog
@@ -810,7 +810,7 @@
2005-04-06 Lubos Lunak <l.lunak@kde.org>
- * tdehtmlview.{h,cpp}: Use KActions for type ahead find.
+ * tdehtmlview.{h,cpp}: Use TDEActions for type ahead find.
* tdehtml_part.{h,cpp}: ditto.
* tdehtml_part.{h,cpp}: Add Find Previous action.
* tdehtml_part.cpp (findTextNext): Fix changing direction while searching text.
diff --git a/tdehtml/domtreeview.cpp b/tdehtml/domtreeview.cpp
index 5bff83e7..c68eb200 100644
--- a/tdehtml/domtreeview.cpp
+++ b/tdehtml/domtreeview.cpp
@@ -19,7 +19,7 @@
#include "domtreeview.moc"
#include "xml/dom_nodeimpl.h"
-DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : KListView(parent, name)
+DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : TDEListView(parent, name)
{
setCaption(name);
setRootIsDecorated(true);
diff --git a/tdehtml/domtreeview.h b/tdehtml/domtreeview.h
index 93baa8f6..a0f5d942 100644
--- a/tdehtml/domtreeview.h
+++ b/tdehtml/domtreeview.h
@@ -24,7 +24,7 @@
#include <tqptrdict.h>
#include "dom/dom_core.h"
-class DOMTreeView : public KListView
+class DOMTreeView : public TDEListView
{
Q_OBJECT
public:
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index ec794b8d..ac78526a 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -347,7 +347,7 @@ void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
}
//-------------------------------------------------------------------------
KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
- : KMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger")
+ : TDEMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger")
{
m_breakpoints = 0;
m_breakpointCount = 0;
@@ -436,27 +436,27 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
vl->addWidget(hsplitter);
// actions
- KPopupMenu *debugMenu = new KPopupMenu(this);
+ TDEPopupMenu *debugMenu = new TDEPopupMenu(this);
menuBar()->insertItem("&Debug",debugMenu);
- m_actionCollection = new KActionCollection(this);
+ m_actionCollection = new TDEActionCollection(this);
m_actionCollection->setInstance(this);
// Venkman use F12, KDevelop F10
- KShortcut scNext = KShortcut(KKeySequence(KKey(Qt::Key_F12)));
+ TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(Qt::Key_F12)));
scNext.append(KKeySequence(KKey(Qt::Key_F10)));
- m_nextAction = new KAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
+ m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
m_actionCollection,"next");
- m_stepAction = new KAction(i18n("&Step"),"dbgstep",KShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
+ m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
m_actionCollection,"step");
// Venkman use F5, Kdevelop F9
- KShortcut scCont = KShortcut(KKeySequence(KKey(Qt::Key_F5)));
+ TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(Qt::Key_F5)));
scCont.append(KKeySequence(KKey(Qt::Key_F9)));
- m_continueAction = new KAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
+ m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
m_actionCollection,"cont");
- m_stopAction = new KAction(i18n("St&op"),"stop",KShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
+ m_stopAction = new TDEAction(i18n("St&op"),"stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
m_actionCollection,"stop");
- m_breakAction = new KAction(i18n("&Break at Next Statement"),"dbgrunto",KShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
+ m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
m_actionCollection,"breaknext");
diff --git a/tdehtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h
index dc2368ac..af205d65 100644
--- a/tdehtml/ecma/kjs_debugwin.h
+++ b/tdehtml/ecma/kjs_debugwin.h
@@ -43,8 +43,8 @@
class TQListBox;
class TQComboBox;
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
namespace KJS {
class FunctionImp;
@@ -157,7 +157,7 @@ namespace KJS {
*
* There is only one debug window per program. This can be obtained by calling #instance
*/
- class KJSDebugWin : public KMainWindow, public Debugger, public TDEInstance
+ class KJSDebugWin : public TDEMainWindow, public Debugger, public TDEInstance
{
Q_OBJECT
friend class SourceDisplay;
@@ -259,17 +259,17 @@ namespace KJS {
TQMap<int,SourceFragment*> m_sourceFragments; /* maps SourceId->SourceFragment */
TQPtrList<SourceFile> m_sourceSelFiles; /* maps combobox index->SourceFile */
- KActionCollection *m_actionCollection;
+ TDEActionCollection *m_actionCollection;
TQPixmap m_stopIcon;
TQPixmap m_emptyIcon;
SourceDisplay *m_sourceDisplay;
TQListBox *m_contextList;
- KAction *m_stepAction;
- KAction *m_nextAction;
- KAction *m_continueAction;
- KAction *m_stopAction;
- KAction *m_breakAction;
+ TDEAction *m_stepAction;
+ TDEAction *m_nextAction;
+ TDEAction *m_continueAction;
+ TDEAction *m_stopAction;
+ TDEAction *m_breakAction;
TQComboBox *m_sourceSel;
EvalMultiLineEdit *m_evalEdit;
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index b953f34f..3a014654 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -376,7 +376,7 @@ void KNSPluginWizard::initConfirmationPage()
m_confirmationVBox = new TQVBox(this);
new TQLabel(i18n("The following plugins are available."), m_confirmationVBox);
- m_pluginListView = new KListView(m_confirmationVBox);
+ m_pluginListView = new TDEListView(m_confirmationVBox);
m_pluginListView->addColumn(i18n("Name"));
m_pluginListView->setSelectionMode(TQListView::Single);
new TQLabel(i18n("Click on next to install the selected plugin."), m_confirmationVBox);
diff --git a/tdehtml/misc/knsplugininstaller.h b/tdehtml/misc/knsplugininstaller.h
index 24020246..f8caedf9 100644
--- a/tdehtml/misc/knsplugininstaller.h
+++ b/tdehtml/misc/knsplugininstaller.h
@@ -222,7 +222,7 @@ private:
TQWidget *m_finishWidget;
// plugin list
- KListView *m_pluginListView;
+ TDEListView *m_pluginListView;
// licence stuff
TQLabel *m_licencePageLabel;
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 5c8249b6..ce6debcb 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -311,7 +311,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi
: KLineEdit(parent, "__tdehtml"), m_input(input), m_view(view), m_spell(0)
{
setMouseTracking(true);
- KActionCollection *ac = new KActionCollection(this);
+ TDEActionCollection *ac = new TDEActionCollection(this);
m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac );
}
@@ -971,7 +971,7 @@ void RenderSelect::updateFromElement()
}
if (m_useListBox && oldMultiple != m_multiple) {
- static_cast<KListBox*>(m_widget)->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
+ static_cast<TDEListBox*>(m_widget)->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
}
m_selectionChanged = true;
m_optionsChanged = true;
@@ -985,7 +985,7 @@ void RenderSelect::updateFromElement()
int listIndex;
if(m_useListBox) {
- static_cast<KListBox*>(m_widget)->clear();
+ static_cast<TDEListBox*>(m_widget)->clear();
}
else
@@ -999,7 +999,7 @@ void RenderSelect::updateFromElement()
if(m_useListBox) {
TQListBoxText *item = new TQListBoxText(TQString(text.implementation()->s, text.implementation()->l));
- static_cast<KListBox*>(m_widget)
+ static_cast<TDEListBox*>(m_widget)
->insertItem(item, listIndex);
item->setSelectable(false);
}
@@ -1022,7 +1022,7 @@ void RenderSelect::updateFromElement()
}
if(m_useListBox) {
- KListBox *l = static_cast<KListBox*>(m_widget);
+ TDEListBox *l = static_cast<TDEListBox*>(m_widget);
l->insertItem(text, listIndex);
DOMString disabled = optElem->getAttribute(ATTR_DISABLED);
if (!disabled.isNull() && l->item( listIndex )) {
@@ -1083,7 +1083,7 @@ void RenderSelect::layout( )
// calculate size
if(m_useListBox) {
- KListBox* w = static_cast<KListBox*>(m_widget);
+ TDEListBox* w = static_cast<TDEListBox*>(m_widget);
TQListBoxItem* p = w->firstItem();
int width = 0;
@@ -1105,7 +1105,7 @@ void RenderSelect::layout( )
// the average of that is IMHO kMin(number of elements, 10)
// so I did that ;-)
if(size < 1)
- size = kMin(static_cast<KListBox*>(m_widget)->count(), 10u);
+ size = kMin(static_cast<TDEListBox*>(m_widget)->count(), 10u);
width += 2*w->frameWidth() + w->verticalScrollBar()->sizeHint().width();
height = size*height + 2*w->frameWidth();
@@ -1208,7 +1208,7 @@ void RenderSelect::slotSelectionChanged() // emitted by the listbox only
// again with updateSelection.
if ( listItems[i]->id() == ID_OPTION )
static_cast<HTMLOptionElementImpl*>( listItems[i] )
- ->m_selected = static_cast<KListBox*>( m_widget )->isSelected( i );
+ ->m_selected = static_cast<TDEListBox*>( m_widget )->isSelected( i );
ref();
element()->onChange();
@@ -1220,9 +1220,9 @@ void RenderSelect::setOptionsChanged(bool _optionsChanged)
m_optionsChanged = _optionsChanged;
}
-KListBox* RenderSelect::createListBox()
+TDEListBox* RenderSelect::createListBox()
{
- KListBox *lb = new KListBox(view()->viewport(), "__tdehtml");
+ TDEListBox *lb = new TDEListBox(view()->viewport(), "__tdehtml");
lb->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
// ### looks broken
//lb->setAutoMask(true);
@@ -1247,7 +1247,7 @@ void RenderSelect::updateSelection()
int i;
if (m_useListBox) {
// if multi-select, we select only the new selected index
- KListBox *listBox = static_cast<KListBox*>(m_widget);
+ TDEListBox *listBox = static_cast<TDEListBox*>(m_widget);
for (i = 0; i < int(listItems.size()); i++)
listBox->setSelected(i,listItems[i]->id() == ID_OPTION &&
static_cast<HTMLOptionElementImpl*>(listItems[i])->selected());
@@ -1294,7 +1294,7 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
setAutoMask(true);
setMouseTracking(true);
- KActionCollection *ac = new KActionCollection(this);
+ TDEActionCollection *ac = new TDEActionCollection(this);
m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), ac );
m_findNextAction = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), ac );
m_replaceAction = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), ac );
diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index d4508e6b..7543b9e9 100644
--- a/tdehtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -51,7 +51,7 @@ class KFindDialog;
class KReplaceDialog;
class KFind;
class KReplace;
-class KAction;
+class TDEAction;
class KURLRequester;
namespace DOM {
@@ -282,7 +282,7 @@ private:
DOM::HTMLInputElementImpl* m_input;
TDEHTMLView* m_view;
KSpell *m_spell;
- KAction *m_spellAction;
+ TDEAction *m_spellAction;
};
// -------------------------------------------------------------------------
@@ -399,7 +399,7 @@ public:
{ return static_cast<DOM::HTMLSelectElementImpl*>(RenderObject::element()); }
protected:
- KListBox *createListBox();
+ TDEListBox *createListBox();
ComboBoxWidget *createComboBox();
unsigned m_size;
@@ -440,9 +440,9 @@ private:
KFind *m_find;
KReplaceDialog *m_repDlg;
KReplace *m_replace;
- KAction *m_findAction;
- KAction *m_findNextAction;
- KAction *m_replaceAction;
+ TDEAction *m_findAction;
+ TDEAction *m_findNextAction;
+ TDEAction *m_replaceAction;
int m_findIndex, m_findPara;
int m_repIndex, m_repPara;
};
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 62c93079..72576e91 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -430,7 +430,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
if (hasSelection)
{
- KAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" );
+ TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" );
copyAction->setText(i18n("&Copy Text"));
copyAction->setEnabled(d->m_tdehtml->browserExtension()->isActionEnabled( "copy" ));
actionCollection()->insert( tdehtml->actionCollection()->action( "selectAll" ) );
@@ -477,7 +477,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
}
// using .arg(foo, bar) instead of .arg(foo).arg(bar), as foo can contain %x
- new KAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(),
+ new TDEAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(),
TQT_SLOT( searchProvider() ), actionCollection(), "searchProvider" );
// favorite search providers
@@ -486,7 +486,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
favoriteEngines = config.readListEntry("FavoriteSearchEngines", favoriteEngines);
if ( !favoriteEngines.isEmpty()) {
- KActionMenu* providerList = new KActionMenu( i18n( "Search for '%1' with" ).arg( selectedText ), actionCollection(), "searchProviderList" );
+ TDEActionMenu* providerList = new TDEActionMenu( i18n( "Search for '%1' with" ).arg( selectedText ), actionCollection(), "searchProviderList" );
TQStringList::ConstIterator it = favoriteEngines.begin();
for ( ; it != favoriteEngines.end(); ++it ) {
@@ -507,7 +507,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
icon = TQPixmap( iconPath );
name = service->name();
- providerList->insert( new KAction( name, icon, 0, d->m_tdehtml->browserExtension(),
+ providerList->insert( new TDEAction( name, icon, 0, d->m_tdehtml->browserExtension(),
TQT_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) );
}
}
@@ -515,14 +515,14 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
if ( selectedText.contains("://") && KURL(selectedText).isValid() )
- new KAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0,
+ new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0,
d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" );
}
else if ( url.isEmpty() && !isImage )
{
actionCollection()->insert( tdehtml->actionCollection()->action( "security" ) );
actionCollection()->insert( tdehtml->actionCollection()->action( "setEncoding" ) );
- new KAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
+ new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
actionCollection(), "stopanimations" );
}
@@ -530,14 +530,14 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
{
if (url.protocol() == "mailto")
{
- new KAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
+ new TDEAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
actionCollection(), "copylinklocation" );
}
else
{
- new KAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ),
+ new TDEAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ),
actionCollection(), "savelinkas" );
- new KAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
+ new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
actionCollection(), "copylinklocation" );
}
}
@@ -547,28 +547,28 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
{
if ( tdehtml->parentPart() )
{
- new KAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotFrameInWindow() ),
+ new TDEAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotFrameInWindow() ),
actionCollection(), "frameinwindow" );
- new KAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ),
+ new TDEAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ),
actionCollection(), "frameintop" );
- new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ),
+ new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ),
actionCollection(), "frameintab" );
- new KAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ),
+ new TDEAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ),
actionCollection(), "reloadframe" );
if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) {
if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame )
- new KAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
+ new TDEAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
}
- new KAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ),
+ new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ),
actionCollection(), "viewFrameSource" );
- new KAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
+ new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
// This one isn't in tdehtml_popupmenu.rc anymore, because Print isn't either,
// and because print frame is already in the toolbar and the menu.
// But leave this here, so that it's easy to read it.
- new KAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" );
- new KAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
+ new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" );
+ new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) );
actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewPageInfo" ) );
@@ -579,7 +579,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
} else if (isImage || !url.isEmpty()) {
actionCollection()->insert( tdehtml->actionCollection()->action( "viewDocumentSource" ) );
actionCollection()->insert( tdehtml->actionCollection()->action( "viewPageInfo" ) );
- new KAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
+ new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
actionCollection(), "stopanimations" );
}
@@ -598,35 +598,35 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
}
else
d->m_imageURL = KURL( static_cast<DOM::HTMLInputElement>( e ).src().string() );
- new KAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ),
+ new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ),
actionCollection(), "saveimageas" );
- new KAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ),
+ new TDEAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ),
actionCollection(), "sendimage" );
#ifndef QT_NO_MIMECLIPBOARD
- (new KAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ),
+ (new TDEAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ),
actionCollection(), "copyimage" ))->setEnabled(!d->m_pixmap.isNull());
#endif
if(d->m_pixmap.isNull()) { //fallback to image location if still loading the image. this will always be true if ifdef QT_NO_MIMECLIPBOARD
- new KAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ),
+ new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ),
actionCollection(), "copyimagelocation" );
}
TQString name = KStringHandler::csqueeze(d->m_imageURL.fileName()+d->m_imageURL.query(), 25);
- new KAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ),
+ new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ),
actionCollection(), "viewimage" );
if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled())
{
- new KAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ),
+ new TDEAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ),
actionCollection(), "blockimage" );
if (!d->m_imageURL.host().isEmpty() &&
!d->m_imageURL.protocol().isEmpty())
{
- new KAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQT_SLOT( slotBlockHost() ),
+ new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQT_SLOT( slotBlockHost() ),
actionCollection(), "blockhost" );
}
}
@@ -962,13 +962,13 @@ extern const int KDE_NO_EXPORT fastZoomSizeCount;
// BCI: remove in KDE 4
TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
- : KAction( text, icon, 0, receiver, slot, parent, name )
+ : TDEAction( text, icon, 0, receiver, slot, parent, name )
{
init(part, direction);
}
-TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
- : KAction( text, icon, cut, receiver, slot, parent, name )
+TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
+ : TDEAction( text, icon, cut, receiver, slot, parent, name )
{
init(part, direction);
}
@@ -1006,11 +1006,11 @@ TDEHTMLZoomFactorAction::~TDEHTMLZoomFactorAction()
int TDEHTMLZoomFactorAction::plug( TQWidget *w, int index )
{
- int containerId = KAction::plug( w, index );
- if ( containerId == -1 || !w->inherits( "KToolBar" ) )
+ int containerId = TDEAction::plug( w, index );
+ if ( containerId == -1 || !w->inherits( "TDEToolBar" ) )
return containerId;
- KToolBarButton *button = static_cast<KToolBar *>( w )->getButton( itemId( containerId ) );
+ TDEToolBarButton *button = static_cast<TDEToolBar *>( w )->getButton( itemId( containerId ) );
if ( !button )
return containerId;
diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h
index c6db763b..165cedb0 100644
--- a/tdehtml/tdehtml_ext.h
+++ b/tdehtml/tdehtml_ext.h
@@ -149,14 +149,14 @@ private:
TDEHTMLPopupGUIClientPrivate *d;
};
-class TDEHTMLZoomFactorAction : public KAction
+class TDEHTMLZoomFactorAction : public TDEAction
{
Q_OBJECT
public:
//BCI: remove in KDE 4
TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name );
TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text,
- const TQString &icon, const KShortcut& cut, const TQObject *receiver,
+ const TQString &icon, const TDEShortcut& cut, const TQObject *receiver,
const char *slot, TQObject *parent, const char *name );
virtual ~TDEHTMLZoomFactorAction();
@@ -165,7 +165,7 @@ public:
private slots:
void slotActivated( int );
protected slots:
- void slotActivated() { KAction::slotActivated(); }
+ void slotActivated() { TDEAction::slotActivated(); }
private:
void init(TDEHTMLPart *part, bool direction);
private:
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 059763c6..caa55ae6 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -252,29 +252,29 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
d->m_bMousePressed = false;
d->m_bRightMousePressed = false;
d->m_bCleared = false;
- d->m_paViewDocument = new KAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQT_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
- d->m_paViewFrame = new KAction( i18n( "View Frame Source" ), 0, this, TQT_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
- d->m_paViewInfo = new KAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
- d->m_paSaveBackground = new KAction( i18n( "Save &Background Image As..." ), 0, this, TQT_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
+ d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQT_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
+ d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQT_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
+ d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
+ d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQT_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
d->m_paSaveDocument = KStdAction::saveAs( this, TQT_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
if ( parentPart() )
- d->m_paSaveDocument->setShortcut( KShortcut() ); // avoid clashes
- d->m_paSaveFrame = new KAction( i18n( "Save &Frame As..." ), 0, this, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
- d->m_paSecurity = new KAction( i18n( "Security..." ), "decrypted", 0, this, TQT_SLOT( slotSecurity() ), actionCollection(), "security" );
+ d->m_paSaveDocument->setShortcut( TDEShortcut() ); // avoid clashes
+ d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
+ d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQT_SLOT( slotSecurity() ), actionCollection(), "security" );
d->m_paSecurity->setWhatsThis( i18n( "Security Settings<p>"
"Shows the certificate of the displayed page. Only "
"pages that have been transmitted using a secure, encrypted connection have a "
"certificate.<p> "
"Hint: If the image shows a closed lock, the page has been transmitted over a "
"secure connection.") );
- d->m_paDebugRenderTree = new KAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQT_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" );
- d->m_paDebugDOMTree = new KAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQT_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" );
- d->m_paStopAnimations = new KAction( i18n( "Stop Animated Images" ), 0, this, TQT_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" );
+ d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQT_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" );
+ d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQT_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" );
+ d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQT_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" );
- d->m_paSetEncoding = new KActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" );
+ d->m_paSetEncoding = new TDEActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" );
d->m_paSetEncoding->setDelayed( false );
- d->m_automaticDetection = new KPopupMenu( 0L );
+ d->m_automaticDetection = new TDEPopupMenu( 0L );
d->m_automaticDetection->insertItem( i18n( "Semi-Automatic" ), 0 );
d->m_automaticDetection->insertItem( i18n( "Arabic" ), 1 );
@@ -296,10 +296,10 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
d->m_paSetEncoding->popupMenu()->insertItem( i18n( "Automatic Detection" ), d->m_automaticDetection, 0 );
- d->m_paSetEncoding->insert( new KActionSeparator( actionCollection() ) );
+ d->m_paSetEncoding->insert( new TDEActionSeparator( actionCollection() ) );
- d->m_manualDetection = new KSelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" );
+ d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" );
TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
d->m_manualDetection->setItems( encodings );
d->m_manualDetection->setCurrentItem( -1 );
@@ -354,7 +354,7 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
}
- d->m_paUseStylesheet = new KSelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" );
+ d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" );
if ( prof == BrowserViewGUI ) {
d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n(
@@ -385,37 +385,37 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
"Find the previous occurrence of the text that you "
"have found using the <b>Find Text</b> function" ) );
- d->m_paFindAheadText = new KAction( i18n("Find Text as You Type"), KShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()),
+ d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()),
actionCollection(), "findAheadText");
- d->m_paFindAheadLinks = new KAction( i18n("Find Links as You Type"), KShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()),
+ d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()),
actionCollection(), "findAheadLink");
d->m_paFindAheadText->setEnabled( false );
d->m_paFindAheadLinks->setEnabled( false );
if ( parentPart() )
{
- d->m_paFind->setShortcut( KShortcut() ); // avoid clashes
- d->m_paFindNext->setShortcut( KShortcut() ); // avoid clashes
- d->m_paFindPrev->setShortcut( KShortcut() ); // avoid clashes
- d->m_paFindAheadText->setShortcut( KShortcut());
- d->m_paFindAheadLinks->setShortcut( KShortcut());
+ d->m_paFind->setShortcut( TDEShortcut() ); // avoid clashes
+ d->m_paFindNext->setShortcut( TDEShortcut() ); // avoid clashes
+ d->m_paFindPrev->setShortcut( TDEShortcut() ); // avoid clashes
+ d->m_paFindAheadText->setShortcut( TDEShortcut());
+ d->m_paFindAheadLinks->setShortcut( TDEShortcut());
}
- d->m_paPrintFrame = new KAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
+ d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame<p>"
"Some pages have several frames. To print only a single frame, click "
"on it and then use this function." ) );
d->m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectAll" );
if ( parentPart() )
- d->m_paSelectAll->setShortcut( KShortcut() ); // avoid clashes
+ d->m_paSelectAll->setShortcut( TDEShortcut() ); // avoid clashes
- d->m_paToggleCaretMode = new KToggleAction(i18n("Toggle Caret Mode"),
+ d->m_paToggleCaretMode = new TDEToggleAction(i18n("Toggle Caret Mode"),
Key_F7, this, TQT_SLOT(slotToggleCaretMode()),
actionCollection(), "caretMode");
d->m_paToggleCaretMode->setChecked(isCaretMode());
if (parentPart())
- d->m_paToggleCaretMode->setShortcut(KShortcut()); // avoid clashes
+ d->m_paToggleCaretMode->setShortcut(TDEShortcut()); // avoid clashes
// set the default java(script) flags according to the current host.
d->m_bOpenMiddleClick = d->m_settings->isOpenMiddleClickEnabled();
@@ -1119,7 +1119,7 @@ void TDEHTMLPart::disableJSErrorExtension() {
}
void TDEHTMLPart::jsErrorDialogContextMenu() {
- KPopupMenu *m = new KPopupMenu(0L);
+ TDEPopupMenu *m = new TDEPopupMenu(0L);
m->insertItem(i18n("&Hide Errors"), this, TQT_SLOT(removeJSErrorExtension()));
m->insertItem(i18n("&Disable Error Reporting"), this, TQT_SLOT(disableJSErrorExtension()));
m->popup(TQCursor::pos());
@@ -1348,10 +1348,10 @@ void TDEHTMLPart::setAutoloadImages( bool enable )
d->m_paLoadImages = 0;
}
else if ( !d->m_paLoadImages )
- d->m_paLoadImages = new KAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQT_SLOT( slotLoadImages() ), actionCollection(), "loadImages" );
+ d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQT_SLOT( slotLoadImages() ), actionCollection(), "loadImages" );
if ( d->m_paLoadImages ) {
- TQPtrList<KAction> lst;
+ TQPtrList<TDEAction> lst;
lst.append( d->m_paLoadImages );
plugActionList( "loadImages", lst );
}
@@ -6637,7 +6637,7 @@ void TDEHTMLPart::guiActivateEvent( KParts::GUIActivateEvent *event )
if ( !d->m_settings->autoLoadImages() && d->m_paLoadImages )
{
- TQPtrList<KAction> lst;
+ TQPtrList<TDEAction> lst;
lst.append( d->m_paLoadImages );
plugActionList( "loadImages", lst );
}
@@ -7311,7 +7311,7 @@ void TDEHTMLPart::launchWalletManager()
void TDEHTMLPart::walletMenu()
{
#ifndef TDEHTML_NO_WALLET
- KPopupMenu *m = new KPopupMenu(0L);
+ TDEPopupMenu *m = new TDEPopupMenu(0L);
m->insertItem(i18n("&Close Wallet"), this, TQT_SLOT(slotWalletClosed()));
m->popup(TQCursor::pos());
#endif // TDEHTML_NO_WALLET
@@ -7355,10 +7355,10 @@ void TDEHTMLPart::setDebugScript( bool enable )
unplugActionList( "debugScriptList" );
if ( enable ) {
if (!d->m_paDebugScript) {
- d->m_paDebugScript = new KAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" );
+ d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" );
}
d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L );
- TQPtrList<KAction> lst;
+ TQPtrList<TDEAction> lst;
lst.append( d->m_paDebugScript );
plugActionList( "debugScriptList", lst );
}
@@ -7407,7 +7407,7 @@ void TDEHTMLPart::setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originP
}
void TDEHTMLPart::suppressedPopupMenu() {
- KPopupMenu *m = new KPopupMenu(0L);
+ TDEPopupMenu *m = new TDEPopupMenu(0L);
m->setCheckable(true);
if ( d->m_openableSuppressedPopups )
m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQT_SLOT(showSuppressedPopups()));
diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index 021f9514..bf05d849 100644
--- a/tdehtml/tdehtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -80,20 +80,20 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
m_ext = new TDEHTMLImageBrowserExtension( this, "be" );
// Remove unnecessary actions.
- KAction *encodingAction = actionCollection()->action( "setEncoding" );
+ TDEAction *encodingAction = actionCollection()->action( "setEncoding" );
if ( encodingAction )
{
encodingAction->unplugAll();
delete encodingAction;
}
- KAction *viewSourceAction= actionCollection()->action( "viewDocumentSource" );
+ TDEAction *viewSourceAction= actionCollection()->action( "viewDocumentSource" );
if ( viewSourceAction )
{
viewSourceAction->unplugAll();
delete viewSourceAction;
}
- KAction *selectAllAction= actionCollection()->action( "selectAll" );
+ TDEAction *selectAllAction= actionCollection()->action( "selectAll" );
if ( selectAllAction )
{
selectAllAction->unplugAll();
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index c1e641cb..14948349 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -54,8 +54,8 @@
class KFind;
class KFindDialog;
-class KPopupMenu;
-class KSelectAction;
+class TDEPopupMenu;
+class TDESelectAction;
class KURLLabel;
class KJavaAppletContext;
class KJSErrorDlg;
@@ -393,30 +393,30 @@ public:
int m_delayRedirect;
TQString m_redirectURL;
- KAction *m_paViewDocument;
- KAction *m_paViewFrame;
- KAction *m_paViewInfo;
- KAction *m_paSaveBackground;
- KAction *m_paSaveDocument;
- KAction *m_paSaveFrame;
- KAction *m_paSecurity;
- KActionMenu *m_paSetEncoding;
- KSelectAction *m_paUseStylesheet;
+ TDEAction *m_paViewDocument;
+ TDEAction *m_paViewFrame;
+ TDEAction *m_paViewInfo;
+ TDEAction *m_paSaveBackground;
+ TDEAction *m_paSaveDocument;
+ TDEAction *m_paSaveFrame;
+ TDEAction *m_paSecurity;
+ TDEActionMenu *m_paSetEncoding;
+ TDESelectAction *m_paUseStylesheet;
TDEHTMLZoomFactorAction *m_paIncZoomFactor;
TDEHTMLZoomFactorAction *m_paDecZoomFactor;
- KAction *m_paLoadImages;
- KAction *m_paFind;
- KAction *m_paFindNext;
- KAction *m_paFindPrev;
- KAction *m_paFindAheadText;
- KAction *m_paFindAheadLinks;
- KAction *m_paPrintFrame;
- KAction *m_paSelectAll;
- KAction *m_paDebugScript;
- KAction *m_paDebugDOMTree;
- KAction *m_paDebugRenderTree;
- KAction *m_paStopAnimations;
- KToggleAction *m_paToggleCaretMode;
+ TDEAction *m_paLoadImages;
+ TDEAction *m_paFind;
+ TDEAction *m_paFindNext;
+ TDEAction *m_paFindPrev;
+ TDEAction *m_paFindAheadText;
+ TDEAction *m_paFindAheadLinks;
+ TDEAction *m_paPrintFrame;
+ TDEAction *m_paSelectAll;
+ TDEAction *m_paDebugScript;
+ TDEAction *m_paDebugDOMTree;
+ TDEAction *m_paDebugRenderTree;
+ TDEAction *m_paStopAnimations;
+ TDEToggleAction *m_paToggleCaretMode;
KParts::PartManager *m_manager;
@@ -548,8 +548,8 @@ public:
bool m_newJSInterpreterExists; // set to 1 by setOpenedByJS, for window.open
tdehtml::Decoder::AutoDetectLanguage m_autoDetectLanguage;
- KPopupMenu *m_automaticDetection;
- KSelectAction *m_manualDetection;
+ TDEPopupMenu *m_automaticDetection;
+ TDESelectAction *m_manualDetection;
void setFlagRecursively(bool TDEHTMLPartPrivate::*flag, bool value);
/** returns the caret node */
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index d05591f4..88a662eb 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -558,7 +558,7 @@ int main(int argc, char *argv[])
// create widgets
TDEHTMLFactory *fac = new TDEHTMLFactory();
- KMainWindow *toplevel = new KMainWindow();
+ TDEMainWindow *toplevel = new TDEMainWindow();
TDEHTMLPart *part = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI );
toplevel->setCentralWidget( part->widget() );
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index 001780dc..e9d1cd4e 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
TDEHTMLFactory *fac = new TDEHTMLFactory(true);
#endif
- KMainWindow *toplevel = new KMainWindow();
+ TDEMainWindow *toplevel = new TDEMainWindow();
TDEHTMLPart *doc = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI );
Dummy *dummy = new Dummy( doc );
@@ -105,14 +105,14 @@ int main(int argc, char *argv[])
e.setAttribute( "name", "print" );
toolBar.insertBefore( e, toolBar.firstChild() );
- (void)new KAction( "Reload", "reload", Qt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" );
- (void)new KAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
- KAction* kprint = new KAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" );
+ (void)new TDEAction( "Reload", "reload", Qt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" );
+ (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
+ TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" );
kprint->setEnabled(true);
- KToggleAction *ta = new KToggleAction( "Navigable", "editclear", 0, doc->actionCollection(), "navigable" );
+ TDEToggleAction *ta = new TDEToggleAction( "Navigable", "editclear", 0, doc->actionCollection(), "navigable" );
ta->setChecked(doc->isCaretMode());
TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) ));
- ta = new KToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" );
+ ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" );
ta->setChecked(doc->isEditable());
TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleEditable(bool) ));
toplevel->guiFactory()->addClient( doc );
diff --git a/tdeio/Mainpage.dox b/tdeio/Mainpage.dox
index 2de4b315..464faf7a 100644
--- a/tdeio/Mainpage.dox
+++ b/tdeio/Mainpage.dox
@@ -39,7 +39,7 @@
* its building blocks and some other widgets, making use of the file dialog.
*
* The file dialog provides different views; there is a vertically scrolling
- * view based on KListView, showing things like filename, file size,
+ * view based on TDEListView, showing things like filename, file size,
* permissions etc. in separate columns. And there is a horizontally scrolling
* view based on KIconView. Additionally, there are some compound views,
* like a view using the icon-view for files on the right side and another
@@ -55,7 +55,7 @@
* to them is KDirOperator. It allows the user to switch between different
* views.
*
- * KFileTreeView is a KListView based widget that displays files and/or
+ * KFileTreeView is a TDEListView based widget that displays files and/or
* directories as a tree. It does not implement the KFileView interface,
* however, so it can't be used with KDirOperator.
*
@@ -100,7 +100,7 @@
* The KFileView based on KIconView.
*
* KFileDetailView:
- * The KFileView based on KListView.
+ * The KFileView based on TDEListView.
*
* KFilePreview:
* The KFileView, combining a widget showing preview for a selected file
diff --git a/tdeio/bookmarks/kbookmarkbar.cc b/tdeio/bookmarks/kbookmarkbar.cc
index e7380180..b1ebb94f 100644
--- a/tdeio/bookmarks/kbookmarkbar.cc
+++ b/tdeio/bookmarks/kbookmarkbar.cc
@@ -45,10 +45,10 @@
class KBookmarkBarPrivate : public dPtrTemplate<KBookmarkBar, KBookmarkBarPrivate>
{
public:
- TQPtrList<KAction> m_actions;
+ TQPtrList<TDEAction> m_actions;
bool m_readOnly;
KBookmarkManager* m_filteredMgr;
- KToolBar* m_sepToolBar;
+ TDEToolBar* m_sepToolBar;
int m_sepIndex;
bool m_atFirst;
TQString m_dropAddress;
@@ -85,8 +85,8 @@ private:
};
KBookmarkBar::KBookmarkBar( KBookmarkManager* mgr,
- KBookmarkOwner *_owner, KToolBar *_toolBar,
- KActionCollection *coll,
+ KBookmarkOwner *_owner, TDEToolBar *_toolBar,
+ TDEActionCollection *coll,
TQObject *parent, const char *name )
: TQObject( parent, name ), m_pOwner(_owner), m_toolBar(_toolBar),
m_actionCollection( coll ), m_pManager(mgr)
@@ -150,7 +150,7 @@ KBookmarkBar::~KBookmarkBar()
void KBookmarkBar::clear()
{
- TQPtrListIterator<KAction> it( dptr()->m_actions );
+ TQPtrListIterator<TDEAction> it( dptr()->m_actions );
m_toolBar->clear();
for (; it.current(); ++it ) {
(*it)->unplugAll();
@@ -199,9 +199,9 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
m_toolBar->insertLineSeparator();
else
{
- KAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
- connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
- this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
+ TDEAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
+ connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+ this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
action->setProperty( "url", bm.url().url() );
action->setProperty( "address", bm.address() );
@@ -215,7 +215,7 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
}
else
{
- KActionMenu *action = new KBookmarkActionMenu( text, bm.icon(),
+ TDEActionMenu *action = new KBookmarkActionMenu( text, bm.icon(),
m_actionCollection,
"bookmarkbar-actionmenu");
action->setProperty( "address", bm.address() );
@@ -252,11 +252,11 @@ bool KBookmarkBar::isReadOnly() const
return dptr()->m_readOnly;
}
-void KBookmarkBar::slotBookmarkSelected( KAction::ActivationReason /*reason*/, TQt::ButtonState state )
+void KBookmarkBar::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/, TQt::ButtonState state )
{
if (!m_pOwner) return; // this view doesn't handle bookmarks...
- const KAction* action = dynamic_cast<const KAction *>(sender());
+ const TDEAction* action = dynamic_cast<const TDEAction *>(sender());
if(action)
{
const TQString & url = sender()->property("url").toString();
@@ -267,7 +267,7 @@ void KBookmarkBar::slotBookmarkSelected( KAction::ActivationReason /*reason*/, T
void KBookmarkBar::slotBookmarkSelected()
{
- slotBookmarkSelected(KAction::ToolBarActivation, Qt::NoButton);
+ slotBookmarkSelected(TDEAction::ToolBarActivation, Qt::NoButton);
}
static const int const_sepId = -9999; // FIXME this is ugly,
@@ -282,9 +282,9 @@ static void removeTempSep(KBookmarkBarPrivate* p)
}
}
-static KAction* findPluggedAction(TQPtrList<KAction> actions, KToolBar *tb, int id)
+static TDEAction* findPluggedAction(TQPtrList<TDEAction> actions, TDEToolBar *tb, int id)
{
- TQPtrListIterator<KAction> it( actions );
+ TQPtrListIterator<TDEAction> it( actions );
for (; (*it); ++it )
if ((*it)->isPlugged(tb, id))
return (*it);
@@ -302,19 +302,19 @@ static KAction* findPluggedAction(TQPtrList<KAction> actions, KToolBar *tb, int
* returned action was dropped on
*/
static TQString handleToolbarDragMoveEvent(
- KBookmarkBarPrivate *p, KToolBar *tb, TQPoint pos, TQPtrList<KAction> actions,
+ KBookmarkBarPrivate *p, TDEToolBar *tb, TQPoint pos, TQPtrList<TDEAction> actions,
bool &atFirst, KBookmarkManager *mgr
) {
Q_UNUSED( mgr );
- Q_ASSERT( actions.isEmpty() || (tb == dynamic_cast<KToolBar*>(actions.first()->container(0))) );
+ Q_ASSERT( actions.isEmpty() || (tb == dynamic_cast<TDEToolBar*>(actions.first()->container(0))) );
p->m_sepToolBar = tb;
p->m_sepToolBar->removeItemDelayed(const_sepId);
int index = 0;
- KToolBarButton* b;
+ TDEToolBarButton* b;
- b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
- KAction *a = 0;
+ b = dynamic_cast<TDEToolBarButton*>(tb->childAt(pos));
+ TDEAction *a = 0;
TQString address;
atFirst = false;
@@ -382,23 +382,23 @@ skipact:
}
// TODO - document!!!!
-static KAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<KAction> actions,
+static TDEAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<TDEAction> actions,
KBookmarkManager * /*mgr*/, TQPoint & pt)
{
- KAction *act = actions.first();
+ TDEAction *act = actions.first();
if (!act) {
return 0;
}
- KToolBar *tb = dynamic_cast<KToolBar*>(act->container(0));
+ TDEToolBar *tb = dynamic_cast<TDEToolBar*>(act->container(0));
Q_ASSERT(tb);
- KToolBarButton *b;
- b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
+ TDEToolBarButton *b;
+ b = dynamic_cast<TDEToolBarButton*>(tb->childAt(pos));
if (!b)
return 0;
- KAction *a = 0;
+ TDEAction *a = 0;
a = findPluggedAction(actions, tb, b->id());
Q_ASSERT(a);
pt = tb->mapToGlobal(pos);
@@ -454,7 +454,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
TQMouseEvent *mev = (TQMouseEvent*)e;
TQPoint pt;
- KAction *_a;
+ TDEAction *_a;
// FIXME, see how this holds up on an empty toolbar
_a = handleToolbarMouseButton( mev->pos(), dptr()->m_actions, m_pManager, pt );
@@ -463,7 +463,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
dptr()->m_highlightedAddress = _a->property("address").toString();
KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress );
RMB::begin_rmb_action(this);
- KPopupMenu *pm = new KPopupMenu;
+ TDEPopupMenu *pm = new TDEPopupMenu;
rmbSelf(this)->fillContextMenu( pm, dptr()->m_highlightedAddress, 0 );
emit aboutToShowContextMenu( rmbSelf(this)->atAddress( dptr()->m_highlightedAddress ), pm );
rmbSelf(this)->fillContextMenu2( pm, dptr()->m_highlightedAddress, 0 );
@@ -510,7 +510,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
return false;
bool _atFirst;
TQString dropAddress;
- KToolBar *tb = (KToolBar*)o;
+ TDEToolBar *tb = (TDEToolBar*)o;
dropAddress = handleToolbarDragMoveEvent(dptr(), tb, dme->pos(), dptr()->m_actions, _atFirst, m_pManager);
if (!dropAddress.isNull())
{
diff --git a/tdeio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h
index 1f100d18..2f5495cd 100644
--- a/tdeio/bookmarks/kbookmarkbar.h
+++ b/tdeio/bookmarks/kbookmarkbar.h
@@ -27,11 +27,11 @@
#include <kbookmark.h>
#include <kaction.h>
-class KToolBar;
+class TDEToolBar;
class KBookmarkMenu;
class KBookmarkOwner;
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
class TQPopupMenu;
/**
@@ -52,14 +52,14 @@ public:
* @param owner implementation of the KBookmarkOwner interface (callbacks)
* @param toolBar toolbar to fill
*
- * The KActionCollection pointer argument is now obsolete.
+ * The TDEActionCollection pointer argument is now obsolete.
*
* @param parent the parent widget for the bookmark toolbar
* @param name the internal name for the bookmark toolbar
*/
KBookmarkBar( KBookmarkManager* manager,
- KBookmarkOwner *owner, KToolBar *toolBar,
- KActionCollection *,
+ KBookmarkOwner *owner, TDEToolBar *toolBar,
+ TDEActionCollection *,
TQObject *parent = 0L, const char *name = 0L);
virtual ~KBookmarkBar();
@@ -98,7 +98,7 @@ public slots:
/**
* @since 3.4
*/
- void slotBookmarkSelected( KAction::ActivationReason reason, TQt::ButtonState state );
+ void slotBookmarkSelected( TDEAction::ActivationReason reason, TQt::ButtonState state );
/// @since 3.2
void slotRMBActionRemove( int );
@@ -119,8 +119,8 @@ private:
KBookmarkGroup getToolbar();
KBookmarkOwner *m_pOwner;
- TQGuardedPtr<KToolBar> m_toolBar;
- KActionCollection *m_actionCollection;
+ TQGuardedPtr<TDEToolBar> m_toolBar;
+ TDEActionCollection *m_actionCollection;
KBookmarkManager *m_pManager;
TQPtrList<KBookmarkMenu> m_lstSubMenus;
diff --git a/tdeio/bookmarks/kbookmarkimporter.h b/tdeio/bookmarks/kbookmarkimporter.h
index cc87b200..6a038e03 100644
--- a/tdeio/bookmarks/kbookmarkimporter.h
+++ b/tdeio/bookmarks/kbookmarkimporter.h
@@ -31,7 +31,7 @@
/**
* A class for importing NS bookmarks
* KEditBookmarks uses it to insert bookmarks into its DOM tree,
- * and KActionMenu uses it to create actions directly.
+ * and TDEActionMenu uses it to create actions directly.
* @since 3.2
*/
class TDEIO_EXPORT KBookmarkImporterBase : public TQObject
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index a4d88ae5..ff9f8d4e 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -77,8 +77,8 @@ static TQString makeTextNodeMod(KBookmark bk, const TQString &m_nodename, const
/********************************************************************/
KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
- KBookmarkOwner * _owner, KPopupMenu * _parentMenu,
- KActionCollection *collec, bool _isRoot, bool _add,
+ KBookmarkOwner * _owner, TDEPopupMenu * _parentMenu,
+ TDEActionCollection *collec, bool _isRoot, bool _add,
const TQString & parentAddress )
: TQObject(),
m_bIsRoot(_isRoot), m_bAddBookmark(_add),
@@ -96,9 +96,9 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
if (m_actionCollection)
{
m_actionCollection->setHighlightingEnabled(true);
- disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( KAction * ) ), 0, 0 );
- connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( KAction * ) ),
- this, TQT_SLOT( slotActionHighlighted( KAction * ) ) );
+ disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 );
+ connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ),
+ this, TQT_SLOT( slotActionHighlighted( TDEAction * ) ) );
}
m_bNSBookmark = m_parentAddress.isNull();
@@ -112,8 +112,8 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
if ( KBookmarkSettings::self()->m_contextmenu )
{
(void) _parentMenu->contextMenu();
- connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*) ),
- this, TQT_SLOT( slotAboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*) ));
+ connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ),
+ this, TQT_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ));
}
if ( m_bIsRoot )
@@ -142,7 +142,7 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
KBookmarkMenu::~KBookmarkMenu()
{
//kdDebug(7043) << "KBookmarkMenu::~KBookmarkMenu() " << this << endl;
- TQPtrListIterator<KAction> it( m_actions );
+ TQPtrListIterator<TDEAction> it( m_actions );
for (; it.current(); ++it )
it.current()->unplugAll();
@@ -169,7 +169,7 @@ TQString KBookmarkMenu::s_highlightedAddress;
TQString KBookmarkMenu::s_highlightedImportType;
TQString KBookmarkMenu::s_highlightedImportLocation;
-void KBookmarkMenu::slotActionHighlighted( KAction* action )
+void KBookmarkMenu::slotActionHighlighted( TDEAction* action )
{
if (action->isA("KBookmarkActionMenu") || action->isA("KBookmarkAction"))
{
@@ -231,12 +231,12 @@ KBookmark RMB::atAddress(const TQString & address)
return bookmark;
}
-void KBookmarkMenu::slotAboutToShowContextMenu( KPopupMenu*, int, TQPopupMenu* contextMenu )
+void KBookmarkMenu::slotAboutToShowContextMenu( TDEPopupMenu*, int, TQPopupMenu* contextMenu )
{
//kdDebug(7043) << "KBookmarkMenu::slotAboutToShowContextMenu" << s_highlightedAddress << endl;
if (s_highlightedAddress.isNull())
{
- KPopupMenu::contextMenuFocus()->hideContextMenu();
+ TDEPopupMenu::contextMenuFocus()->hideContextMenu();
return;
}
contextMenu->clear();
@@ -411,7 +411,7 @@ void RMB::slotRMBActionCopyLocation( int val )
}
void RMB::hidePopup() {
- KPopupMenu::contextMenuFocus()->hideContextMenu();
+ TDEPopupMenu::contextMenuFocus()->hideContextMenu();
}
/********************************************************************/
@@ -467,7 +467,7 @@ void KBookmarkMenu::refill()
//kdDebug(7043) << "KBookmarkMenu::refill()" << endl;
m_lstSubMenus.clear();
- TQPtrListIterator<KAction> it( m_actions );
+ TQPtrListIterator<TDEAction> it( m_actions );
for (; it.current(); ++it )
it.current()->unplug( m_parentMenu );
@@ -480,12 +480,12 @@ void KBookmarkMenu::refill()
void KBookmarkMenu::addAddBookmarksList()
{
- if (!kapp->authorizeKAction("bookmarks"))
+ if (!kapp->authorizeTDEAction("bookmarks"))
return;
TQString title = i18n( "Bookmark Tabs as Folder..." );
- KAction * paAddBookmarksList = new KAction( title,
+ TDEAction * paAddBookmarksList = new TDEAction( title,
"bookmarks_list_add",
0,
this,
@@ -500,14 +500,14 @@ void KBookmarkMenu::addAddBookmarksList()
void KBookmarkMenu::addAddBookmark()
{
- if (!kapp->authorizeKAction("bookmarks"))
+ if (!kapp->authorizeTDEAction("bookmarks"))
return;
TQString title = i18n( "Add Bookmark" );
- KAction * paAddBookmarks = new KAction( title,
+ TDEAction * paAddBookmarks = new TDEAction( title,
"bookmark_add",
- m_bIsRoot && m_bAddShortcuts ? KStdAccel::addBookmark() : KShortcut(),
+ m_bIsRoot && m_bAddShortcuts ? TDEStdAccel::addBookmark() : TDEShortcut(),
this,
TQT_SLOT( slotAddBookmark() ),
m_actionCollection, m_bIsRoot ? "add_bookmark" : 0 );
@@ -520,10 +520,10 @@ void KBookmarkMenu::addAddBookmark()
void KBookmarkMenu::addEditBookmarks()
{
- if (!kapp->authorizeKAction("bookmarks"))
+ if (!kapp->authorizeTDEAction("bookmarks"))
return;
- KAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ),
+ TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ),
m_actionCollection, "edit_bookmarks" );
m_paEditBookmarks->plug( m_parentMenu );
m_paEditBookmarks->setToolTip( i18n( "Edit your bookmark collection in a separate window" ) );
@@ -532,7 +532,7 @@ void KBookmarkMenu::addEditBookmarks()
void KBookmarkMenu::addNewFolder()
{
- if (!kapp->authorizeKAction("bookmarks"))
+ if (!kapp->authorizeTDEAction("bookmarks"))
return;
TQString title = i18n( "&New Bookmark Folder..." );
@@ -540,7 +540,7 @@ void KBookmarkMenu::addNewFolder()
while ( ( p = title.find( '&' ) ) >= 0 )
title.remove( p, 1 );
- KAction * paNewFolder = new KAction( title,
+ TDEAction * paNewFolder = new TDEAction( title,
"folder_new", //"folder",
0,
this,
@@ -555,7 +555,7 @@ void KBookmarkMenu::addNewFolder()
void KBookmarkMenu::fillBookmarkMenu()
{
- if (!kapp->authorizeKAction("bookmarks"))
+ if (!kapp->authorizeTDEAction("bookmarks"))
return;
if ( m_bIsRoot )
@@ -594,7 +594,7 @@ void KBookmarkMenu::fillBookmarkMenu()
haveSep = true;
}
- KActionMenu * actionMenu;
+ TDEActionMenu * actionMenu;
actionMenu = new KImportedBookmarksActionMenu(
info.name, info.type,
m_actionCollection, "kbookmarkmenu" );
@@ -638,9 +638,9 @@ void KBookmarkMenu::fillBookmarkMenu()
else
{
//kdDebug(7043) << "Creating URL bookmark menu item for " << bm.text() << endl;
- KAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
- connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
- this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
+ TDEAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
+ connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+ this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
action->setProperty( "url", bm.url().url() );
action->setProperty( "address", bm.address() );
@@ -654,7 +654,7 @@ void KBookmarkMenu::fillBookmarkMenu()
else
{
//kdDebug(7043) << "Creating bookmark submenu named " << bm.text() << endl;
- KActionMenu * actionMenu = new KBookmarkActionMenu( text, bm.icon(),
+ TDEActionMenu * actionMenu = new KBookmarkActionMenu( text, bm.icon(),
m_actionCollection,
"kbookmarkmenu" );
actionMenu->setProperty( "address", bm.address() );
@@ -681,7 +681,7 @@ void KBookmarkMenu::fillBookmarkMenu()
if ( KBookmarkSettings::self()->m_quickactions )
{
- KActionMenu * actionMenu = new KActionMenu( i18n("Quick Actions"), m_actionCollection, 0L );
+ TDEActionMenu * actionMenu = new TDEActionMenu( i18n("Quick Actions"), m_actionCollection, 0L );
fillContextMenu( actionMenu->popupMenu(), m_parentAddress, 1 );
actionMenu->plug( m_parentMenu );
m_actions.append( actionMenu );
@@ -743,11 +743,11 @@ void KBookmarkMenu::slotNewFolder()
}
}
-void KBookmarkMenu::slotBookmarkSelected( KAction::ActivationReason /*reason*/, TQt::ButtonState state )
+void KBookmarkMenu::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/, TQt::ButtonState state )
{
kdDebug(7043) << "KBookmarkMenu::slotBookmarkSelected()" << endl;
if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
- const KAction* action = dynamic_cast<const KAction *>(sender());
+ const TDEAction* action = dynamic_cast<const TDEAction *>(sender());
if(action)
{
const TQString& url = sender()->property("url").toString();
@@ -758,7 +758,7 @@ void KBookmarkMenu::slotBookmarkSelected( KAction::ActivationReason /*reason*/,
void KBookmarkMenu::slotBookmarkSelected()
{
- slotBookmarkSelected(KAction::PopupMenuActivation, Qt::NoButton);
+ slotBookmarkSelected(TDEAction::PopupMenuActivation, Qt::NoButton);
}
KExtendedBookmarkOwner* KBookmarkMenu::extOwner()
@@ -1057,9 +1057,9 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin
{
TQString _text = KStringHandler::csqueeze(text);
_text.replace( '&', "&&" );
- KAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0);
- connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
- m_menu, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
+ TDEAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0);
+ connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+ m_menu, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
action->setProperty( "url", url );
action->setToolTip( url );
action->plug( mstack.top()->m_parentMenu );
@@ -1070,7 +1070,7 @@ void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQSt
{
TQString _text = KStringHandler::csqueeze(text);
_text.replace( '&', "&&" );
- KActionMenu * actionMenu = new KActionMenu( _text, "folder", m_actionCollection, 0L );
+ TDEActionMenu * actionMenu = new TDEActionMenu( _text, "folder", m_actionCollection, 0L );
actionMenu->plug( mstack.top()->m_parentMenu );
mstack.top()->m_actions.append( actionMenu );
KBookmarkMenu *subMenu = new KBookmarkMenu( m_pManager, m_menu->m_pOwner, actionMenu->popupMenu(),
diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index 35e6191e..00307720 100644
--- a/tdeio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
@@ -43,18 +43,18 @@ class TQListView;
class KLineEdit;
class KBookmark;
class KBookmarkGroup;
-class KAction;
-class KActionMenu;
-class KActionCollection;
+class TDEAction;
+class TDEActionMenu;
+class TDEActionCollection;
class KBookmarkOwner;
class KBookmarkMenu;
-class KPopupMenu;
+class TDEPopupMenu;
namespace TDEIO { class Job; }
/**
* This class provides a bookmark menu. It is typically used in
- * cooperation with KActionMenu but doesn't have to be.
+ * cooperation with TDEActionMenu but doesn't have to be.
*
* If you use this class by itself, then it will use KDE defaults for
* everything -- the bookmark path, bookmark editor, bookmark launcher..
@@ -66,7 +66,7 @@ namespace TDEIO { class Job; }
*
* Using this class is very simple:
*
- * 1) Create a popup menu (either KActionMenu or KPopupMenu will do)
+ * 1) Create a popup menu (either TDEActionMenu or TDEPopupMenu will do)
* 2) Instantiate a new KBookmarkMenu object using the above popup
* menu as a parameter
* 3) Insert your (now full) popup menu wherever you wish
@@ -90,7 +90,7 @@ public:
* @param mgr The bookmark manager to use (i.e. for reading and writing)
* @param owner implementation of the KBookmarkOwner callback interface.
* @param parentMenu menu to be filled
- * @param collec parent collection for the KActions.
+ * @param collec parent collection for the TDEActions.
* Only used for other menus than the toplevel one.
* @param root true for the toplevel menu
* @param add true to show the "Add Bookmark" and "New Folder" entries
@@ -102,8 +102,8 @@ public:
* An _empty_ parentAddress denotes the toplevel bookmark menu
*/
KBookmarkMenu( KBookmarkManager* mgr,
- KBookmarkOwner * owner, KPopupMenu * parentMenu,
- KActionCollection * collec, bool root, bool add = true,
+ KBookmarkOwner * owner, TDEPopupMenu * parentMenu,
+ TDEActionCollection * collec, bool root, bool add = true,
const TQString & parentAddress = "" );
~KBookmarkMenu();
@@ -169,8 +169,8 @@ public slots: // public for bookmark bar
protected slots:
void slotAboutToShow();
- void slotAboutToShowContextMenu( KPopupMenu *, int, TQPopupMenu * );
- void slotActionHighlighted( KAction * );
+ void slotAboutToShowContextMenu( TDEPopupMenu *, int, TQPopupMenu * );
+ void slotActionHighlighted( TDEAction * );
void slotRMBActionRemove( int );
void slotRMBActionInsert( int );
@@ -182,7 +182,7 @@ protected slots:
/**
* @ since 3.4
*/
- void slotBookmarkSelected( KAction::ActivationReason reason, TQt::ButtonState state );
+ void slotBookmarkSelected( TDEAction::ActivationReason reason, TQt::ButtonState state );
void slotAddBookmarksList();
void slotAddBookmark();
void slotNewFolder();
@@ -214,16 +214,16 @@ protected:
* The menu in which we plug our actions.
* Supplied in the constructor.
*/
- KPopupMenu * m_parentMenu;
+ TDEPopupMenu * m_parentMenu;
/**
* List of our sub menus
*/
TQPtrList<KBookmarkMenu> m_lstSubMenus;
- KActionCollection * m_actionCollection;
+ TDEActionCollection * m_actionCollection;
/**
* List of our actions.
*/
- TQPtrList<KAction> m_actions;
+ TQPtrList<TDEAction> m_actions;
/**
* Parent bookmark for this menu.
*/
@@ -236,13 +236,13 @@ protected:
};
/**
- * A class connected to KNSBookmarkImporter, to fill KActionMenus.
+ * A class connected to KNSBookmarkImporter, to fill TDEActionMenus.
*/
class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject
{
Q_OBJECT
public:
- KBookmarkMenuNSImporter( KBookmarkManager* mgr, KBookmarkMenu * menu, KActionCollection * act ) :
+ KBookmarkMenuNSImporter( KBookmarkManager* mgr, KBookmarkMenu * menu, TDEActionCollection * act ) :
m_menu(menu), m_actionCollection(act), m_pManager(mgr) {}
void openNSBookmarks();
@@ -258,7 +258,7 @@ protected slots:
protected:
TQPtrStack<KBookmarkMenu> mstack;
KBookmarkMenu * m_menu;
- KActionCollection * m_actionCollection;
+ TDEActionCollection * m_actionCollection;
KBookmarkManager* m_pManager;
};
diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index cb88607f..dff3e6f3 100644
--- a/tdeio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
@@ -44,15 +44,15 @@ class TQListView;
class KLineEdit;
class KBookmark;
class KBookmarkGroup;
-class KAction;
-class KActionMenu;
-class KActionCollection;
+class TDEAction;
+class TDEActionMenu;
+class TDEActionCollection;
class KBookmarkOwner;
class KBookmarkMenu;
class KBookmarkBar;
-class KPopupMenu;
+class TDEPopupMenu;
-class KImportedBookmarksActionMenu : public KActionMenu {
+class KImportedBookmarksActionMenu : public TDEActionMenu {
Q_OBJECT
TQ_PROPERTY( TQString type READ type WRITE setType )
TQ_PROPERTY( TQString location READ location WRITE setLocation )
@@ -67,13 +67,13 @@ private:
public:
KImportedBookmarksActionMenu(
const TQString &text, const TQString& sIconName,
- KActionCollection* parent, const char* name)
- : KActionMenu(text, sIconName, parent, name) {
+ TDEActionCollection* parent, const char* name)
+ : TDEActionMenu(text, sIconName, parent, name) {
;
}
};
-class KBookmarkActionMenu : public KActionMenu {
+class KBookmarkActionMenu : public TDEActionMenu {
Q_OBJECT
TQ_PROPERTY( TQString url READ url WRITE setUrl )
TQ_PROPERTY( TQString address READ address WRITE setAddress )
@@ -92,13 +92,13 @@ private:
public:
KBookmarkActionMenu(
const TQString &text, const TQString& sIconName,
- KActionCollection* parent, const char* name)
- : KActionMenu(text, sIconName, parent, name) {
+ TDEActionCollection* parent, const char* name)
+ : TDEActionMenu(text, sIconName, parent, name) {
;
}
};
-class KBookmarkAction : public KAction {
+class KBookmarkAction : public TDEAction {
Q_OBJECT
TQ_PROPERTY( TQString url READ url WRITE setUrl )
TQ_PROPERTY( TQString address READ address WRITE setAddress )
@@ -113,15 +113,15 @@ private:
public:
// KDE4: remove
KBookmarkAction(
- const TQString& text, const TQString& sIconName, const KShortcut& cut,
+ const TQString& text, const TQString& sIconName, const TDEShortcut& cut,
const TQObject* receiver, const char* slot,
- KActionCollection* parent, const char* name)
- : KAction(text, sIconName, cut, receiver, slot, parent, name) {
+ TDEActionCollection* parent, const char* name)
+ : TDEAction(text, sIconName, cut, receiver, slot, parent, name) {
}
KBookmarkAction(
- const TQString& text, const TQString& sIconName, const KShortcut& cut,
- KActionCollection* parent, const char* name)
- : KAction(text, sIconName, cut, parent, name) {
+ const TQString& text, const TQString& sIconName, const TDEShortcut& cut,
+ TDEActionCollection* parent, const char* name)
+ : TDEAction(text, sIconName, cut, parent, name) {
}
};
diff --git a/tdeio/misc/tdewalletd/tdewalletd.desktop b/tdeio/misc/tdewalletd/tdewalletd.desktop
index 1e65fe0d..1f92976e 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.desktop
+++ b/tdeio/misc/tdewalletd/tdewalletd.desktop
@@ -61,7 +61,7 @@ Name[ru]=Служба бумажника
Name[rw]=Igice Dayimoni KUruhago
Name[se]=KWallet-bálvámoduvla
Name[sk]=Modul démona KWallet
-Name[sl]=Modul demona KListnica
+Name[sl]=Modul demona TDEListnica
Name[sq]=Demoni për Modulin KWallet
Name[sr]=KWallet демон модул
Name[sr@Latn]=KWallet demon modul
@@ -132,7 +132,7 @@ Comment[ru]=Управление бумажником TDE
Comment[rw]=Igice cya dayimoni KUruhago cya KDED
Comment[se]=KDED:a KWallet-bálvámoduvla
Comment[sk]=Modul démona KWallet pre KDED
-Comment[sl]=Modul demona KListnica za KDED
+Comment[sl]=Modul demona TDEListnica za KDED
Comment[sr]=KWallet демон модул за KDED
Comment[sr@Latn]=KWallet demon modul za KDED
Comment[sv]=Kwallet-demonmodul för KDED
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 8a9c7f21..4f4b720f 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -94,7 +94,7 @@ class UIServerSystemTray:public KSystemTray
UIServerSystemTray(UIServer* uis)
:KSystemTray(uis)
{
- KPopupMenu* pop= contextMenu();
+ TDEPopupMenu* pop= contextMenu();
pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
setPixmap(loadIcon("filesave"));
@@ -118,7 +118,7 @@ class ProgressConfigDialog:public KDialogBase
TQCheckBox *m_statusBarCb;
TQCheckBox *m_headerCb;
TQCheckBox *m_fixedWidthCb;
- KListView *m_columns;
+ TDEListView *m_columns;
TQCheckListItem *(m_items[ListProgress::TB_MAX]);
};
@@ -134,7 +134,7 @@ ProgressConfigDialog::ProgressConfigDialog(TQWidget *parent)
m_statusBarCb=new TQCheckBox(i18n("Show statusbar"), plainPage());
m_fixedWidthCb=new TQCheckBox(i18n("Column widths are user adjustable"), plainPage());
TQLabel *label=new TQLabel(i18n("Show information:"), plainPage());
- m_columns=new KListView(plainPage());
+ m_columns=new TDEListView(plainPage());
m_columns->addColumn("info");
m_columns->setSorting(-1);
@@ -455,7 +455,7 @@ void ProgressItem::updateVisibility()
//-----------------------------------------------------------------------------
ListProgress::ListProgress (TQWidget *parent, const char *name)
-: KListView (parent, name)
+: TDEListView (parent, name)
{
// enable selection of more than one item
@@ -584,7 +584,7 @@ void ListProgress::writeSettings() {
UIServer::UIServer()
-:KMainWindow(0, "")
+:TDEMainWindow(0, "")
,DCOPObject("UIServer")
,m_shuttingDown(false)
,m_configDialog(0)
@@ -602,7 +602,7 @@ UIServer::UIServer()
TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
- toolBar()->setBarPos( KToolBar::Left );
+ toolBar()->setBarPos( TDEToolBar::Left );
// setup statusbar
statusBar()->insertItem( i18n(" Files: %1 ").arg( 0 ), ID_TOTAL_FILES);
@@ -619,8 +619,8 @@ UIServer::UIServer()
TQT_SLOT( slotSelection() ) );
connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ),
TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
- connect( listProgress, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem *, const TQPoint &)),
- TQT_SLOT(slotShowContextMenu(KListView*, TQListViewItem *, const TQPoint&)));
+ connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
+ TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
// setup animation timer
@@ -671,7 +671,7 @@ void UIServer::applySettings()
toolBar()->show();
}
-void UIServer::slotShowContextMenu(KListView*, TQListViewItem* item, const TQPoint& pos)
+void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQPoint& pos)
{
if (m_contextMenu==0)
{
@@ -1355,7 +1355,7 @@ void UIServer::slotCancelCurrent() {
void UIServer::resizeEvent(TQResizeEvent* e)
{
- KMainWindow::resizeEvent(e);
+ TDEMainWindow::resizeEvent(e);
writeSettings();
}
diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h
index baf495df..c86886ba 100644
--- a/tdeio/misc/uiserver.h
+++ b/tdeio/misc/uiserver.h
@@ -55,7 +55,7 @@ struct ListProgressColumnConfig
* List view in the UIServer.
* @internal
*/
-class TDEIO_EXPORT ListProgress : public KListView {
+class TDEIO_EXPORT ListProgress : public TDEListView {
Q_OBJECT
@@ -214,7 +214,7 @@ class UIServerSystemTray;
*
* @internal
*/
-class TDEIO_EXPORT UIServer : public KMainWindow, public DCOPObject {
+class TDEIO_EXPORT UIServer : public TDEMainWindow, public DCOPObject {
K_DCOP
Q_OBJECT
@@ -382,7 +382,7 @@ protected slots:
void slotJobCanceled( ProgressItem * );
void slotApplyConfig();
- void slotShowContextMenu(KListView*, TQListViewItem *item, const TQPoint& pos);
+ void slotShowContextMenu(TDEListView*, TQListViewItem *item, const TQPoint& pos);
protected:
@@ -396,7 +396,7 @@ protected:
TQTimer* updateTimer;
ListProgress* listProgress;
- KToolBar::BarPosition toolbarPos;
+ TDEToolBar::BarPosition toolbarPos;
TQString properties;
void applySettings();
diff --git a/tdeio/tdefile/ChangeLog b/tdeio/tdefile/ChangeLog
index 79ac5980..ccfb45ab 100644
--- a/tdeio/tdefile/ChangeLog
+++ b/tdeio/tdefile/ChangeLog
@@ -62,7 +62,7 @@ Tue Feb 15 14:21:41 2000 Carsten Pfeiffer <pfeiffer@kde.org>
* kdiroperator.cpp (setSorting):
added setSorting() and sorting() to keep sorting when switching views
- a few cosmetic and KAction changes
+ a few cosmetic and TDEAction changes
Sun Feb 13 00:45:12 2000 Carsten Pfeiffer <pfeiffer@kde.org>
@@ -87,7 +87,7 @@ Fri Feb 11 12:17:59 2000 Carsten Pfeiffer <pfeiffer@kde.org>
Thu Feb 10 17:06:36 2000 Carsten Pfeiffer <pfeiffer@kde.org>
* kdiroperator.cpp (connectView):
- - Now that KToggleAction is fixed, I can commit the new stuff:
+ - Now that TDEToggleAction is fixed, I can commit the new stuff:
Offer Actions for all the common functionality, i.e. sorting, setting
the view, home(), cdUp(), back, forward, etc.
All actions are exposed through a QActionCollection
diff --git a/tdeio/tdefile/NOTES b/tdeio/tdefile/NOTES
index ad99065b..e2037e38 100644
--- a/tdeio/tdefile/NOTES
+++ b/tdeio/tdefile/NOTES
@@ -82,7 +82,7 @@ konqueror versions of the views.
This class inherits KParts::ReadOnlyPart, and provides a BrowserExtension.
It integrates KonqFileManagerWidget as its KParts widget, and provides
-KActions for it.
+TDEActions for it.
Important :
diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp
index 94ee0d4c..01eb8bcb 100644
--- a/tdeio/tdefile/kacleditwidget.cpp
+++ b/tdeio/tdefile/kacleditwidget.cpp
@@ -143,7 +143,7 @@ KACLListViewItem::KACLListViewItem( TQListView* parent,
KACLListView::EntryType _type,
unsigned short _value, bool defaults,
const TQString& _qualifier )
- : KListViewItem( parent, parent->lastItem() ), // we want to append
+ : TDEListViewItem( parent, parent->lastItem() ), // we want to append
type( _type ), value( _value ), isDefault( defaults ),
qualifier( _qualifier ), isPartial( false )
{
@@ -204,7 +204,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg,
mycg.setColor( TQColorGroup::Text, TQColor( 100, 100, 100 ) );
p->setFont( font );
}
- KListViewItem::paintCell( p, mycg, column, width, alignment );
+ TDEListViewItem::paintCell( p, mycg, column, width, alignment );
KACLListViewItem *below =0;
if ( itemBelow() )
@@ -556,7 +556,7 @@ void EditACLEntryDialog::slotSelectionChanged( int id )
KACLListView::KACLListView( TQWidget* parent, const char* name )
- : KListView( parent, name ),
+ : TDEListView( parent, name ),
m_hasMask( false ), m_allowDefaults( false )
{
// Add the columns
@@ -753,7 +753,7 @@ void KACLListView::contentsMousePressEvent( TQMouseEvent * e )
if ( !clickedItem ) return;
// if the click is on an as yet unselected item, select it first
if ( !clickedItem->isSelected() )
- KListView::contentsMousePressEvent( e );
+ TDEListView::contentsMousePressEvent( e );
if ( !currentItem() ) return;
int column = header()->sectionAt( e->x() );
@@ -770,7 +770,7 @@ void KACLListView::contentsMousePressEvent( TQMouseEvent * e )
perm = ACL_EXECUTE;
break;
default:
- return KListView::contentsMousePressEvent( e );
+ return TDEListView::contentsMousePressEvent( e );
}
KACLListViewItem* referenceItem = static_cast<KACLListViewItem*>( clickedItem );
unsigned short referenceHadItSet = referenceItem->value & perm;
diff --git a/tdeio/tdefile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h
index dc7e4c81..9ea5e320 100644
--- a/tdeio/tdefile/kacleditwidget_p.h
+++ b/tdeio/tdefile/kacleditwidget_p.h
@@ -47,7 +47,7 @@ class TQCheckBox;
/**
@author Sean Harmer
*/
-class KACLListView : public KListView
+class KACLListView : public TDEListView
{
Q_OBJECT
@@ -168,7 +168,7 @@ private:
};
-class KACLListViewItem : public KListViewItem
+class KACLListViewItem : public TDEListViewItem
{
public:
KACLListViewItem( TQListView* parent, KACLListView::EntryType type,
diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp
index bc3d4338..ae408c8e 100644
--- a/tdeio/tdefile/kcombiview.cpp
+++ b/tdeio/tdefile/kcombiview.cpp
@@ -319,7 +319,7 @@ void KCombiView::writeConfig( TDEConfig *config, const TQString& group )
right->writeConfig( config, group );
}
-KActionCollection * KCombiView::actionCollection() const
+TDEActionCollection * KCombiView::actionCollection() const
{
return focusView( right )->actionCollection();
}
diff --git a/tdeio/tdefile/kcombiview.h b/tdeio/tdefile/kcombiview.h
index 8da3da3f..995b80ff 100644
--- a/tdeio/tdefile/kcombiview.h
+++ b/tdeio/tdefile/kcombiview.h
@@ -98,7 +98,7 @@ public:
void ensureItemVisible( const KFileItem * );
- virtual KActionCollection * actionCollection() const;
+ virtual TDEActionCollection * actionCollection() const;
virtual void setAcceptDrops(bool b);
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 48c911e3..244e22e8 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -90,7 +90,7 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent)
{
d = new KCustomMenuEditorPrivate;
TQHBox *page = makeHBoxMainWidget();
- m_listView = new KListView(page);
+ m_listView = new TDEListView(page);
m_listView->addColumn(i18n("Menu"));
m_listView->setFullWidth(true);
m_listView->setSorting(-1);
diff --git a/tdeio/tdefile/kcustommenueditor.h b/tdeio/tdefile/kcustommenueditor.h
index 108e9c47..cb43c606 100644
--- a/tdeio/tdefile/kcustommenueditor.h
+++ b/tdeio/tdefile/kcustommenueditor.h
@@ -21,7 +21,7 @@
#include <kdialogbase.h>
-class KListView;
+class TDEListView;
class TDEConfigBase;
/*
@@ -58,7 +58,7 @@ public slots:
protected:
class Item;
- KListView *m_listView;
+ TDEListView *m_listView;
class KCustomMenuEditorPrivate;
KCustomMenuEditorPrivate *d;
diff --git a/tdeio/tdefile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp
index ea3183f7..dcb45766 100644
--- a/tdeio/tdefile/kdiroperator.cpp
+++ b/tdeio/tdefile/kdiroperator.cpp
@@ -87,7 +87,7 @@ public:
TQString lastURL; // used for highlighting a directory on cdUp
bool onlyDoubleClickSelectsFiles;
TQTimer *progressDelayTimer;
- KActionSeparator *viewActionSeparator;
+ TDEActionSeparator *viewActionSeparator;
int dropOptions;
TDEConfig *config;
@@ -192,10 +192,10 @@ void KDirOperator::insertViewDependentActions()
{
if (viewActionCollection)
{
- disconnect( viewActionCollection, TQT_SIGNAL( inserted( KAction * )),
- this, TQT_SLOT( slotViewActionAdded( KAction * )));
- disconnect( viewActionCollection, TQT_SIGNAL( removed( KAction * )),
- this, TQT_SLOT( slotViewActionRemoved( KAction * )));
+ disconnect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )),
+ this, TQT_SLOT( slotViewActionAdded( TDEAction * )));
+ disconnect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )),
+ this, TQT_SLOT( slotViewActionRemoved( TDEAction * )));
}
viewActionMenu->popupMenu()->clear();
@@ -223,24 +223,24 @@ void KDirOperator::insertViewDependentActions()
TQStringList groups = viewActionCollection->groups();
groups.prepend( TQString::null ); // actions without group
TQStringList::ConstIterator git = groups.begin();
- KActionPtrList list;
- KAction *sep = actionCollection()->action("separator");
+ TDEActionPtrList list;
+ TDEAction *sep = actionCollection()->action("separator");
for ( ; git != groups.end(); ++git )
{
if ( git != groups.begin() )
viewActionMenu->insert( sep );
list = viewActionCollection->actions( *git );
- KActionPtrList::ConstIterator it = list.begin();
+ TDEActionPtrList::ConstIterator it = list.begin();
for ( ; it != list.end(); ++it )
viewActionMenu->insert( *it );
}
}
- connect( viewActionCollection, TQT_SIGNAL( inserted( KAction * )),
- TQT_SLOT( slotViewActionAdded( KAction * )));
- connect( viewActionCollection, TQT_SIGNAL( removed( KAction * )),
- TQT_SLOT( slotViewActionRemoved( KAction * )));
+ connect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )),
+ TQT_SLOT( slotViewActionAdded( TDEAction * )));
+ connect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )),
+ TQT_SLOT( slotViewActionRemoved( TDEAction * )));
}
}
@@ -271,7 +271,7 @@ void KDirOperator::setPreviewWidget(const TQWidget *w)
delete myPreview;
myPreview = w;
- KToggleAction *preview = static_cast<KToggleAction*>(myActionCollection->action("preview"));
+ TDEToggleAction *preview = static_cast<TDEToggleAction*>(myActionCollection->action("preview"));
preview->setEnabled( w != 0L );
preview->setChecked( w != 0L );
setView( static_cast<KFile::FileView>(m_viewKind) );
@@ -326,7 +326,7 @@ void KDirOperator::slotDefaultPreview()
m_viewKind = m_viewKind | KFile::PreviewContents;
if ( !myPreview ) {
myPreview = new KFileMetaPreview( this );
- (static_cast<KToggleAction*>( myActionCollection->action("preview") ))->setChecked(true);
+ (static_cast<TDEToggleAction*>( myActionCollection->action("preview") ))->setChecked(true);
}
setView( static_cast<KFile::FileView>(m_viewKind) );
@@ -555,12 +555,12 @@ TDEIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
return 0L;
}
-void KDirOperator::trashSelected(KAction::ActivationReason reason, TQt::ButtonState state)
+void KDirOperator::trashSelected(TDEAction::ActivationReason reason, TQt::ButtonState state)
{
if ( !m_fileView )
return;
- if ( reason == KAction::PopupMenuActivation && ( state & ShiftButton ) ) {
+ if ( reason == TDEAction::PopupMenuActivation && ( state & ShiftButton ) ) {
deleteSelected();
return;
}
@@ -809,7 +809,7 @@ void KDirOperator::setMimeFilter( const TQStringList& mimetypes )
bool KDirOperator::checkPreviewSupport()
{
- KToggleAction *previewAction = static_cast<KToggleAction*>( myActionCollection->action( "preview" ));
+ TDEToggleAction *previewAction = static_cast<TDEToggleAction*>( myActionCollection->action( "preview" ));
bool hasPreviewSupport = false;
TDEConfig *kc = TDEGlobal::config();
@@ -1253,9 +1253,9 @@ void KDirOperator::slotCompletionMatch(const TQString& match)
void KDirOperator::setupActions()
{
- myActionCollection = new KActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
+ myActionCollection = new TDEActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
- actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
+ actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" );
upAction->setText( i18n("Parent Folder") );
backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" );
@@ -1263,33 +1263,33 @@ void KDirOperator::setupActions()
homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" );
homeAction->setText(i18n("Home Folder"));
reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" );
- actionSeparator = new KActionSeparator( myActionCollection, "separator" );
- d->viewActionSeparator = new KActionSeparator( myActionCollection,
+ actionSeparator = new TDEActionSeparator( myActionCollection, "separator" );
+ d->viewActionSeparator = new TDEActionSeparator( myActionCollection,
"viewActionSeparator" );
- mkdirAction = new KAction( i18n("New Folder..."), 0,
+ mkdirAction = new TDEAction( i18n("New Folder..."), 0,
TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" );
- KAction* trash = new KAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
- connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
- this, TQT_SLOT( trashSelected( KAction::ActivationReason, TQt::ButtonState ) ) );
- new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
+ TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
+ connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+ this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+ new TDEAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
mkdirAction->setIcon( TQString::fromLatin1("folder_new") );
reloadAction->setText( i18n("Reload") );
- reloadAction->setShortcut( KStdAccel::shortcut( KStdAccel::Reload ));
+ reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload ));
// the sort menu actions
- sortActionMenu = new KActionMenu( i18n("Sorting"), myActionCollection, "sorting menu");
- byNameAction = new KRadioAction( i18n("By Name"), 0,
+ sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu");
+ byNameAction = new TDERadioAction( i18n("By Name"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ),
myActionCollection, "by name" );
- byDateAction = new KRadioAction( i18n("By Date"), 0,
+ byDateAction = new TDERadioAction( i18n("By Date"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ),
myActionCollection, "by date" );
- bySizeAction = new KRadioAction( i18n("By Size"), 0,
+ bySizeAction = new TDERadioAction( i18n("By Size"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ),
myActionCollection, "by size" );
- reverseAction = new KToggleAction( i18n("Reverse"), 0,
+ reverseAction = new TDEToggleAction( i18n("Reverse"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ),
myActionCollection, "reversed" );
@@ -1299,9 +1299,9 @@ void KDirOperator::setupActions()
bySizeAction->setExclusiveGroup( sortGroup );
- dirsFirstAction = new KToggleAction( i18n("Folders First"), 0,
+ dirsFirstAction = new TDEToggleAction( i18n("Folders First"), 0,
myActionCollection, "dirs first");
- caseInsensitiveAction = new KToggleAction(i18n("Case Insensitive"), 0,
+ caseInsensitiveAction = new TDEToggleAction(i18n("Case Insensitive"), 0,
myActionCollection, "case insensitive" );
connect( dirsFirstAction, TQT_SIGNAL( toggled( bool ) ),
@@ -1312,24 +1312,24 @@ void KDirOperator::setupActions()
// the view menu actions
- viewActionMenu = new KActionMenu( i18n("&View"), myActionCollection, "view menu" );
+ viewActionMenu = new TDEActionMenu( i18n("&View"), myActionCollection, "view menu" );
connect( viewActionMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
TQT_SLOT( insertViewDependentActions() ));
- shortAction = new KRadioAction( i18n("Short View"), "view_multicolumn",
- KShortcut(), myActionCollection, "short view" );
- detailedAction = new KRadioAction( i18n("Detailed View"), "view_detailed",
- KShortcut(), myActionCollection, "detailed view" );
+ shortAction = new TDERadioAction( i18n("Short View"), "view_multicolumn",
+ TDEShortcut(), myActionCollection, "short view" );
+ detailedAction = new TDERadioAction( i18n("Detailed View"), "view_detailed",
+ TDEShortcut(), myActionCollection, "detailed view" );
- showHiddenAction = new KToggleAction( i18n("Show Hidden Files"), KShortcut(),
+ showHiddenAction = new TDEToggleAction( i18n("Show Hidden Files"), TDEShortcut(),
myActionCollection, "show hidden" );
// showHiddenAction->setCheckedState( i18n("Hide Hidden Files") );
- separateDirsAction = new KToggleAction( i18n("Separate Folders"), KShortcut(),
+ separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(),
TQT_TQOBJECT(this),
TQT_SLOT(slotSeparateDirs()),
myActionCollection, "separate dirs" );
- KToggleAction *previewAction = new KToggleAction(i18n("Show Preview"),
- "thumbnail", KShortcut(),
+ TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"),
+ "thumbnail", TDEShortcut(),
myActionCollection,
"preview" );
previewAction->setCheckedState(i18n("Hide Preview"));
@@ -1348,7 +1348,7 @@ void KDirOperator::setupActions()
connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ),
TQT_SLOT( slotToggleHidden( bool ) ));
- new KAction( i18n("Properties"), KShortcut(ALT+Key_Return), TQT_TQOBJECT(this),
+ new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), TQT_TQOBJECT(this),
TQT_SLOT(slotProperties()), myActionCollection, "properties" );
}
@@ -1533,7 +1533,7 @@ void KDirOperator::writeConfig( TDEConfig *kc, const TQString& group )
kc->writeEntry( TQString::fromLatin1("Separate Directories"),
separateDirsAction->isChecked() );
- KToggleAction *previewAction = static_cast<KToggleAction*>(myActionCollection->action("preview"));
+ TDEToggleAction *previewAction = static_cast<TDEToggleAction*>(myActionCollection->action("preview"));
if ( previewAction->isEnabled() ) {
bool hasPreview = previewAction->isChecked();
kc->writeEntry( TQString::fromLatin1("Show Preview"), hasPreview );
@@ -1633,7 +1633,7 @@ void KDirOperator::clearHistory()
forwardAction->setEnabled( false );
}
-void KDirOperator::slotViewActionAdded( KAction *action )
+void KDirOperator::slotViewActionAdded( TDEAction *action )
{
if ( viewActionMenu->popupMenu()->count() == 5 ) // need to add a separator
viewActionMenu->insert( d->viewActionSeparator );
@@ -1641,7 +1641,7 @@ void KDirOperator::slotViewActionAdded( KAction *action )
viewActionMenu->insert( action );
}
-void KDirOperator::slotViewActionRemoved( KAction *action )
+void KDirOperator::slotViewActionRemoved( TDEAction *action )
{
viewActionMenu->remove( action );
diff --git a/tdeio/tdefile/kdiroperator.h b/tdeio/tdefile/kdiroperator.h
index 418bb20c..5d806eee 100644
--- a/tdeio/tdefile/kdiroperator.h
+++ b/tdeio/tdefile/kdiroperator.h
@@ -34,11 +34,11 @@
class TQPopupMenu;
class TQTimer;
-class KAction;
+class TDEAction;
class KDirLister;
-class KToggleAction;
-class KActionSeparator;
-class KActionMenu;
+class TDEToggleAction;
+class TDEActionSeparator;
+class TDEActionMenu;
class TQWidgetStack;
class KProgress;
namespace TDEIO {
@@ -345,7 +345,7 @@ class TDEIO_EXPORT KDirOperator : public TQWidget
/**
* an accessor to a collection of all available Actions. The actions
* are static, they will be there all the time (no need to connect to
- * the signals KActionCollection::inserted() or removed().
+ * the signals TDEActionCollection::inserted() or removed().
*
* There are the following actions:
*
@@ -387,7 +387,7 @@ class TDEIO_EXPORT KDirOperator : public TQWidget
*
* @returns all available Actions
*/
- KActionCollection * actionCollection() const { return myActionCollection; }
+ TDEActionCollection * actionCollection() const { return myActionCollection; }
/**
* Sets the config object and the to be used group in KDirOperator. This
@@ -710,7 +710,7 @@ public slots:
* @since 3.4
*/
// ### KDE4: make virtual
- void trashSelected(KAction::ActivationReason, TQt::ButtonState);
+ void trashSelected(TDEAction::ActivationReason, TQt::ButtonState);
protected slots:
/**
@@ -873,32 +873,32 @@ private:
// actions for the popupmenus
// ### clean up all those -- we have them all in the actionMenu!
- KActionMenu *actionMenu;
-
- KAction *backAction;
- KAction *forwardAction;
- KAction *homeAction;
- KAction *upAction;
- KAction *reloadAction;
- KActionSeparator *actionSeparator;
- KAction *mkdirAction;
-
- KActionMenu *sortActionMenu;
- KRadioAction *byNameAction;
- KRadioAction *byDateAction;
- KRadioAction *bySizeAction;
- KToggleAction *reverseAction;
- KToggleAction *dirsFirstAction;
- KToggleAction *caseInsensitiveAction;
-
- KActionMenu *viewActionMenu;
- KRadioAction *shortAction;
- KRadioAction *detailedAction;
- KToggleAction *showHiddenAction;
- KToggleAction *separateDirsAction;
-
- KActionCollection *myActionCollection;
- KActionCollection *viewActionCollection;
+ TDEActionMenu *actionMenu;
+
+ TDEAction *backAction;
+ TDEAction *forwardAction;
+ TDEAction *homeAction;
+ TDEAction *upAction;
+ TDEAction *reloadAction;
+ TDEActionSeparator *actionSeparator;
+ TDEAction *mkdirAction;
+
+ TDEActionMenu *sortActionMenu;
+ TDERadioAction *byNameAction;
+ TDERadioAction *byDateAction;
+ TDERadioAction *bySizeAction;
+ TDEToggleAction *reverseAction;
+ TDEToggleAction *dirsFirstAction;
+ TDEToggleAction *caseInsensitiveAction;
+
+ TDEActionMenu *viewActionMenu;
+ TDERadioAction *shortAction;
+ TDERadioAction *detailedAction;
+ TDEToggleAction *showHiddenAction;
+ TDEToggleAction *separateDirsAction;
+
+ TDEActionCollection *myActionCollection;
+ TDEActionCollection *viewActionCollection;
private slots:
/**
@@ -926,8 +926,8 @@ private slots:
void slotCanceled();
void slotRedirected( const KURL& );
- void slotViewActionAdded( KAction * );
- void slotViewActionRemoved( KAction * );
+ void slotViewActionAdded( TDEAction * );
+ void slotViewActionRemoved( TDEAction * );
void slotViewSortingChanged( TQDir::SortSpec );
void slotClearView();
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 6a13920f..a540c57e 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -122,10 +122,10 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
TQT_SLOT( slotComboTextChanged( const TQString& ) ));
m_contextMenu = new TQPopupMenu( this );
- KAction* newFolder = new KAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
+ TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
newFolder->plug(m_contextMenu);
m_contextMenu->insertSeparator();
- m_showHiddenFolders = new KToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),
+ m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this));
m_showHiddenFolders->plug(m_contextMenu);
@@ -153,8 +153,8 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
connect( m_treeView, TQT_SIGNAL( currentChanged( TQListViewItem * )),
TQT_SLOT( slotCurrentChanged() ));
- connect( m_treeView, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & )),
- TQT_SLOT( slotContextMenu( KListView *, TQListViewItem *, const TQPoint & )));
+ connect( m_treeView, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )),
+ TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & )));
connect( d->urlCombo, TQT_SIGNAL( activated( const TQString& )),
TQT_SLOT( slotURLActivated( const TQString& )));
@@ -307,7 +307,7 @@ void KDirSelectDialog::accept()
if ( !item->isDir() )
dir = dir.upURL();
- KRecentDirs::add(d->recentDirClass, dir.url());
+ TDERecentDirs::add(d->recentDirClass, dir.url());
}
d->urlCombo->addToHistory( item->url().prettyURL() );
@@ -395,7 +395,7 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text )
}
}
-void KDirSelectDialog::slotContextMenu( KListView *, TQListViewItem *, const TQPoint& pos )
+void KDirSelectDialog::slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint& pos )
{
m_contextMenu->popup( pos );
}
diff --git a/tdeio/tdefile/kdirselectdialog.h b/tdeio/tdefile/kdirselectdialog.h
index 746064c6..400bd323 100644
--- a/tdeio/tdefile/kdirselectdialog.h
+++ b/tdeio/tdefile/kdirselectdialog.h
@@ -29,7 +29,7 @@ class TDEConfig;
class KFileTreeBranch;
class KFileTreeView;
class KFileTreeViewItem;
-class KToggleAction;
+class TDEToggleAction;
/**
* A pretty dialog for a KDirSelect control for selecting directories.
@@ -106,7 +106,7 @@ private slots:
void slotURLActivated( const TQString& );
void slotNextDirToList( KFileTreeViewItem *dirItem );
void slotComboTextChanged( const TQString& text );
- void slotContextMenu( KListView *, TQListViewItem *, const TQPoint & );
+ void slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & );
void slotShowHiddenFoldersToggled();
void slotMkdir();
@@ -118,7 +118,7 @@ private:
KFileTreeView *m_treeView;
TQPopupMenu *m_contextMenu;
- KToggleAction *m_showHiddenFolders;
+ TDEToggleAction *m_showHiddenFolders;
bool m_localOnly;
protected:
diff --git a/tdeio/tdefile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp
index b8c90f6f..569217be 100644
--- a/tdeio/tdefile/kencodingfiledialog.cpp
+++ b/tdeio/tdefile/kencodingfiledialog.cpp
@@ -44,7 +44,7 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin
setOperationMode( type );
- KToolBar *tb = toolBar();
+ TDEToolBar *tb = toolBar();
tb->insertSeparator();
int index = tb->insertCombo(TQStringList(), -1 /*id*/, false /*writable*/, 0 /*signal*/, 0 /*receiver*/, 0 /*slot*/ );
d->encoding = tb->getCombo( tb->idAt( index ) );
@@ -180,7 +180,7 @@ KEncodingFileDialog::Result KEncodingFileDialog::getSaveFileNameAndEncoding(cons
TQString filename = dlg.selectedFile();
if (!filename.isEmpty())
- KRecentDocument::add(filename);
+ TDERecentDocument::add(filename);
Result res;
res.fileNames<<filename;
@@ -204,7 +204,7 @@ KEncodingFileDialog::Result KEncodingFileDialog::getSaveURLAndEncoding(const TQ
KURL url = dlg.selectedURL();
if (url.isValid())
- KRecentDocument::add( url );
+ TDERecentDocument::add( url );
Result res;
res.URLs<<url;
diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index 9bb3210e..ede51d66 100644
--- a/tdeio/tdefile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -195,7 +195,7 @@ namespace KNotify
bool handleAllApps = false );
~KNotifyWidget();
- KListView * eventsView() {
+ TDEListView * eventsView() {
return m_listview;
}
diff --git a/tdeio/tdefile/knotifywidgetbase.ui b/tdeio/tdefile/knotifywidgetbase.ui
index d3c3103f..023da77d 100644
--- a/tdeio/tdefile/knotifywidgetbase.ui
+++ b/tdeio/tdefile/knotifywidgetbase.ui
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string></string>
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 69148773..8582e31f 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -69,7 +69,7 @@
// ----------------------------------------------------------------------
-KAppTreeListItem::KAppTreeListItem( KListView* parent, const TQString & name,
+KAppTreeListItem::KAppTreeListItem( TDEListView* parent, const TQString & name,
const TQPixmap& pixmap, bool parse, bool dir, const TQString &p, const TQString &c )
: TQListViewItem( parent, name )
{
@@ -145,7 +145,7 @@ bool KAppTreeListItem::isDirectory()
// ----------------------------------------------------------------------
TDEApplicationTree::TDEApplicationTree( TQWidget *parent )
- : KListView( parent ), currentitem(0)
+ : TDEListView( parent ), currentitem(0)
{
addColumn( i18n("Known Applications") );
setRootIsDecorated( true );
@@ -281,7 +281,7 @@ void TDEApplicationTree::resizeEvent( TQResizeEvent * e)
{
setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)
-2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth));
- KListView::resizeEvent(e);
+ TDEListView::resizeEvent(e);
}
// Prune empty directories from the tree
diff --git a/tdeio/tdefile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h
index 8231da27..ca9317fb 100644
--- a/tdeio/tdefile/kopenwith_p.h
+++ b/tdeio/tdefile/kopenwith_p.h
@@ -51,7 +51,7 @@ protected:
void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString &_path, const TQString &exec);
public:
- KAppTreeListItem( KListView* parent, const TQString & name, const TQPixmap& pixmap,
+ KAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap,
bool parse, bool dir, const TQString &p, const TQString &c );
KAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap,
bool parse, bool dir, const TQString &p, const TQString &c );
@@ -69,7 +69,7 @@ protected:
/**
* @internal
*/
-class TDEApplicationTree : public KListView
+class TDEApplicationTree : public TDEListView
{
Q_OBJECT
public:
diff --git a/tdeio/tdefile/kpropertiesdesktopbase.ui b/tdeio/tdefile/kpropertiesdesktopbase.ui
index a0894dc7..9c08eef9 100644
--- a/tdeio/tdefile/kpropertiesdesktopbase.ui
+++ b/tdeio/tdefile/kpropertiesdesktopbase.ui
@@ -52,7 +52,7 @@
&lt;p&gt;If you want to associate this application with one or more mimetypes that are not in this list, click on the button &lt;b&gt;Add&lt;/b&gt; below. If there are one or more filetypes that this application cannot handle, you may want to remove them from the list clicking on the button &lt;b&gt;Remove&lt;/b&gt; below.&lt;/p&gt;&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="KListView" row="7" column="0" rowspan="1" colspan="7">
+ <widget class="TDEListView" row="7" column="0" rowspan="1" colspan="7">
<column>
<property name="text">
<string>Mimetype</string>
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 0e9f125a..fdbef4fe 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -498,7 +498,7 @@ void KPropertiesDialog::insertPages()
insertPlugin (p);
}
- if ( kapp->authorizeKAction("sharefile") &&
+ if ( kapp->authorizeTDEAction("sharefile") &&
KFileSharePropsPlugin::supports( m_items ) )
{
KPropsDlgPlugin *p = new KFileSharePropsPlugin( this );
@@ -953,7 +953,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFileType() ));
- if (!kapp->authorizeKAction("editfiletype"))
+ if (!kapp->authorizeTDEAction("editfiletype"))
button->hide();
#endif
diff --git a/tdeio/tdefile/kpropertiesmimetypebase.ui b/tdeio/tdefile/kpropertiesmimetypebase.ui
index df7c796d..257eaa57 100644
--- a/tdeio/tdefile/kpropertiesmimetypebase.ui
+++ b/tdeio/tdefile/kpropertiesmimetypebase.ui
@@ -30,7 +30,7 @@
<cstring>listView</cstring>
</property>
</widget>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Mimetype</string>
diff --git a/tdeio/tdefile/krecentdirs.cpp b/tdeio/tdefile/krecentdirs.cpp
index 6f4a01f3..0d8d008b 100644
--- a/tdeio/tdefile/krecentdirs.cpp
+++ b/tdeio/tdefile/krecentdirs.cpp
@@ -69,7 +69,7 @@ static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool
return config;
}
-TQStringList KRecentDirs::list(const TQString &fileClass)
+TQStringList TDERecentDirs::list(const TQString &fileClass)
{
TQString key = fileClass;
TQStringList result;
@@ -77,13 +77,13 @@ TQStringList KRecentDirs::list(const TQString &fileClass)
return result;
}
-TQString KRecentDirs::dir(const TQString &fileClass)
+TQString TDERecentDirs::dir(const TQString &fileClass)
{
TQStringList result = list(fileClass);
return result[0];
}
-void KRecentDirs::add(const TQString &fileClass, const TQString &directory)
+void TDERecentDirs::add(const TQString &fileClass, const TQString &directory)
{
TQString key = fileClass;
TQStringList result;
diff --git a/tdeio/tdefile/krecentdirs.h b/tdeio/tdefile/krecentdirs.h
index 774655e5..cc9be16b 100644
--- a/tdeio/tdefile/krecentdirs.h
+++ b/tdeio/tdefile/krecentdirs.h
@@ -47,7 +47,7 @@
* a single ':' the file-class is specific to the current application.
* If the file-class starts with '::' it is global to all applications.
*/
-class TDEIO_EXPORT KRecentDirs
+class TDEIO_EXPORT TDERecentDirs
{
public:
/**
diff --git a/tdeio/tdefile/krecentdocument.cpp b/tdeio/tdefile/krecentdocument.cpp
index 1ec4a98c..85af01c4 100644
--- a/tdeio/tdefile/krecentdocument.cpp
+++ b/tdeio/tdefile/krecentdocument.cpp
@@ -42,13 +42,13 @@
#include <sys/types.h>
#include <utime.h>
-TQString KRecentDocument::recentDocumentDirectory()
+TQString TDERecentDocument::recentDocumentDirectory()
{
// need to change this path, not sure where
return locateLocal("data", TQString::fromLatin1("RecentDocuments/"));
}
-TQStringList KRecentDocument::recentDocuments()
+TQStringList TDERecentDocument::recentDocuments()
{
TQDir d(recentDocumentDirectory(), "*.desktop", TQDir::Time,
TQDir::Files | TQDir::Readable | TQDir::Hidden);
@@ -72,12 +72,12 @@ TQStringList KRecentDocument::recentDocuments()
return fullList;
}
-void KRecentDocument::add(const KURL& url)
+void TDERecentDocument::add(const KURL& url)
{
- KRecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename!
+ TDERecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename!
}
-void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
+void TDERecentDocument::add(const KURL& url, const TQString& desktopEntryName)
{
if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/"))
return;
@@ -85,7 +85,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
TQString openStr = url.url();
openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded
- kdDebug(250) << "KRecentDocument::add for " << openStr << endl;
+ kdDebug(250) << "TDERecentDocument::add for " << openStr << endl;
TDEConfig *config = TDEGlobal::config();
TQString oldGrp = config->group();
config->setGroup(TQString::fromLatin1("RecentDocuments"));
@@ -148,7 +148,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
conf.writeEntry( TQString::fromLatin1("Icon"), KMimeType::iconForURL( url ) );
}
-void KRecentDocument::add(const TQString &openStr, bool isUrl)
+void TDERecentDocument::add(const TQString &openStr, bool isUrl)
{
if( isUrl ) {
add( KURL( openStr ) );
@@ -159,7 +159,7 @@ void KRecentDocument::add(const TQString &openStr, bool isUrl)
}
}
-void KRecentDocument::clear()
+void TDERecentDocument::clear()
{
TQStringList list = recentDocuments();
TQDir dir;
@@ -167,7 +167,7 @@ void KRecentDocument::clear()
dir.remove(*it);
}
-int KRecentDocument::maximumItems()
+int TDERecentDocument::maximumItems()
{
TDEConfig *config = TDEGlobal::config();
TDEConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
diff --git a/tdeio/tdefile/krecentdocument.h b/tdeio/tdefile/krecentdocument.h
index 96855996..b788c0dc 100644
--- a/tdeio/tdefile/krecentdocument.h
+++ b/tdeio/tdefile/krecentdocument.h
@@ -47,7 +47,7 @@
*
* @author Daniel M. Duley <mosfet@kde.org>
*/
-class TDEIO_EXPORT KRecentDocument
+class TDEIO_EXPORT TDERecentDocument
{
public:
diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index e142845e..2642926a 100644
--- a/tdeio/tdefile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -406,7 +406,7 @@ void KURLBar::setListBox( KURLBarListBox *view )
m_listBox->resize( width(), height() );
}
- m_listBox->setSelectionMode( KListBox::Single );
+ m_listBox->setSelectionMode( TDEListBox::Single );
paletteChange( palette() );
m_listBox->setFocusPolicy( TQ_TabFocus );
@@ -829,7 +829,7 @@ bool KURLBar::editItem( KURLBarItem *item )
KURLBarListBox::KURLBarListBox( TQWidget *parent, const char *name )
- : KListBox( parent, name )
+ : TDEListBox( parent, name )
{
m_toolTip = new KURLBarToolTip( this );
setAcceptDrops( true );
@@ -1043,7 +1043,7 @@ void KURLBar::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
void KURLBarListBox::virtual_hook( int id, void* data )
-{ KListBox::virtual_hook( id, data ); }
+{ TDEListBox::virtual_hook( id, data ); }
#include "kurlbar.moc"
diff --git a/tdeio/tdefile/kurlbar.h b/tdeio/tdefile/kurlbar.h
index 32c05ec5..7470ec82 100644
--- a/tdeio/tdefile/kurlbar.h
+++ b/tdeio/tdefile/kurlbar.h
@@ -483,14 +483,14 @@ class TQDragObject;
class KURLBarToolTip;
/**
- * This is the listbox used in KURLBar. It is a subclass of KListBox to support
+ * This is the listbox used in KURLBar. It is a subclass of TDEListBox to support
* drag & drop and to set up the row / column mode.
*
* The widget has just one row or one column, depending on orientation().
*
* @author Carsten Pfeiffer <pfeiffer@kde.org>
*/
-class TDEIO_EXPORT KURLBarListBox : public KListBox
+class TDEIO_EXPORT KURLBarListBox : public TDEListBox
{
Q_OBJECT
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index cca8c052..88b34ea6 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -226,8 +226,8 @@ void KURLRequester::init()
myCompletion = new KURLCompletion();
d->setCompletionObject( myCompletion );
- KAccel *accel = new KAccel( this );
- accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() ));
+ TDEAccel *accel = new TDEAccel( this );
+ accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() ));
accel->readSettings();
}
diff --git a/tdeio/tdefile/kurlrequester.h b/tdeio/tdefile/kurlrequester.h
index 55bc0fd8..5655efa5 100644
--- a/tdeio/tdefile/kurlrequester.h
+++ b/tdeio/tdefile/kurlrequester.h
@@ -269,7 +269,7 @@ private:
protected slots:
/**
* Called when the button is pressed to open the filedialog.
- * Also called when KStdAccel::Open (default is Ctrl-O) is pressed.
+ * Also called when TDEStdAccel::Open (default is Ctrl-O) is pressed.
*/
void slotOpenDialog();
diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index 7524ea14..2459f984 100644
--- a/tdeio/tdefile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -115,7 +115,7 @@ KURL KURLRequesterDlg::getURL(const TQString& dir, TQWidget *parent,
const KURL& url = dlg.selectedURL();
if (url.isValid())
- KRecentDocument::add(url);
+ TDERecentDocument::add(url);
return url;
}
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp
index ea97b866..ef1f2a37 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.cpp
+++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp
@@ -32,7 +32,7 @@ KFileBookmarkHandler::KFileBookmarkHandler( KFileDialog *dialog )
KBookmarkOwner(),
m_dialog( dialog )
{
- m_menu = new KPopupMenu( dialog, "bookmark menu" );
+ m_menu = new TDEPopupMenu( dialog, "bookmark menu" );
TQString file = locate( "data", "tdefile/bookmarks.xml" );
if ( file.isEmpty() )
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.h b/tdeio/tdefile/tdefilebookmarkhandler.h
index 6535bf96..e13e0673 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.h
+++ b/tdeio/tdefile/tdefilebookmarkhandler.h
@@ -23,7 +23,7 @@
#include <kbookmarkmenu.h>
class TQTextStream;
-class KPopupMenu;
+class TDEPopupMenu;
class TDEIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner
@@ -40,7 +40,7 @@ public:
virtual void openBookmarkURL( const TQString& url ) { emit openURL( url ); }
virtual TQString currentURL() const;
- KPopupMenu *menu() const { return m_menu; }
+ TDEPopupMenu *menu() const { return m_menu; }
signals:
void openURL( const TQString& url );
@@ -49,7 +49,7 @@ private:
void importOldBookmarks( const TQString& path, KBookmarkManager *manager );
KFileDialog *m_dialog;
- KPopupMenu *m_menu;
+ TDEPopupMenu *m_menu;
KBookmarkMenu *m_bookmarkMenu;
protected:
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index b989104e..68691bf6 100644
--- a/tdeio/tdefile/tdefiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -56,7 +56,7 @@ public:
};
KFileDetailView::KFileDetailView(TQWidget *parent, const char *name)
- : KListView(parent, name), KFileView(), d(new KFileDetailViewPrivate())
+ : TDEListView(parent, name), KFileView(), d(new KFileDetailViewPrivate())
{
// this is always the static section, not the index depending on column order
m_sortingCol = COL_NAME;
@@ -149,7 +149,7 @@ void KFileDetailView::setSelected( const KFileItem *info, bool enable )
KFileListViewItem *item = (KFileListViewItem*)info->extraData( this );
if ( item )
- KListView::setSelected( item, enable );
+ TDEListView::setSelected( item, enable );
}
void KFileDetailView::setCurrentItem( const KFileItem *item )
@@ -158,7 +158,7 @@ void KFileDetailView::setCurrentItem( const KFileItem *item )
return;
KFileListViewItem *it = (KFileListViewItem*) item->extraData( this );
if ( it )
- KListView::setCurrentItem( it );
+ TDEListView::setCurrentItem( it );
}
KFileItem * KFileDetailView::currentFileItem() const
@@ -172,7 +172,7 @@ KFileItem * KFileDetailView::currentFileItem() const
void KFileDetailView::clearSelection()
{
- KListView::clearSelection();
+ TDEListView::clearSelection();
}
void KFileDetailView::selectAll()
@@ -181,12 +181,12 @@ void KFileDetailView::selectAll()
KFileView::selectionMode() == KFile::Single)
return;
- KListView::selectAll( true );
+ TDEListView::selectAll( true );
}
void KFileDetailView::invertSelection()
{
- KListView::invertSelection();
+ TDEListView::invertSelection();
}
void KFileDetailView::slotActivateMenu (TQListViewItem *item,const TQPoint& pos )
@@ -202,7 +202,7 @@ void KFileDetailView::slotActivateMenu (TQListViewItem *item,const TQPoint& pos
void KFileDetailView::clearView()
{
m_resolver->m_lstPendingMimeIconItems.clear();
- KListView::clear();
+ TDEListView::clear();
}
void KFileDetailView::insertItem( KFileItem *i )
@@ -415,8 +415,8 @@ void KFileDetailView::slotSortingChanged( int col )
}
}
- KListView::setSorting( m_sortingCol, !reversed );
- KListView::sort();
+ TDEListView::setSorting( m_sortingCol, !reversed );
+ TDEListView::sort();
if ( !m_blockSortingSignal )
sig->changeSorting( static_cast<TQDir::SortSpec>( sortSpec ) );
@@ -459,7 +459,7 @@ void KFileDetailView::ensureItemVisible( const KFileItem *i )
KFileListViewItem *item = (KFileListViewItem*) i->extraData( this );
if ( item )
- KListView::ensureItemVisible( item );
+ TDEListView::ensureItemVisible( item );
}
// we're in multiselection mode
@@ -504,7 +504,7 @@ KFileItem * KFileDetailView::prevItem( const KFileItem *fileItem ) const
void KFileDetailView::keyPressEvent( TQKeyEvent *e )
{
- KListView::keyPressEvent( e );
+ TDEListView::keyPressEvent( e );
if ( e->key() == Key_Return || e->key() == Key_Enter ) {
if ( e->state() & ControlButton )
@@ -680,7 +680,7 @@ void KFileListViewItem::init()
void KFileDetailView::virtual_hook( int id, void* data )
-{ KListView::virtual_hook( id, data );
+{ TDEListView::virtual_hook( id, data );
KFileView::virtual_hook( id, data ); }
#include "tdefiledetailview.moc"
diff --git a/tdeio/tdefile/tdefiledetailview.h b/tdeio/tdefile/tdefiledetailview.h
index 0f17b3ca..1e2d19a6 100644
--- a/tdeio/tdefile/tdefiledetailview.h
+++ b/tdeio/tdefile/tdefiledetailview.h
@@ -34,12 +34,12 @@ class TQKeyEvent;
* An item for the listiew, that has a reference to its corresponding
* KFileItem.
*/
-class TDEIO_EXPORT KFileListViewItem : public KListViewItem
+class TDEIO_EXPORT KFileListViewItem : public TDEListViewItem
{
public:
KFileListViewItem( TQListView *parent, const TQString &text,
const TQPixmap &icon, KFileItem *fi )
- : KListViewItem( parent, text ), inf( fi ) {
+ : TDEListViewItem( parent, text ), inf( fi ) {
setPixmap( 0, icon );
setText( 0, text );
}
@@ -48,14 +48,14 @@ public:
* @since 3.1
*/
KFileListViewItem( TQListView *parent, KFileItem *fi )
- : KListViewItem( parent ), inf( fi ) {
+ : TDEListViewItem( parent ), inf( fi ) {
init();
}
KFileListViewItem( TQListView *parent, const TQString &text,
const TQPixmap &icon, KFileItem *fi,
TQListViewItem *after)
- : KListViewItem( parent, after ), inf( fi ) {
+ : TDEListViewItem( parent, after ), inf( fi ) {
setPixmap( 0, icon );
setText( 0, text );
}
@@ -106,7 +106,7 @@ private:
* @see KCombiView
* @see KFileIconView
*/
-class TDEIO_EXPORT KFileDetailView : public KListView, public KFileView
+class TDEIO_EXPORT KFileDetailView : public TDEListView, public KFileView
{
Q_OBJECT
@@ -193,9 +193,9 @@ private slots:
void slotAutoOpen();
private:
- virtual void insertItem(TQListViewItem *i) { KListView::insertItem(i); }
- virtual void setSorting(int i, bool b) { KListView::setSorting(i, b); }
- virtual void setSelected(TQListViewItem *i, bool b) { KListView::setSelected(i, b); }
+ virtual void insertItem(TQListViewItem *i) { TDEListView::insertItem(i); }
+ virtual void setSorting(int i, bool b) { TDEListView::setSorting(i, b); }
+ virtual void setSelected(TQListViewItem *i, bool b) { TDEListView::setSelected(i, b); }
inline KFileListViewItem * viewItem( const KFileItem *item ) const {
if ( item )
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 4fb39971..f60692c8 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -153,7 +153,7 @@ struct KFileDialogPrivate
bool hasDefaultFilter :1; // necessary for the operationMode
KFileDialog::OperationMode operationMode;
- // The file class used for KRecentDirs
+ // The file class used for TDERecentDirs
TQString fileClass;
KFileBookmarkHandler *bookmarkHandler;
@@ -648,7 +648,7 @@ void KFileDialog::accept()
*lastDirectory = ops->url();
if (!d->fileClass.isEmpty())
- KRecentDirs::add(d->fileClass, ops->url().url());
+ TDERecentDirs::add(d->fileClass, ops->url().url());
// clear the topmost item, we insert it as full path later on as item 1
locationEdit->changeItem( TQString::null, 0 );
@@ -832,7 +832,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
d->urlBar = 0; // delayed loading
TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
- toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true);
+ toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true);
toolbar->setFlat(true);
tqInstallMsgHandler( oldHandler );
@@ -905,7 +905,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
ops->setupMenu(KDirOperator::SortActions |
KDirOperator::FileActions |
KDirOperator::ViewActions);
- KActionCollection *coll = ops->actionCollection();
+ TDEActionCollection *coll = ops->actionCollection();
// plug nav items into the toolbar
coll->action( "up" )->plug( toolbar );
@@ -922,19 +922,19 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
coll->action( "mkdir" )->plug( toolbar );
coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new folder."));
- KToggleAction *showSidebarAction =
- new KToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar");
+ TDEToggleAction *showSidebarAction =
+ new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar");
showSidebarAction->setCheckedState(i18n("Hide Quick Access Navigation Panel"));
connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ),
TQT_SLOT( toggleSpeedbar( bool )) );
- KToggleAction *showBookmarksAction =
- new KToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks");
+ TDEToggleAction *showBookmarksAction =
+ new TDEToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks");
showBookmarksAction->setCheckedState(i18n("Hide Bookmarks"));
connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ),
TQT_SLOT( toggleBookmarks( bool )) );
- KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" );
+ TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" );
menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. "
"Various options can be accessed from this menu including: <ul>"
"<li>how files are sorted in the list</li>"
@@ -965,15 +965,15 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
menu->plug( toolbar );
//Insert a separator.
- KToolBarSeparator* spacerWidget = new KToolBarSeparator(Qt::Horizontal, false /*no line*/,
+ TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(Qt::Horizontal, false /*no line*/,
toolbar);
d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget);
toolbar->insertWidget(PATH_COMBO, 0, d->pathCombo);
toolbar->setItemAutoSized (PATH_COMBO);
- toolbar->setIconText(KToolBar::IconOnly);
- toolbar->setBarPos(KToolBar::Top);
+ toolbar->setIconText(TDEToolBar::IconOnly);
+ toolbar->setBarPos(TDEToolBar::Top);
toolbar->setMovingEnabled(false);
toolbar->adjustSize();
@@ -1609,7 +1609,7 @@ TQString KFileDialog::getSaveFileName(const TQString& dir, const TQString& filte
TQString filename = dlg.selectedFile();
if (!filename.isEmpty())
- KRecentDocument::add(filename);
+ TDERecentDocument::add(filename);
return filename;
}
@@ -1638,7 +1638,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi
TQString filename = dlg.selectedFile();
if (!filename.isEmpty())
- KRecentDocument::add(filename);
+ TDERecentDocument::add(filename);
return filename;
}
@@ -1658,7 +1658,7 @@ KURL KFileDialog::getSaveURL(const TQString& dir, const TQString& filter,
KURL url = dlg.selectedURL();
if (url.isValid())
- KRecentDocument::add( url );
+ TDERecentDocument::add( url );
return url;
}
@@ -2189,7 +2189,7 @@ void KFileDialog::addToRecentDocuments()
TQStringList files = selectedFiles();
TQStringList::ConstIterator it = files.begin();
for ( ; it != files.end(); ++it )
- KRecentDocument::add( *it );
+ TDERecentDocument::add( *it );
}
else { // urls
@@ -2197,12 +2197,12 @@ void KFileDialog::addToRecentDocuments()
KURL::List::ConstIterator it = urls.begin();
for ( ; it != urls.end(); ++it ) {
if ( (*it).isValid() )
- KRecentDocument::add( *it );
+ TDERecentDocument::add( *it );
}
}
}
-KActionCollection * KFileDialog::actionCollection() const
+TDEActionCollection * KFileDialog::actionCollection() const
{
return ops->actionCollection();
}
@@ -2251,7 +2251,7 @@ void KFileDialog::toggleSpeedbar( bool show )
ops->actionCollection()->action( "home" )->plug( toolbar, 3 );
}
- static_cast<KToggleAction *>(actionCollection()->action("toggleSpeedbar"))->setChecked( show );
+ static_cast<TDEToggleAction *>(actionCollection()->action("toggleSpeedbar"))->setChecked( show );
}
void KFileDialog::toggleBookmarks(bool show)
@@ -2286,7 +2286,7 @@ void KFileDialog::toggleBookmarks(bool show)
toolbar->removeItem(HOTLIST_BUTTON);
}
- static_cast<KToggleAction *>(actionCollection()->action("toggleBookmarks"))->setChecked( show );
+ static_cast<TDEToggleAction *>(actionCollection()->action("toggleBookmarks"))->setChecked( show );
}
int KFileDialog::pathComboIndex()
@@ -2318,7 +2318,7 @@ KURL KFileDialog::getStartURL( const TQString& startDir,
if (startDir[0] == ':')
{
recentDirClass = startDir;
- ret = KURL::fromPathOrURL( KRecentDirs::dir(recentDirClass) );
+ ret = KURL::fromPathOrURL( TDERecentDirs::dir(recentDirClass) );
}
else
{
diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h
index ae591b21..b7310b59 100644
--- a/tdeio/tdefile/tdefiledialog.h
+++ b/tdeio/tdefile/tdefiledialog.h
@@ -40,7 +40,7 @@ class TQLabel;
class TQPopupMenu;
class TQVBoxLayout;
-class KActionCollection;
+class TDEActionCollection;
class KDirOperator;
class KURLBar;
class KURLComboBox;
@@ -48,7 +48,7 @@ class KFileFilterCombo;
class KFileView;
class KFileItem;
class KPushButton;
-class KToolBar;
+class TDEToolBar;
class KPreviewWidgetBase;
struct KFileDialogPrivate;
@@ -713,13 +713,13 @@ public:
* You can use this to insert custom
* items into it, e.g.:
* \code
- * yourAction = new KAction( i18n("Your Action"), 0,
+ * yourAction = new TDEAction( i18n("Your Action"), 0,
* this, TQT_SLOT( yourSlot() ),
* this, "action name" );
* yourAction->plug( tdefileDialog->toolBar() );
* \endcode
*/
- KToolBar *toolBar() const { return toolbar; }
+ TDEToolBar *toolBar() const { return toolbar; }
/**
* @returns a pointer to the OK-Button in the filedialog. You may use it
@@ -752,9 +752,9 @@ public:
/**
* @returns a pointer to the action collection, holding all the used
- * KActions.
+ * TDEActions.
*/
- KActionCollection *actionCollection() const;
+ TDEActionCollection *actionCollection() const;
/**
* @returns the index of the path combobox so when inserting widgets into
@@ -769,7 +769,7 @@ public:
* @param startDir A url/directory, to be used. May use the ':' and '::' syntax
* as documented in the KFileDialog() constructor.
* @param recentDirClass If the ':' or '::' syntax is used, recentDirClass
- * will contain the string to be used later for KRecentDir::dir()
+ * will contain the string to be used later for TDERecentDir::dir()
* @return The URL that should be listed by default (e.g. by KFileDialog or
* KDirSelectDialog).
* @since 3.1
@@ -820,7 +820,7 @@ signals:
void filterChanged( const TQString& filter );
protected:
- KToolBar *toolbar;
+ TDEToolBar *toolbar;
static KURL *lastDirectory;
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index 47436404..d4237389 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -60,12 +60,12 @@ public:
noArrangement = false;
ignoreMaximumSize = false;
- smallColumns = new KRadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent),
+ smallColumns = new TDERadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent),
TQT_SLOT( slotSmallColumns() ),
parent->actionCollection(),
"small columns" );
- largeRows = new KRadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent),
+ largeRows = new TDERadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent),
TQT_SLOT( slotLargeRows() ),
parent->actionCollection(),
"large rows" );
@@ -73,7 +73,7 @@ public:
smallColumns->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
largeRows->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
- previews = new KToggleAction( i18n("Thumbnail Previews"), 0,
+ previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0,
parent->actionCollection(),
"show previews" );
zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ),
@@ -99,9 +99,9 @@ public:
job->kill();
}
- KRadioAction *smallColumns, *largeRows;
- KAction *zoomIn, *zoomOut;
- KToggleAction *previews;
+ TDERadioAction *smallColumns, *largeRows;
+ TDEAction *zoomIn, *zoomOut;
+ TDEToggleAction *previews;
TDEIO::PreviewJob *job;
KFileIconViewItem *dropItem;
TQTimer previewTimer;
diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index 4e936536..4b336afe 100644
--- a/tdeio/tdefile/tdefilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -254,7 +254,7 @@ KFileItem * KFilePreview::prevItem( const KFileItem *item ) const
return left->prevItem( item );
}
-KActionCollection * KFilePreview::actionCollection() const
+TDEActionCollection * KFilePreview::actionCollection() const
{
if ( left )
return left->actionCollection();
diff --git a/tdeio/tdefile/tdefilepreview.h b/tdeio/tdefile/tdefilepreview.h
index 5bc59dba..16cfa281 100644
--- a/tdeio/tdefile/tdefilepreview.h
+++ b/tdeio/tdefile/tdefilepreview.h
@@ -89,10 +89,10 @@ public:
/**
* This overrides KFileView::actionCollection() by returning
* the actionCollection() of the KFileView (member left) it contains.
- * This means that KFilePreview will never create a KActionCollection
+ * This means that KFilePreview will never create a TDEActionCollection
* object of its own.
*/
- virtual KActionCollection * actionCollection() const;
+ virtual TDEActionCollection * actionCollection() const;
void ensureItemVisible(const KFileItem *);
diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index 480c58ec..fd7d630e 100644
--- a/tdeio/tdefile/tdefiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -40,12 +40,12 @@
#include "tdefiletreeviewitem.h"
KFileTreeView::KFileTreeView( TQWidget *parent, const char *name )
- : KListView( parent, name ),
+ : TDEListView( parent, name ),
m_wantOpenFolderPixmaps( true ),
m_toolTip( this )
{
setDragEnabled(true);
- setSelectionModeExt( KListView::Single );
+ setSelectionModeExt( TDEListView::Single );
m_animationTimer = new TQTimer( this );
connect( m_animationTimer, TQT_SIGNAL( timeout() ),
@@ -235,8 +235,8 @@ bool KFileTreeView::acceptDrag(TQDropEvent* e ) const
// kdDebug(250) << "canDecode: " << KURLDrag::canDecode(e) << endl;
// kdDebug(250) << "action: " << e->action() << endl;
- /* KListView::acceptDrag(e); */
- /* this is what KListView does:
+ /* TDEListView::acceptDrag(e); */
+ /* this is what TDEListView does:
* acceptDrops() && itemsMovable() && (e->source()==viewport());
* ask acceptDrops and itemsMovable, but not the third
*/
@@ -672,6 +672,6 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & )
}
void KFileTreeView::virtual_hook( int id, void* data )
-{ KListView::virtual_hook( id, data ); }
+{ TDEListView::virtual_hook( id, data ); }
#include "tdefiletreeview.moc"
diff --git a/tdeio/tdefile/tdefiletreeview.h b/tdeio/tdefile/tdefiletreeview.h
index 11d69528..3d6e039f 100644
--- a/tdeio/tdefile/tdefiletreeview.h
+++ b/tdeio/tdefile/tdefiletreeview.h
@@ -63,7 +63,7 @@ private:
* 3. retrieve the root item with KFileTreeBranch::root() and set it open
* if desired. That starts the listing.
*/
-class TDEIO_EXPORT KFileTreeView : public KListView
+class TDEIO_EXPORT KFileTreeView : public TDEListView
{
Q_OBJECT
public:
diff --git a/tdeio/tdefile/tdefiletreeviewitem.cpp b/tdeio/tdefile/tdefiletreeviewitem.cpp
index 4df2daaa..3f7e5a48 100644
--- a/tdeio/tdefile/tdefiletreeviewitem.cpp
+++ b/tdeio/tdefile/tdefiletreeviewitem.cpp
@@ -29,7 +29,7 @@
KFileTreeViewItem::KFileTreeViewItem( KFileTreeViewItem *parent,
KFileItem* item,
KFileTreeBranch *brnch )
- : KListViewItem( parent ),
+ : TDEListViewItem( parent ),
m_tdefileitem( item ),
m_branch( brnch ),
m_wasListed(false)
@@ -42,7 +42,7 @@ KFileTreeViewItem::KFileTreeViewItem( KFileTreeViewItem *parent,
KFileTreeViewItem::KFileTreeViewItem( KFileTreeView* parent,
KFileItem* item,
KFileTreeBranch *brnch )
- :KListViewItem( (TQListView*)parent ),
+ :TDEListViewItem( (TQListView*)parent ),
m_tdefileitem(item ),
m_branch( brnch ),
m_wasListed(false)
diff --git a/tdeio/tdefile/tdefiletreeviewitem.h b/tdeio/tdefile/tdefiletreeviewitem.h
index 8fdb2789..4455bff7 100644
--- a/tdeio/tdefile/tdefiletreeviewitem.h
+++ b/tdeio/tdefile/tdefiletreeviewitem.h
@@ -37,7 +37,7 @@ class KFileTreeItem;
/**
* An item for a KFileTreeView that knows about its own KFileItem.
*/
-class TDEIO_EXPORT KFileTreeViewItem : public KListViewItem
+class TDEIO_EXPORT KFileTreeViewItem : public TDEListViewItem
{
public:
KFileTreeViewItem( KFileTreeViewItem*, KFileItem*, KFileTreeBranch * );
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index 558053cc..01bc5e6b 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -55,7 +55,7 @@ public:
}
}
- TQGuardedPtr<KActionCollection> actions;
+ TQGuardedPtr<TDEActionCollection> actions;
int dropOptions;
};
@@ -362,10 +362,10 @@ void KFileView::listingCompleted()
// empty default impl.
}
-KActionCollection * KFileView::actionCollection() const
+TDEActionCollection * KFileView::actionCollection() const
{
if ( !d->actions )
- d->actions = new KActionCollection( widget(), "KFileView::d->actions" );
+ d->actions = new TDEActionCollection( widget(), "KFileView::d->actions" );
return d->actions;
}
diff --git a/tdeio/tdefile/tdefileview.h b/tdeio/tdefile/tdefileview.h
index 79aa1b47..b80c16f0 100644
--- a/tdeio/tdefile/tdefileview.h
+++ b/tdeio/tdefile/tdefileview.h
@@ -23,7 +23,7 @@
#define TDEFILEVIEW_H
class TQPoint;
-class KActionCollection;
+class TDEActionCollection;
#include <tqwidget.h>
@@ -342,7 +342,7 @@ public:
* add its actions here (if it has any) to make them available to
* e.g. the KDirOperator's popup-menu.
*/
- virtual KActionCollection * actionCollection() const;
+ virtual TDEActionCollection * actionCollection() const;
KFileViewSignaler * signaler() const { return sig; }
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index b74468fd..008edb82 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -33,7 +33,7 @@
#include "tdefiletreeviewtest.moc"
-testFrame::testFrame():KMainWindow(0,"Test FileTreeView"),
+testFrame::testFrame():TDEMainWindow(0,"Test FileTreeView"),
dirOnlyMode(false)
{
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.h b/tdeio/tdefile/tests/tdefiletreeviewtest.h
index 05f41fcf..0375f8d1 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.h
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.h
@@ -20,7 +20,7 @@
#ifndef TDEFILETREEVIEWTEST
#define TDEFILETREEVIEWTEST
-class testFrame: public KMainWindow
+class testFrame: public TDEMainWindow
{
Q_OBJECT
public:
diff --git a/tdeio/tdeio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp
index 3f4f0a86..5ec790aa 100644
--- a/tdeio/tdeio/kdatatool.cpp
+++ b/tdeio/tdeio/kdatatool.cpp
@@ -217,7 +217,7 @@ bool KDataToolInfo::isValid() const
*************************************************/
KDataToolAction::KDataToolAction( const TQString & text, const KDataToolInfo & info, const TQString & command,
TQObject * parent, const char * name )
- : KAction( text, info.iconName(), 0, parent, name ),
+ : TDEAction( text, info.iconName(), 0, parent, name ),
m_command( command ),
m_info( info )
{
@@ -228,13 +228,13 @@ void KDataToolAction::slotActivated()
emit toolActivated( m_info, m_command );
}
-TQPtrList<KAction> KDataToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot )
+TQPtrList<TDEAction> KDataToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot )
{
- TQPtrList<KAction> actionList;
+ TQPtrList<TDEAction> actionList;
if ( tools.isEmpty() )
return actionList;
- actionList.append( new KActionSeparator() );
+ actionList.append( new TDEActionSeparator() );
TQValueList<KDataToolInfo>::ConstIterator entry = tools.begin();
for( ; entry != tools.end(); ++entry )
{
@@ -277,7 +277,7 @@ TDEInstance* KDataTool::instance() const
}
void KDataToolAction::virtual_hook( int id, void* data )
-{ KAction::virtual_hook( id, data ); }
+{ TDEAction::virtual_hook( id, data ); }
void KDataTool::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
diff --git a/tdeio/tdeio/kdatatool.h b/tdeio/tdeio/kdatatool.h
index 6cb9353a..bd787dcd 100644
--- a/tdeio/tdeio/kdatatool.h
+++ b/tdeio/tdeio/kdatatool.h
@@ -191,7 +191,7 @@ private:
* The slot defined for step 2 is called when the action is activated, and
* that's where the tool should be created and run.
*/
-class TDEIO_EXPORT KDataToolAction : public KAction
+class TDEIO_EXPORT KDataToolAction : public TDEAction
{
Q_OBJECT
@@ -215,9 +215,9 @@ public:
* @param tools the list of data tool descriptions
* @param receiver the receiver for toolActivated() signals
* @param slot the slot that will receive the toolActivated() signals
- * @return the KActions
+ * @return the TDEActions
*/
- static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot );
+ static TQPtrList<TDEAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot );
signals:
/**
diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp
index 51db75fe..7c74a9a4 100644
--- a/tdeio/tdeio/kmimetypechooser.cpp
+++ b/tdeio/tdeio/kmimetypechooser.cpp
@@ -37,7 +37,7 @@
class KMimeTypeChooserPrivate
{
public:
- KListView *lvMimeTypes;
+ TDEListView *lvMimeTypes;
TQPushButton *btnEditMimeType;
TQString defaultgroup;
@@ -70,7 +70,7 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text,
new TQLabel( text, this );
}
- d->lvMimeTypes = new KListView( this );
+ d->lvMimeTypes = new TDEListView( this );
d->lvMimeTypes->addColumn( i18n("Mime Type") );
// d->lvMimeTypes->setColumnWidthMode( 0, TQListView::Manual );
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index b243671b..dd6de164 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -211,7 +211,7 @@ bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles )
bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles, const TQString& suggestedFileName )
{
- if (kapp && !kapp->authorizeKAction("openwith"))