summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
-rw-r--r--config.h.cmake2
-rw-r--r--doc/userguide/font-installation.docbook2
-rw-r--r--kappfinder/apps/Development/j2mewtk.desktop2
-rw-r--r--kappfinder/toplevel.cpp2
-rw-r--r--kate/app/kateconfigdialog.cpp2
-rw-r--r--kate/app/kateconfigplugindialogpage.cpp2
-rw-r--r--kate/app/kateconfigplugindialogpage.h2
-rw-r--r--kate/app/kateexternaltools.cpp4
-rw-r--r--kate/app/kateexternaltools.h2
-rw-r--r--kate/app/katefilelist.h2
-rw-r--r--kate/app/katefileselector.cpp10
-rw-r--r--kate/app/katefileselector.h2
-rw-r--r--kate/app/kategrepdialog.cpp2
-rw-r--r--kate/app/katemailfilesdialog.cpp2
-rw-r--r--kate/app/katemainwindow.cpp4
-rw-r--r--kate/app/katemainwindow.h2
-rw-r--r--kate/app/katemdi.cpp8
-rw-r--r--kate/app/katemdi.h2
-rw-r--r--kate/app/katemwmodonhddialog.cpp2
-rw-r--r--kate/app/katesavemodifieddialog.cpp2
-rw-r--r--kate/app/katesession.cpp4
-rw-r--r--kate/app/katesession.h2
-rw-r--r--kate/app/kateviewmanager.cpp6
-rw-r--r--kate/app/kateviewspacecontainer.cpp4
-rw-r--r--kate/app/kbookmarkhandler.cpp8
-rw-r--r--kate/app/kbookmarkhandler.h2
-rw-r--r--kate/app/kwritemain.cpp2
-rw-r--r--kate/utils/listboxview.cpp2
-rw-r--r--kcontrol/CMakeLists.txt2
-rw-r--r--kcontrol/Makefile.am4
-rw-r--r--kcontrol/access/kaccess.cpp2
-rw-r--r--kcontrol/access/kcmaccess.cpp2
-rw-r--r--kcontrol/access/kcmaccess.desktop2
-rw-r--r--kcontrol/accessibility/accessibility.desktop2
-rw-r--r--kcontrol/componentchooser/componentchooser_ui.ui4
-rw-r--r--kcontrol/css/kcmcss.cpp2
-rw-r--r--kcontrol/displayconfig/displayconfig.cpp4
-rw-r--r--kcontrol/ebrowsing/Makefile.am2
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp2
-rw-r--r--kcontrol/ebrowsing/plugins/localdomain/klocaldomainurifilterhelper.c2
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt10
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/Makefile.am12
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp10
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop2
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h2
-rw-r--r--kcontrol/filetypes/filetypesview.cpp2
-rw-r--r--kcontrol/fonts/fonts.cpp2
-rw-r--r--kcontrol/fonts/fonts.h4
-rw-r--r--kcontrol/hwmanager/deviceiconview.h2
-rw-r--r--kcontrol/hwmanager/hwmanager.cpp4
-rw-r--r--kcontrol/hwmanager/hwmanager.h2
-rw-r--r--kcontrol/iccconfig/iccconfig.cpp4
-rw-r--r--kcontrol/icons/iconthemes.cpp2
-rw-r--r--kcontrol/icons/iconthemes.h2
-rw-r--r--kcontrol/input/core/themepage.cpp2
-rw-r--r--kcontrol/input/xcursor/themepage.cpp2
-rw-r--r--kcontrol/ioslaveinfo/kcmioslaveinfo.h2
-rw-r--r--kcontrol/kcontrol/moduleiconview.h2
-rw-r--r--kcontrol/kcontrol/modulemenu.h2
-rw-r--r--kcontrol/kcontrol/moduletreeview.h2
-rw-r--r--kcontrol/kcontrol/searchwidget.cpp2
-rw-r--r--kcontrol/kcontrol/toplevel.cpp2
-rw-r--r--kcontrol/kcontrol/toplevel.h2
-rw-r--r--kcontrol/kded/kcmkded.cpp2
-rw-r--r--kcontrol/keys/CMakeLists.txt2
-rw-r--r--kcontrol/keys/Makefile.am2
-rw-r--r--kcontrol/keys/commandShortcuts.h2
-rw-r--r--kcontrol/keys/keyconfig.h2
-rw-r--r--kcontrol/keys/modifiers.cpp2
-rw-r--r--kcontrol/keys/shortcuts.cpp2
-rw-r--r--kcontrol/keys/shortcuts.h2
-rw-r--r--kcontrol/keys/tdeaccelaction.h4
-rw-r--r--kcontrol/keys/treeview.h2
-rw-r--r--kcontrol/kicker/applettab_impl.cpp2
-rw-r--r--kcontrol/kicker/kicker_config.desktop2
-rw-r--r--kcontrol/kicker/kicker_config_appearance.desktop2
-rw-r--r--kcontrol/kicker/kicker_config_arrangement.desktop2
-rw-r--r--kcontrol/kicker/kicker_config_hiding.desktop2
-rw-r--r--kcontrol/kicker/kicker_config_menus.desktop2
-rw-r--r--kcontrol/kicker/main.cpp2
-rw-r--r--kcontrol/kicker/menutab.ui4
-rw-r--r--kcontrol/kicker/menutab_impl.cpp4
-rw-r--r--kcontrol/kicker/panel.desktop2
-rw-r--r--kcontrol/konq/desktopbehavior.ui4
-rw-r--r--kcontrol/konq/desktopbehavior_impl.cpp2
-rw-r--r--kcontrol/konq/fontopts.cpp4
-rw-r--r--kcontrol/konq/previews.cpp2
-rw-r--r--kcontrol/konq/rootopts.cpp2
-rw-r--r--kcontrol/konqhtml/appearance.cpp2
-rw-r--r--kcontrol/konqhtml/domainlistview.cpp2
-rw-r--r--kcontrol/konqhtml/javaopts.cpp2
-rw-r--r--kcontrol/konqhtml/jsopts.cpp2
-rw-r--r--kcontrol/konqhtml/nsconfigwidget.ui4
-rw-r--r--kcontrol/konqhtml/pluginopts.cpp2
-rw-r--r--kcontrol/konsole/kcmkonsole.cpp2
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp2
-rw-r--r--kcontrol/launch/kcmlaunch.cpp6
-rw-r--r--kcontrol/privacy/kcmprivacydialog.ui2
-rw-r--r--kcontrol/privacy/kprivacymanager.cpp2
-rw-r--r--kcontrol/privacy/privacy.cpp2
-rw-r--r--kcontrol/privacy/privacy.h2
-rw-r--r--kcontrol/randr/configdialog.cpp2
-rw-r--r--kcontrol/randr/configdialog.h2
-rw-r--r--kcontrol/randr/tderandrtray.cpp4
-rw-r--r--kcontrol/smartcard/smartcard.cpp4
-rw-r--r--kcontrol/style/kcmstyle.cpp2
-rw-r--r--kcontrol/tdefontinst/CMakeLists.txt2
-rw-r--r--kcontrol/tdefontinst/ChangeLog30
-rw-r--r--kcontrol/tdefontinst/Makefile.am4
-rw-r--r--kcontrol/tdefontinst/configure.in.in8
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt6
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp12
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KFileFontView.h2
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/Makefile.am4
-rw-r--r--kcontrol/tdefontinst/lib/CMakeLists.txt4
-rw-r--r--kcontrol/tdefontinst/lib/FcEngine.cpp2
-rw-r--r--kcontrol/tdefontinst/lib/KfiConstants.h2
-rw-r--r--kcontrol/tdefontinst/lib/Makefile.am8
-rw-r--r--kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt4
-rw-r--r--kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp2
-rw-r--r--kcontrol/tdefontinst/tdefile-plugin/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/tdefontinst/CMakeLists.txt8
-rw-r--r--kcontrol/tdefontinst/tdefontinst/Makefile.am8
-rw-r--r--kcontrol/tdefontinst/tdeio/CMakeLists.txt4
-rw-r--r--kcontrol/tdefontinst/tdeio/KioFonts.cpp16
-rw-r--r--kcontrol/tdefontinst/tdeio/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/thumbnail/CMakeLists.txt4
-rw-r--r--kcontrol/tdefontinst/thumbnail/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/viewpart/CMakeLists.txt22
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewPart.cpp6
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewPart.h2
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp4
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewerApp.cpp6
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewerApp.h2
-rw-r--r--kcontrol/tdefontinst/viewpart/Makefile.am32
-rw-r--r--kcontrol/tdefontinst/viewpart/tdefontview.desktop2
-rw-r--r--kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop2
-rw-r--r--kcontrol/tdefontinst/viewpart/tdefontviewpart.rc2
-rw-r--r--kcontrol/tdefontinst/viewpart/tdefontviewui.rc2
-rw-r--r--kcontrol/tdeio/kcookiesmanagement.cpp4
-rw-r--r--kcontrol/tdeio/kcookiesmanagementdlg_ui.ui2
-rw-r--r--kcontrol/tdeio/kcookiespolicies.cpp4
-rw-r--r--kcontrol/tdeio/kcookiespoliciesdlg_ui.ui4
-rw-r--r--kcontrol/tdeio/kmanualproxydlg.cpp4
-rw-r--r--kcontrol/tdeio/socks.cpp2
-rw-r--r--kcontrol/tdeio/useragentdlg.cpp2
-rw-r--r--kcontrol/tdeio/useragentdlg_ui.ui2
-rw-r--r--kcontrol/tdm/tdm-conv.h4
-rw-r--r--kcontrol/tdm/tdm-font.cpp2
-rw-r--r--kcontrol/tdm/tdm-users.h2
-rw-r--r--kdcop/kdcoplistview.h2
-rw-r--r--kdcop/kdcopview.ui4
-rw-r--r--kdcop/kdcopwindow.cpp8
-rw-r--r--kdcop/kdcopwindow.h2
-rw-r--r--kdebugdialog/CMakeLists.txt2
-rw-r--r--kdebugdialog/Makefile.am2
-rw-r--r--kdebugdialog/main.cpp2
-rw-r--r--kdebugdialog/tdelistdebugdialog.cpp4
-rw-r--r--kdesktop/CMakeLists.txt4
-rw-r--r--kdesktop/Makefile.am12
-rw-r--r--kdesktop/bgmanager.cc2
-rw-r--r--kdesktop/desktop.cc6
-rw-r--r--kdesktop/kdiconview.cc2
-rw-r--r--kdesktop/kdiconview.h2
-rw-r--r--kdesktop/krootwm.cc2
-rw-r--r--kdesktop/startupid.cpp2
-rw-r--r--kdesktop/tdelaunch.kcfg2
-rw-r--r--kdesktop/tdelaunchsettings.kcfgc2
-rw-r--r--kdialog/CMakeLists.txt2
-rw-r--r--kdialog/Makefile.am2
-rw-r--r--kdialog/kdialog.cpp4
-rw-r--r--kdialog/tdelistboxdialog.cpp4
-rw-r--r--kdialog/widgets.cpp2
-rw-r--r--kfind/kfwin.cpp2
-rw-r--r--kfind/kfwin.h2
-rw-r--r--khelpcenter/fontdialog.cpp2
-rw-r--r--khelpcenter/glossary.cpp2
-rw-r--r--khelpcenter/glossary.h2
-rw-r--r--khelpcenter/history.cpp6
-rw-r--r--khelpcenter/infotree.cpp2
-rw-r--r--khelpcenter/kcmhelpcenter.cpp2
-rw-r--r--khelpcenter/mainwindow.cpp4
-rw-r--r--khelpcenter/mainwindow.h2
-rw-r--r--khelpcenter/navigator.cpp4
-rw-r--r--khelpcenter/navigator.h2
-rw-r--r--khelpcenter/view.cpp6
-rw-r--r--khotkeys/data/trinity2b1.khotkeys2
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.h2
-rw-r--r--khotkeys/kcontrol/menuedit.cpp2
-rw-r--r--khotkeys/kcontrol/menuedit.h2
-rw-r--r--khotkeys/kcontrol/triggers_tab.cpp4
-rw-r--r--khotkeys/shared/actions.cpp2
-rw-r--r--khotkeys/shared/input.h2
-rw-r--r--khotkeys/shared/khlistbox.h2
-rw-r--r--khotkeys/shared/khlistview.h2
-rw-r--r--khotkeys/shared/settings.cpp2
-rw-r--r--khotkeys/shared/settings.h2
-rw-r--r--khotkeys/shared/triggers.cpp2
-rw-r--r--khotkeys/shared/voices.h2
-rw-r--r--kicker/applets/clock/analog.ui2
-rw-r--r--kicker/applets/clock/clock.cpp4
-rw-r--r--kicker/applets/clock/digital.ui2
-rw-r--r--kicker/applets/clock/fuzzy.ui4
-rw-r--r--kicker/applets/clock/init.cpp4
-rw-r--r--kicker/applets/clock/settings.ui8
-rw-r--r--kicker/applets/clock/zone.cpp2
-rw-r--r--kicker/applets/launcher/quickbutton.cpp2
-rw-r--r--kicker/applets/launcher/quictdelauncher.cpp2
-rw-r--r--kicker/applets/media/mediaapplet.cpp2
-rw-r--r--kicker/applets/media/mediumbutton.cpp2
-rw-r--r--kicker/applets/media/mediumbutton.h2
-rw-r--r--kicker/applets/media/preferencesdialog.cpp2
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp2
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp6
-rw-r--r--kicker/applets/naughty/NaughtyApplet.cpp2
-rw-r--r--kicker/applets/run/runapplet.cpp2
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp2
-rw-r--r--kicker/applets/trash/trashapplet.cpp2
-rw-r--r--kicker/applets/trash/trashbutton.cpp2
-rw-r--r--kicker/applets/trash/trashbutton.h2
-rw-r--r--kicker/extensions/dockbar/dockcontainer.cpp2
-rw-r--r--kicker/extensions/kasbar/CMakeLists.txt2
-rw-r--r--kicker/extensions/kasbar/Makefile.am2
-rw-r--r--kicker/extensions/kasbar/kasclockitem.cpp2
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.cpp2
-rw-r--r--kicker/extensions/kasbar/kasloaditem.cpp2
-rw-r--r--kicker/extensions/kasbar/kastasker.cpp4
-rw-r--r--kicker/extensions/kasbar/kastaskitem.cpp6
-rw-r--r--kicker/extensions/kasbar/kastastdepopup.cpp6
-rw-r--r--kicker/extensions/kasbar/kastastdepopup.h2
-rw-r--r--kicker/kicker/buttons/bookmarksbutton.cpp4
-rw-r--r--kicker/kicker/buttons/windowlist.desktop2
-rw-r--r--kicker/kicker/core/container_applet.cpp2
-rw-r--r--kicker/kicker/core/panelextension.cpp2
-rw-r--r--kicker/kicker/ui/itemview.cpp2
-rw-r--r--kicker/kicker/ui/itemview.h2
-rw-r--r--kicker/kicker/ui/k_mnu.cpp4
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp4
-rw-r--r--kicker/menuext/konsole/konsolebookmarkhandler.cpp2
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.cpp4
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.cpp2
-rw-r--r--kicker/menuext/tom/tom.cc2
-rw-r--r--kicker/taskmanager/taskmanager.cpp2
-rw-r--r--klipper/configdialog.cpp2
-rw-r--r--klipper/configdialog.h2
-rw-r--r--klipper/klipper.desktop2
-rw-r--r--klipper/klipperpopup.cpp2
-rw-r--r--klipper/klipperpopup.h2
-rw-r--r--klipper/popupproxy.h2
-rw-r--r--klipper/toplevel.cpp2
-rw-r--r--klipper/toplevel.h2
-rw-r--r--klipper/urlgrabber.cpp2
-rw-r--r--kmenuedit/kmenuedit.cpp4
-rw-r--r--kmenuedit/kmenuedit.h2
-rw-r--r--kmenuedit/menuinfo.h2
-rw-r--r--kmenuedit/treeview.cpp2
-rw-r--r--kmenuedit/treeview.h2
-rw-r--r--knetattach/knetattach.ui.h6
-rw-r--r--konqueror/KonqMainWindowIface.h2
-rw-r--r--konqueror/about/konq_aboutpage.cc2
-rw-r--r--konqueror/iconview/konq_iconview.cc2
-rw-r--r--konqueror/keditbookmarks/TODO6
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp2
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.cpp2
-rw-r--r--konqueror/keditbookmarks/bookmarkiterator.cpp8
-rw-r--r--konqueror/keditbookmarks/bookmarkiterator.h2
-rw-r--r--konqueror/keditbookmarks/kebsearchline.h2
-rw-r--r--konqueror/keditbookmarks/listview.cpp4
-rw-r--r--konqueror/keditbookmarks/listview.h2
-rw-r--r--konqueror/keditbookmarks/main.cpp2
-rw-r--r--konqueror/keditbookmarks/testlink.cpp2
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp2
-rw-r--r--konqueror/keditbookmarks/toplevel.h2
-rw-r--r--konqueror/konq_actions.cc4
-rw-r--r--konqueror/konq_actions.h2
-rw-r--r--konqueror/konq_combo.cc2
-rw-r--r--konqueror/konq_frame.cc2
-rw-r--r--konqueror/konq_mainwindow.cc6
-rw-r--r--konqueror/konq_profiledlg.cc2
-rw-r--r--konqueror/konq_tabs.cc4
-rw-r--r--konqueror/konq_viewmgr.cc4
-rw-r--r--konqueror/kttsplugin/tdehtmlkttsd.cpp2
-rw-r--r--konqueror/listview/konq_infolistviewwidget.cc2
-rw-r--r--konqueror/listview/konq_listview.cc2
-rw-r--r--konqueror/listview/konq_listviewitems.h2
-rw-r--r--konqueror/listview/konq_listviewwidget.cc4
-rw-r--r--konqueror/listview/konq_listviewwidget.h2
-rw-r--r--konqueror/listview/konq_treeviewwidget.h2
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp4
-rw-r--r--konqueror/sidebar/konqsidebar.cpp2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp2
-rw-r--r--konqueror/sidebar/sidebar_widget.h2
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp4
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp2
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.h2
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp2
-rw-r--r--konqueror/sidebar/web_module/web_module.h2
-rw-r--r--konsole/konsole/TEWidget.cpp2
-rw-r--r--konsole/konsole/TEWidget.h2
-rw-r--r--konsole/konsole/konsole.cpp8
-rw-r--r--konsole/konsole/konsole.h2
-rw-r--r--konsole/konsole/konsole_part.cpp6
-rw-r--r--konsole/konsole/konsolebookmarkhandler.cpp2
-rw-r--r--konsole/konsole/konsolebookmarkmenu.cpp4
-rw-r--r--konsole/konsole/session.h2
-rw-r--r--kpager/desktop.cpp2
-rw-r--r--kpager/kpager.cpp4
-rw-r--r--kpager/kpager.h2
-rw-r--r--kpersonalizer/keyecandypage.cpp2
-rw-r--r--kpersonalizer/kospage.cpp2
-rw-r--r--kpersonalizer/kpersonalizer.cpp2
-rw-r--r--kpersonalizer/kstylepage.cpp2
-rw-r--r--kpersonalizer/kstylepagedlg.ui2
-rw-r--r--ksmserver/shutdowndlg.cpp2
-rw-r--r--ksmserver/startupdlg.cpp2
-rw-r--r--ksplashml/kcmksplash/installer.h2
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.cpp2
-rw-r--r--ksysguard/gui/KSGAppletSettings.cc2
-rw-r--r--ksysguard/gui/KSysGuardApplet.cc2
-rw-r--r--ksysguard/gui/SensorBrowser.h2
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc4
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc4
-rw-r--r--ksysguard/gui/SensorDisplayLib/LogFile.cc2
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessController.cc2
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessList.h2
-rw-r--r--ksysguard/gui/WorkSheet.cc2
-rw-r--r--ksysguard/gui/WorkSheetSettings.cc2
-rw-r--r--ksysguard/gui/Workspace.cc2
-rw-r--r--ksysguard/gui/ksgrd/HostConnector.cc2
-rw-r--r--ksysguard/gui/ksgrd/StyleSettings.cc2
-rw-r--r--ksysguard/gui/ksgrd/TimerSettings.cc2
-rw-r--r--ksysguard/gui/ksysguard.cc2
-rw-r--r--ksysguard/gui/ksysguard.h2
-rw-r--r--ksystraycmd/ksystraycmd.cpp2
-rw-r--r--kxkb/kxkb.cpp4
-rw-r--r--kxkb/kxkbtraywindow.cpp4
-rw-r--r--libkonq/knewmenu.cc2
-rw-r--r--libkonq/knewmenu.h2
-rw-r--r--libkonq/konq_bgnddlg.cc2
-rw-r--r--libkonq/konq_dirpart.cc2
-rw-r--r--libkonq/konq_operations.cc2
-rw-r--r--libkonq/konq_popupmenu.h2
-rw-r--r--libkonq/konq_xmlguiclient.h2
-rw-r--r--nsplugins/plugin_part.cpp2
-rw-r--r--nsplugins/test/testnsplugin.cpp2
-rw-r--r--nsplugins/test/testnsplugin.h2
-rw-r--r--tdeioslave/media/medianotifier/notificationdialog.cpp2
-rw-r--r--tdeioslave/media/medianotifier/notificationdialog.h2
-rw-r--r--tdeioslave/media/medianotifier/notificationdialogview.ui2
-rw-r--r--tdeioslave/media/tdecmodule/notifiermoduleview.ui2
-rw-r--r--tdeioslave/media/tdecmodule/serviceconfigdialog.cpp2
-rw-r--r--tdeioslave/media/tdecmodule/serviceview.ui2
-rw-r--r--tdeprint/kjobviewer/kjobviewer.cpp2
-rw-r--r--tdeprint/tdeprint_part/printpart.cpp2
-rw-r--r--tdeprint/tdeprintfax/conffilters.cpp2
-rw-r--r--tdeprint/tdeprintfax/faxab.cpp2
-rw-r--r--tdeprint/tdeprintfax/tdeprintfax.cpp8
-rw-r--r--tdeprint/tdeprintfax/tdeprintfax.h2
-rw-r--r--tdm/backend/socket.c42
-rw-r--r--tdm/kfrontend/kgreeter.cpp2
-rw-r--r--tqt3integration/module/module.cpp2
-rw-r--r--tqt3integration/module/module.h2
-rw-r--r--twin/client.h2
-rw-r--r--twin/kcmtwin/twindecoration/buttons.h2
-rw-r--r--twin/kcmtwin/twinrules/ruleslist.cpp2
-rw-r--r--twin/kcmtwin/twinrules/ruleswidget.h2
-rw-r--r--twin/kcmtwin/twinrules/ruleswidgetbase.ui2
-rw-r--r--twin/utils.h2
-rw-r--r--twin/workspace.h2
371 files changed, 587 insertions, 587 deletions
diff --git a/config.h.cmake b/config.h.cmake
index 9f877ced..1227b709 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -81,7 +81,7 @@
#cmakedefine HAVE_FONTCONFIG 1
#cmakedefine HAVE_FREETYPE2 1
-// kcontrol/kfontinst
+// kcontrol/tdefontinst
#cmakedefine HAVE_XFT 1
#cmakedefine HAVE_GETOPT_H 1
diff --git a/doc/userguide/font-installation.docbook b/doc/userguide/font-installation.docbook
index 683c878b..df810d55 100644
--- a/doc/userguide/font-installation.docbook
+++ b/doc/userguide/font-installation.docbook
@@ -56,7 +56,7 @@ choose <guibutton>Delete</guibutton>.</para>
<para>Configuration (anti-aliasing)</para>
-<para>kfontinst and kfontview should probably get a mention too, since
+<para>tdefontinst and tdefontview should probably get a mention too, since
they don't seem to have any existing docs.</para>
</sect1>
diff --git a/kappfinder/apps/Development/j2mewtk.desktop b/kappfinder/apps/Development/j2mewtk.desktop
index bbde79f4..d4860e1c 100644
--- a/kappfinder/apps/Development/j2mewtk.desktop
+++ b/kappfinder/apps/Development/j2mewtk.desktop
@@ -73,7 +73,7 @@ GenericName[xh]=J2ME Ibhokisi yesixhobo
GenericName[zh_CN]=J2ME 工具包
GenericName[zh_TW]=J2ME 工具組
GenericName[zu]=Ibhokisi lamathuluzi le-J2ME
-Exec=ktoolbar
+Exec=tdetoolbar
Icon=ksmiletris
Name=J2ME
Name[af]=J2me
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index 6270add5..23ea31df 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kapplication.h>
#include <kbuttonbox.h>
#include <kdebug.h>
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index afa77b6a..0efaa6aa 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -52,7 +52,7 @@
#include <kglobalsettings.h>
#include <kiconloader.h>
#include <kkeydialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <klocale.h>
#include <ksimpleconfig.h>
#include <kstdaction.h>
diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp
index 1b5c29aa..8e12e2d8 100644
--- a/kate/app/kateconfigplugindialogpage.cpp
+++ b/kate/app/kateconfigplugindialogpage.cpp
@@ -22,7 +22,7 @@
#include "katepluginmanager.h"
#include "kateconfigdialog.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
#include "kateapp.h"
#include <tqstringlist.h>
#include <tqhbox.h>
diff --git a/kate/app/kateconfigplugindialogpage.h b/kate/app/kateconfigplugindialogpage.h
index c0294b0e..009f3073 100644
--- a/kate/app/kateconfigplugindialogpage.h
+++ b/kate/app/kateconfigplugindialogpage.h
@@ -23,7 +23,7 @@
#include "katemain.h"
#include "katepluginmanager.h"
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqvbox.h>
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 2f2ae348..90e93440 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -33,7 +33,7 @@
#include <kate/view.h>
#include <kate/document.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kmessagebox.h>
@@ -41,7 +41,7 @@
#include <tdeconfig.h>
#include <krun.h>
#include <kicondialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kdebug.h>
#include <tqbitmap.h>
diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h
index 1cee371f..363ae637 100644
--- a/kate/app/kateexternaltools.h
+++ b/kate/app/kateexternaltools.h
@@ -24,7 +24,7 @@
#ifndef _KATE_EXTERNAL_TOOLS_H_
#define _KATE_EXTERNAL_TOOLS_H_
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdialogbase.h>
#include <kate/document.h>
#include <kmacroexpander.h>
diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
index f310562b..49987edd 100644
--- a/kate/app/katefilelist.h
+++ b/kate/app/katefilelist.h
@@ -25,7 +25,7 @@
#include <kate/document.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqtooltip.h>
#include <tqcolor.h>
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 7a0e429f..1ff9ef47 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -26,7 +26,7 @@
#include "kateviewmanager.h"
#include "kbookmarkhandler.h"
-#include "kactionselector.h"
+#include "tdeactionselector.h"
#include <tqlayout.h>
#include <tqtoolbutton.h>
@@ -56,11 +56,11 @@
#include <tdeconfig.h>
#include <klocale.h>
#include <kcombobox.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kmessagebox.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
#include <tqtoolbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kdialog.h>
#include <kdebug.h>
//END Includes
@@ -166,7 +166,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),
filter, TQT_SLOT( addToHistory(const TQString&) ) );
- // kaction for the dir sync method
+ // tdeaction for the dir sync method
acSyncDir = new TDEAction( i18n("Current Document Folder"), "curfiledir", 0,
TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
toolbar->setIconText( TDEToolBar::IconOnly );
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index ddacb642..33482fab 100644
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@@ -28,7 +28,7 @@
#include <tqvbox.h>
#include <tdefile.h>
#include <kurl.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <tqframe.h>
class KateMainWindow;
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index a1f4cac1..bb0d7e9f 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -32,7 +32,7 @@
#include <tqcursor.h>
#include <kapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kbuttonbox.h>
#include <tdefiledialog.h>
#include <kprocess.h>
diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp
index 651269bb..b402ca58 100644
--- a/kate/app/katemailfilesdialog.cpp
+++ b/kate/app/katemailfilesdialog.cpp
@@ -21,7 +21,7 @@
#include "kateviewmanager.h"
#include "katedocmanager.h"
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kurl.h>
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 949166c8..9e27e55b 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -46,7 +46,7 @@
#include <dcopclient.h>
#include <kinstance.h>
#include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcmdlineargs.h>
#include <kdebug.h>
#include <kdialogbase.h>
@@ -63,7 +63,7 @@
#include <kmessagebox.h>
#include <kmimetype.h>
#include <kopenwith.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <ksimpleconfig.h>
#include <kstatusbar.h>
#include <kstdaction.h>
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index 0905f2b6..30582ed3 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -29,7 +29,7 @@
#include <tdeparts/part.h>
-#include <kaction.h>
+#include <tdeaction.h>
class KateTabWidget;
class GrepTool;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 6138915a..6480d5fd 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -2,7 +2,7 @@
Copyright (C) 2005 Christoph Cullmann <cullmann@kde.org>
Copyright (C) 2002, 2003 Joseph Wenninger <jowenn@kde.org>
- GUIClient partly based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+ GUIClient partly based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -23,7 +23,7 @@
#include "katemdi.h"
#include "katemdi.moc"
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kglobalsettings.h>
@@ -31,7 +31,7 @@
#include <klocale.h>
#include <tdeconfig.h>
#include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <tqvbox.h>
@@ -134,7 +134,7 @@ GUIClient::GUIClient ( MainWindow *mw )
setXML( completeDescription, false /*merge*/ );
}
- if (actionCollection()->kaccel()==0)
+ if (actionCollection()->tdeaccel()==0)
actionCollection()->setWidget(m_mw);
m_toolMenu = new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"kate_mdi_toolview_menu");
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index 4cc63aba..a291ebb8 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -25,7 +25,7 @@
#include <tdemultitabbar.h>
#include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqdict.h>
#include <tqintdict.h>
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index d81e0de6..3abf1275 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -25,7 +25,7 @@
#include <kate/document.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kprocio.h>
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 144e701e..4925b6e9 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -21,7 +21,7 @@
#include <klocale.h>
#include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kguiitem.h>
#include <kactivelabel.h>
#include <kstdguiitem.h>
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index 168b760f..d55af0c9 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -27,14 +27,14 @@
#include <klocale.h>
#include <kdebug.h>
#include <kdirwatch.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kinputdialog.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kmdcodec.h>
#include <kstdguiitem.h>
#include <kpushbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqdir.h>
#include <tqlabel.h>
diff --git a/kate/app/katesession.h b/kate/app/katesession.h
index 1b3c4a96..b62e72a4 100644
--- a/kate/app/katesession.h
+++ b/kate/app/katesession.h
@@ -24,7 +24,7 @@
#include <kdialogbase.h>
#include <ksimpleconfig.h>
#include <ksharedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqobject.h>
#include <tqvaluelist.h>
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 39a969b6..562e41e2 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -28,7 +28,7 @@
#include "katetabwidget.h"
#include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcmdlineargs.h>
#include <kdebug.h>
#include <kdiroperator.h>
@@ -37,13 +37,13 @@
#include <kiconloader.h>
#include <kglobal.h>
#include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kmessagebox.h>
#include <ksimpleconfig.h>
#include <kstdaction.h>
#include <kstandarddirs.h>
#include <kglobalsettings.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <tdetexteditor/encodinginterface.h>
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 05917874..9af161b9 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -29,7 +29,7 @@
#include "kateviewspace.h"
#include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcmdlineargs.h>
#include <kdebug.h>
#include <kdiroperator.h>
@@ -38,7 +38,7 @@
#include <kiconloader.h>
#include <kglobal.h>
#include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kmessagebox.h>
#include <ksimpleconfig.h>
#include <kstdaction.h>
diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp
index 35fa87fe..2ff3c7e6 100644
--- a/kate/app/kbookmarkhandler.cpp
+++ b/kate/app/kbookmarkhandler.cpp
@@ -25,21 +25,21 @@
#include <tqtextstream.h>
#include <kbookmarkimporter.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
#include <kdiroperator.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "kbookmarkhandler.h"
#include "kbookmarkhandler.moc"
-KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu* kpopupmenu )
+KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu* tdepopupmenu )
: TQObject( parent, "KBookmarkHandler" ),
KBookmarkOwner(),
mParent( parent ),
- m_menu( kpopupmenu ),
+ m_menu( tdepopupmenu ),
m_importStream( 0L )
{
if (!m_menu)
diff --git a/kate/app/kbookmarkhandler.h b/kate/app/kbookmarkhandler.h
index 6147a9d7..612c15a1 100644
--- a/kate/app/kbookmarkhandler.h
+++ b/kate/app/kbookmarkhandler.h
@@ -35,7 +35,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner
Q_OBJECT
public:
- KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu *kpopupmenu=0 );
+ KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
~KBookmarkHandler();
// KBookmarkOwner interface:
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 641db486..58a6368d 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -43,7 +43,7 @@
#include <kaboutdata.h>
#include <kstatusbar.h>
#include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kapplication.h>
diff --git a/kate/utils/listboxview.cpp b/kate/utils/listboxview.cpp
index a3f56700..3cbdd8a0 100644
--- a/kate/utils/listboxview.cpp
+++ b/kate/utils/listboxview.cpp
@@ -19,7 +19,7 @@
#include "listboxview.h"
#include "listboxview.moc"
-#include <klistbox.h>
+#include <tdelistbox.h>
namespace Kate {
diff --git a/kcontrol/CMakeLists.txt b/kcontrol/CMakeLists.txt
index 1d4dfcf5..72ca6fac 100644
--- a/kcontrol/CMakeLists.txt
+++ b/kcontrol/CMakeLists.txt
@@ -63,7 +63,7 @@ if( BUILD_KCONTROL )
add_subdirectory( xinerama )
add_subdirectory( display )
add_subdirectory( kthememanager )
- add_subdirectory( kfontinst )
+ add_subdirectory( tdefontinst )
add_subdirectory( access )
add_subdirectory( hwmanager )
diff --git a/kcontrol/Makefile.am b/kcontrol/Makefile.am
index 1b848574..30f03338 100644
--- a/kcontrol/Makefile.am
+++ b/kcontrol/Makefile.am
@@ -3,8 +3,8 @@ if include_kcontrol_access
ACCESS_SUBDIR=access
endif
-if include_kcontrol_kfontinst
-FONTINST_SUBDIR=kfontinst
+if include_kcontrol_tdefontinst
+FONTINST_SUBDIR=tdefontinst
endif
if include_kcontrol_smartcard
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 7d66fa17..8c6717e6 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -18,7 +18,7 @@
#include <kglobal.h>
#include <klocale.h>
#include <netwm.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kkeynative.h>
#include <twin.h>
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 3a7833c0..2533cfe5 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -29,7 +29,7 @@
#include <tdefiledialog.h>
#include <kapplication.h>
#include <kaboutdata.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kkeynative.h>
#include <knotifydialog.h>
diff --git a/kcontrol/access/kcmaccess.desktop b/kcontrol/access/kcmaccess.desktop
index c748c636..1ce0924c 100644
--- a/kcontrol/access/kcmaccess.desktop
+++ b/kcontrol/access/kcmaccess.desktop
@@ -224,7 +224,7 @@ Keywords[sk]=prístup,prístupnosť,hluchý,postihnutý,zvonček,hlasný zvonče
Keywords[sl]=dostop,dostopnost,gluh,gluhota,prizadetost,zvonec,vidni zvonec,zvonček,tipkovnica,tipke,lepljive tipke,počasne tipke,navigacija miške,numerična tipkovnica,invalidnost,invalid
Keywords[sr]=приступ,приступачност,глув,хендикепиран,звоно,звучно звоно,визуелно звоно,тастатура,тастери,лепљиви тастери,спори тастери,померање миша,нумеричка тастатура
Keywords[sr@Latn]=pristup,pristupačnost,gluv,hendikepiran,zvono,zvučno zvono,vizuelno zvono,tastatura,tasteri,lepljivi tasteri,spori tasteri,pomeranje miša,numerička tastatura
-Keywords[sv]=tillgång,tillgänglighet,döv,handikappad,signal,ljudsignal,visuell signal,Tangentbord,tangenter,klistriga tangenter,studsande tangenter,långsamma tangenter,musnavigering,numeriskt tangentbord
+Keywords[sv]=tillgång,tillgänglighet,döv,handikappad,signal,ljudsignal,visuell signal,Tangentbord,tangenter,tdelistriga tangenter,studsande tangenter,långsamma tangenter,musnavigering,numeriskt tangentbord
Keywords[ta]=அணுகல்,அணுகும் முறை,காது கேளாத,ஆற்றல் குறைந்த,மணியோசை,காதால் கேட்கும் அளவிற்கு மணியோசை,தெரியும் மணியோசை,விசைபலகை,விசைகள்,ஒட்டும் விசைகள்,மீளும் தன்மையுடைய விசைகள்,மெதுவான விசைகள்,சுட்டிநாவிகேஷன்,எண்ணிக்கை அட்டை
Keywords[th]=การเข้าถึง,ความง่ายในการใช้งาน,หูหนวก,บกพร่อง,ออด, ออดใช้ฟัง,ออดใช้ดู,แป้นพิมพ์,ปุ่ม,ปุ่มติดหนึบ,ปุ่มสะท้อน, ปุ่มชะลอ,นำทางโดยเมาส์,แผงปุ่มตัวเลข
Keywords[tr]=erişim,erişilebilirlik,sağır,özürlü,zil,duyulabilir zil,görünür zil,Klavye,tuşlar,yapışkan tuşlar,zıplayan tuşlar,yavaş tuşlar,fare yönlendirmesi,num pad
diff --git a/kcontrol/accessibility/accessibility.desktop b/kcontrol/accessibility/accessibility.desktop
index 058d178d..f0b73472 100644
--- a/kcontrol/accessibility/accessibility.desktop
+++ b/kcontrol/accessibility/accessibility.desktop
@@ -223,7 +223,7 @@ Keywords[sk]=prístup,prístupnosť,hluchý,postihnutý,zvonček,hlasný zvonče
Keywords[sl]=dostop,dostopnost,gluh,gluhota,prizadetost,zvonec,vidni zvonec,zvonček,tipkovnica,tipke,lepljive tipke,počasne tipke,navigacija miške,numerična tipkovnica,invalidnost,invalid
Keywords[sr]=приступ,приступачност,глув,хендикепиран,звоно,звучно звоно,визуелно звоно,тастатура,тастери,лепљиви тастери,спори тастери,померање миша,нумеричка тастатура
Keywords[sr@Latn]=pristup,pristupačnost,gluv,hendikepiran,zvono,zvučno zvono,vizuelno zvono,tastatura,tasteri,lepljivi tasteri,spori tasteri,pomeranje miša,numerička tastatura
-Keywords[sv]=tillgång,tillgänglighet,döv,handikappad,signal,ljudsignal,visuell signal,Tangentbord,tangenter,klistriga tangenter,studsande tangenter,långsamma tangenter,musnavigering,numeriskt tangentbord
+Keywords[sv]=tillgång,tillgänglighet,döv,handikappad,signal,ljudsignal,visuell signal,Tangentbord,tangenter,tdelistriga tangenter,studsande tangenter,långsamma tangenter,musnavigering,numeriskt tangentbord
Keywords[ta]=அணுகல்,அணுகும் முறை,காது கேளாத,ஆற்றல் குறைந்த,மணியோசை,காதால் கேட்கும் அளவிற்கு மணியோசை,தெரியும் மணியோசை,விசைபலகை,விசைகள்,ஒட்டும் விசைகள்,மீளும் தன்மையுடைய விசைகள்,மெதுவான விசைகள்,சுட்டிநாவிகேஷன்,எண்ணிக்கை அட்டை
Keywords[th]=การเข้าถึง,ความง่ายในการใช้งาน,หูหนวก,บกพร่อง,ออด, ออดใช้ฟัง,ออดใช้ดู,แป้นพิมพ์,ปุ่ม,ปุ่มติดหนึบ,ปุ่มสะท้อน, ปุ่มชะลอ,นำทางโดยเมาส์,แผงปุ่มตัวเลข
Keywords[tr]=erişim,erişilebilirlik,sağır,özürlü,zil,duyulabilir zil,görünür zil,Klavye,tuşlar,yapışkan tuşlar,zıplayan tuşlar,yavaş tuşlar,fare yönlendirmesi,num pad
diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui
index 697759af..c810f1e3 100644
--- a/kcontrol/componentchooser/componentchooser_ui.ui
+++ b/kcontrol/componentchooser/componentchooser_ui.ui
@@ -122,12 +122,12 @@
</grid>
</widget>
<includes>
- <include location="global" impldecl="in declaration">klistbox.h</include>
+ <include location="global" impldecl="in declaration">tdelistbox.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>klistbox.h</includehint>
+ <includehint>tdelistbox.h</includehint>
</includehints>
</UI>
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index d69023db..bf06c3bc 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -9,7 +9,7 @@
#include <kcolorbutton.h>
#include <tdeconfig.h>
#include <kdialogbase.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kgenericfactory.h>
#include <kglobalsettings.h>
#include <kstandarddirs.h>
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 34259f42..2a758d6e 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -35,10 +35,10 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kinputdialog.h>
#include <kurlrequester.h>
#include <tdecmoduleloader.h>
diff --git a/kcontrol/ebrowsing/Makefile.am b/kcontrol/ebrowsing/Makefile.am
index 72bb632c..87587fd4 100644
--- a/kcontrol/ebrowsing/Makefile.am
+++ b/kcontrol/ebrowsing/Makefile.am
@@ -12,7 +12,7 @@ kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
# Don't link this lib to the plugins. They are dlopened and linking to them
# results in crashes when closing tdecmshell.
-# plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libkshorturifilter.la
+# plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libtdeshorturifilter.la
messages: rc.cpp
$(EXTRACTRC) plugins/*/*.ui >> rc.cpp
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 35a05971..919adf30 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -34,7 +34,7 @@
#include <kcombobox.h>
#include <tdeconfig.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kservice.h>
diff --git a/kcontrol/ebrowsing/plugins/localdomain/klocaldomainurifilterhelper.c b/kcontrol/ebrowsing/plugins/localdomain/klocaldomainurifilterhelper.c
index 2f61d682..bb7c17cd 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/klocaldomainurifilterhelper.c
+++ b/kcontrol/ebrowsing/plugins/localdomain/klocaldomainurifilterhelper.c
@@ -1,5 +1,5 @@
/*
- kshorturifilterhelper.cpp
+ tdeshorturifilterhelper.cpp
This file is part of the KDE project
Copyright (C) 2002 Lubos Lunak <llunak@suse.cz>
diff --git a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
index 4eb1c544..b95ddd9a 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
+++ b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
@@ -21,14 +21,14 @@ link_directories(
##### other data ################################
-install( FILES kshorturifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kshorturifilterrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES tdeshorturifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdeshorturifilterrc DESTINATION ${CONFIG_INSTALL_DIR} )
-##### libkshorturifilter (module) ###############
+##### libtdeshorturifilter (module) ###############
-tde_add_kpart( libkshorturifilter AUTOMOC
- SOURCES kshorturifilter.cpp kshorturifilter.skel
+tde_add_kpart( libtdeshorturifilter AUTOMOC
+ SOURCES tdeshorturifilter.cpp tdeshorturifilter.skel
LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am
index 7ac64dd8..fccf0ef6 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am
+++ b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am
@@ -2,17 +2,17 @@
AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII
-kde_module_LTLIBRARIES = libkshorturifilter.la
+kde_module_LTLIBRARIES = libtdeshorturifilter.la
-libkshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
+libtdeshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+libtdeshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
-libkshorturifilter_la_SOURCES = kshorturifilter.cpp kshorturifilter.skel
+libtdeshorturifilter_la_SOURCES = tdeshorturifilter.cpp tdeshorturifilter.skel
-service_DATA = kshorturifilter.desktop
+service_DATA = tdeshorturifilter.desktop
servicedir = $(kde_servicesdir)
-rc_DATA = kshorturifilterrc
+rc_DATA = tdeshorturifilterrc
rcdir = $(kde_confdir)
METASOURCES = AUTO
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
index e898bd0d..27353423 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
@@ -1,6 +1,6 @@
/* -*- c-basic-offset: 2 -*-
- kshorturifilter.h
+ tdeshorturifilter.h
This file is part of the KDE project
Copyright (C) 2000 Dawit Alemayehu <adawit@kde.org>
@@ -36,7 +36,7 @@
#include <tdeconfig.h>
#include <kmimetype.h>
-#include "kshorturifilter.h"
+#include "tdeshorturifilter.h"
#define FQDN_PATTERN "(?:[a-zA-Z0-9][a-zA-Z0-9+-]*\\.[a-zA-Z]+)"
#define IPv4_PATTERN "[0-9]{1,3}\\.[0-9]{1,3}(?:\\.[0-9]{0,3})?(?:\\.[0-9]{0,3})?"
@@ -136,7 +136,7 @@ static TQString removeArgs( const TQString& _cmd )
TDEShortURIFilter::TDEShortURIFilter( TQObject *parent, const char *name,
const TQStringList & /*args*/ )
- :KURIFilterPlugin( parent, name ? name : "kshorturifilter", 1.0),
+ :KURIFilterPlugin( parent, name ? name : "tdeshorturifilter", 1.0),
DCOPObject("TDEShortURIFilterIface")
{
configure();
@@ -570,7 +570,7 @@ void TDEShortURIFilter::configure()
}
}
-K_EXPORT_COMPONENT_FACTORY( libkshorturifilter,
+K_EXPORT_COMPONENT_FACTORY( libtdeshorturifilter,
KGenericFactory<TDEShortURIFilter>( "kcmkurifilt" ) )
-#include "kshorturifilter.moc"
+#include "tdeshorturifilter.moc"
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
index d607a4e6..32e544a6 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
@@ -49,6 +49,6 @@ Name[vi]=Lọc Địa chỉ URI Ngắn
Name[wa]=PasseteCoutURI
Name[zh_CN]=短 URI 过滤
Name[zh_TW]=短 URI 過濾器
-X-TDE-Library=libkshorturifilter
+X-TDE-Library=libtdeshorturifilter
ServiceTypes=KURIFilter/Plugin
InitialPreference=5
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
index 16eb0cd0..db3f1480 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
@@ -1,5 +1,5 @@
/*
- kshorturifilter.h
+ tdeshorturifilter.h
This file is part of the KDE project
Copyright (C) 2000 Dawit Alemayehu <adawit@kde.org>
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index a47743bc..5dd2cd48 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -14,7 +14,7 @@
#include <kdesktopfile.h>
#include <kipc.h>
#include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kstandarddirs.h>
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index e450629f..96fbc7d6 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -22,7 +22,7 @@
#include <dcopclient.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kapplication.h>
#include <kgenericfactory.h>
#include <kipc.h>
diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h
index db933d8a..cd9f52e0 100644
--- a/kcontrol/fonts/fonts.h
+++ b/kcontrol/fonts/fonts.h
@@ -12,8 +12,8 @@
#include <tdecmodule.h>
#include <kdialogbase.h>
-#include <kfontdialog.h>
-#include <kfontrequester.h>
+#include <tdefontdialog.h>
+#include <tdefontrequester.h>
#include "kxftconfig.h"
diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h
index cdc5cd6d..2046c165 100644
--- a/kcontrol/hwmanager/deviceiconview.h
+++ b/kcontrol/hwmanager/deviceiconview.h
@@ -20,7 +20,7 @@
#ifndef __deviceiconview_h__
#define __deviceiconview_h__
-#include <klistview.h>
+#include <tdelistview.h>
#include <kiconloader.h>
#include <tdehardwaredevices.h>
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index 35845a38..0ea803ff 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -33,10 +33,10 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kinputdialog.h>
#include <kurlrequester.h>
#include <kgenericfactory.h>
diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h
index 9d0e86d4..b75a494d 100644
--- a/kcontrol/hwmanager/hwmanager.h
+++ b/kcontrol/hwmanager/hwmanager.h
@@ -26,7 +26,7 @@
#endif
#include <tdecmodule.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
#include <dcopobject.h>
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index a12d26b2..73aaf73b 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -33,10 +33,10 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kinputdialog.h>
#include <kurlrequester.h>
#include <kgenericfactory.h>
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 802f1759..cb0d2350 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -35,7 +35,7 @@
#undef Unsorted
#include <kipc.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kurlrequesterdlg.h>
#include <kmessagebox.h>
#include <kprogress.h>
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index fde16312..ccb91484 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -22,7 +22,7 @@
#include <tqimage.h>
#include <tdecmodule.h>
#include <tqmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
class TQPushButton;
class DeviceManager;
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index 53c33ff2..bb8e7ca0 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -28,7 +28,7 @@
#include <kmessagebox.h>
#include <klocale.h>
#include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kdialog.h>
#include <tqlayout.h>
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index 0c81eff9..71787d79 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -23,7 +23,7 @@
#include <klocale.h>
#include <kaboutdata.h>
#include <kstandarddirs.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <ksimpleconfig.h>
#include <kglobalsettings.h>
#include <kdialog.h>
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
index 24247ad9..5149bc94 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
@@ -30,7 +30,7 @@
#include <kaboutdata.h>
#include <tdecmodule.h>
#include <tdeio/job.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <ktextbrowser.h>
class KIOTimeoutControl;
diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h
index a5d43a44..12cb14d7 100644
--- a/kcontrol/kcontrol/moduleiconview.h
+++ b/kcontrol/kcontrol/moduleiconview.h
@@ -20,7 +20,7 @@
#ifndef __moduleiconview_h__
#define __moduleiconview_h__
-#include <klistview.h>
+#include <tdelistview.h>
class ConfigModule;
class ConfigModuleList;
diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h
index 2ed12aa5..9ce39b58 100644
--- a/kcontrol/kcontrol/modulemenu.h
+++ b/kcontrol/kcontrol/modulemenu.h
@@ -31,7 +31,7 @@ that is intentional :-]
#include <tqwidget.h>
#include <tqdict.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
class ConfigModule;
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index d5e60ceb..271214c9 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -23,7 +23,7 @@
#include <tqpalette.h>
#include <tqptrlist.h>
#include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqdict.h>
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index c9842664..cee6cbfd 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -26,7 +26,7 @@
#include <klineedit.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include "searchwidget.h"
#include "searchwidget.moc"
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 329cb6f8..87661f8d 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -25,7 +25,7 @@
#include <kaboutapplication.h>
#include <kmessagebox.h>
#include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <twin.h>
#include <kiconloader.h>
#include <klineedit.h>
diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h
index 8d4f0212..39aa2509 100644
--- a/kcontrol/kcontrol/toplevel.h
+++ b/kcontrol/kcontrol/toplevel.h
@@ -21,7 +21,7 @@
#ifndef __TOPLEVEL_H__
#define __TOPLEVEL_H__
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tqlistview.h>
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index 8f8b836e..1d71b58a 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -34,7 +34,7 @@
#include <kdesktopfile.h>
#include <kdialog.h>
#include <kgenericfactory.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kmessagebox.h>
#include <kservice.h>
#include <kstandarddirs.h>
diff --git a/kcontrol/keys/CMakeLists.txt b/kcontrol/keys/CMakeLists.txt
index 739cd47f..3e58f720 100644
--- a/kcontrol/keys/CMakeLists.txt
+++ b/kcontrol/keys/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
##### other data ################################
install( FILES keys.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kaccel.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( FILES tdeaccel.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS convertShortcuts.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( FILES
diff --git a/kcontrol/keys/Makefile.am b/kcontrol/keys/Makefile.am
index a41bbaa7..2a6fc4ab 100644
--- a/kcontrol/keys/Makefile.am
+++ b/kcontrol/keys/Makefile.am
@@ -12,7 +12,7 @@ messages:
customkeys=`grep "^.include .\.\." keyconfig.cpp | sed -e "s#.*\"\(.*\)\"#\1#"` ;\
$(XGETTEXT) $(kcm_keys_la_SOURCES) $$customkeys -o $(podir)/kcmkeys.pot
-update_DATA = kaccel.upd
+update_DATA = tdeaccel.upd
update_SCRIPTS = convertShortcuts.pl
updatedir = $(kde_datadir)/tdeconf_update
diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h
index 2e0f0a76..54be5345 100644
--- a/kcontrol/keys/commandShortcuts.h
+++ b/kcontrol/keys/commandShortcuts.h
@@ -22,7 +22,7 @@
#define __COMMAND_SHORTCUTS_MODULE_H
#include <tqtabwidget.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <tqptrlist.h>
class AppTreeView;
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index fb913618..f442a2c3 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -11,7 +11,7 @@
#include <tqpushbutton.h>
#include <tqlistbox.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kkeydialog.h>
//#include <tdecmodule.h>
#include <tqdict.h>
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index c014a8b5..c9a95629 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -11,7 +11,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kkeynative.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index e4595305..d28a4ed0 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -38,7 +38,7 @@
#include <kinputdialog.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kshortcutlist.h>
+#include <tdeshortcutlist.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h
index 76c3890c..c1f1b282 100644
--- a/kcontrol/keys/shortcuts.h
+++ b/kcontrol/keys/shortcuts.h
@@ -29,7 +29,7 @@
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqtabwidget.h>
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
#include <kcombobox.h>
#include <kkeydialog.h>
diff --git a/kcontrol/keys/tdeaccelaction.h b/kcontrol/keys/tdeaccelaction.h
index 248ff227..5cc6ca02 100644
--- a/kcontrol/keys/tdeaccelaction.h
+++ b/kcontrol/keys/tdeaccelaction.h
@@ -1,4 +1,4 @@
-// THIS FILE IS A COPY OF tdelibs/tdecore/kaccelaction.h AND MUST BE KEPT
+// THIS FILE IS A COPY OF tdelibs/tdecore/tdeaccelaction.h AND MUST BE KEPT
// IN SYNC WITH THAT FILE.
/* This file is part of the KDE libraries
@@ -28,7 +28,7 @@
#include <tqstring.h>
#include <tqvaluevector.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
class TDEAccelBase;
diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h
index 36d8b91c..4da6d235 100644
--- a/kcontrol/keys/treeview.h
+++ b/kcontrol/keys/treeview.h
@@ -22,7 +22,7 @@
#define __treeview_h__
#include <tqstring.h>
-#include <klistview.h>
+#include <tdelistview.h>
class TQPopupMenu;
class TDEActionCollection;
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index e6eb85cb..50a6b925 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -32,7 +32,7 @@
#include <klocale.h>
#include <kdialog.h>
#include <kstandarddirs.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kdebug.h>
#include "applettab_impl.h"
diff --git a/kcontrol/kicker/kicker_config.desktop b/kcontrol/kicker/kicker_config.desktop
index f68d1208..1e45359e 100644
--- a/kcontrol/kicker/kicker_config.desktop
+++ b/kcontrol/kicker/kicker_config.desktop
@@ -172,7 +172,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole
Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,μικροεφαρμογές,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων
-Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
+Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons
diff --git a/kcontrol/kicker/kicker_config_appearance.desktop b/kcontrol/kicker/kicker_config_appearance.desktop
index 3becc6a7..32b6dcba 100644
--- a/kcontrol/kicker/kicker_config_appearance.desktop
+++ b/kcontrol/kicker/kicker_config_appearance.desktop
@@ -178,7 +178,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole
Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,μικροεφαρμογές,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων
-Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
+Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons
diff --git a/kcontrol/kicker/kicker_config_arrangement.desktop b/kcontrol/kicker/kicker_config_arrangement.desktop
index e9f6a5da..ca48b5c3 100644
--- a/kcontrol/kicker/kicker_config_arrangement.desktop
+++ b/kcontrol/kicker/kicker_config_arrangement.desktop
@@ -161,7 +161,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole
Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,μικροεφαρμογές,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων
-Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
+Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons
diff --git a/kcontrol/kicker/kicker_config_hiding.desktop b/kcontrol/kicker/kicker_config_hiding.desktop
index 368142cc..abf2e448 100644
--- a/kcontrol/kicker/kicker_config_hiding.desktop
+++ b/kcontrol/kicker/kicker_config_hiding.desktop
@@ -151,7 +151,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole
Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,εφαρμογίδια,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων
-Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
+Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE Menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons
diff --git a/kcontrol/kicker/kicker_config_menus.desktop b/kcontrol/kicker/kicker_config_menus.desktop
index 4caf125f..3f27aebd 100644
--- a/kcontrol/kicker/kicker_config_menus.desktop
+++ b/kcontrol/kicker/kicker_config_menus.desktop
@@ -148,7 +148,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole
Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,εφαρμογίδια,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων
-Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
+Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index 75f2baa9..4e4e0d70 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -23,7 +23,7 @@
#include <tdecmodulecontainer.h>
#include <kdirwatch.h>
#include <kimageio.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kstaticdeleter.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index 5d82d9e9..3c06ddfd 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -732,14 +732,14 @@
<tabstop>kcfg_NumVisibleEntries</tabstop>
</tabstops>
<includes>
- <include location="global" impldecl="in implementation">klistview.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
<include location="global" impldecl="in implementation">knuminput.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>knuminput.h</includehint>
</includehints>
</UI>
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 51113e68..58cade0c 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -31,12 +31,12 @@
#include <kdebug.h>
#include <kdesktopfile.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <knuminput.h>
#include <kstandarddirs.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
#include <kicondialog.h>
#include <kiconloader.h>
diff --git a/kcontrol/kicker/panel.desktop b/kcontrol/kicker/panel.desktop
index 57e5e86a..c708be14 100644
--- a/kcontrol/kicker/panel.desktop
+++ b/kcontrol/kicker/panel.desktop
@@ -171,7 +171,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole
Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,μικροεφαρμογές,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων
-Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
+Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo
Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons
diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui
index e2593e20..e6acb6ed 100644
--- a/kcontrol/konq/desktopbehavior.ui
+++ b/kcontrol/konq/desktopbehavior.ui
@@ -412,7 +412,7 @@
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>klistview.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
</includehints>
</UI>
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 1134dd8e..c7242de2 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -30,7 +30,7 @@
#include <tqbuttongroup.h>
#include <tqtabwidget.h>
#include <tqwhatsthis.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kservice.h>
#include <klocale.h>
#include <kglobalsettings.h>
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index 1f795c6a..c002c519 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -30,8 +30,8 @@
#include <kcolorbutton.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kfontcombo.h>
-#include <kfontdialog.h>
+#include <tdefontcombo.h>
+#include <tdefontdialog.h>
#include <klocale.h>
#include <konq_defaults.h> // include default values directly from konqueror
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index b0528b5d..ea1d637a 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -30,7 +30,7 @@
#include <tdeconfig.h>
#include <kdialog.h>
#include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <knuminput.h>
#include <kprotocolinfo.h>
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 52e8a07c..4fa7620a 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -29,7 +29,7 @@
#include <tdefileitem.h>
#include <kglobalsettings.h>
#include <kipc.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tdeio/job.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index cd54cd00..bb9db714 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -12,7 +12,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
#include <kglobal.h>
#include <tdehtmldefaults.h>
#include <klocale.h>
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index 3c8086ab..87daeea6 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -24,7 +24,7 @@
#include <tqwhatsthis.h>
#include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index d08e0cdf..f5cc93f1 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -12,7 +12,7 @@
// (c) Leo Savernik 2002-2003
#include <config.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kurlrequester.h>
#include <kdebug.h>
#include <klineedit.h>
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index f27cd415..adb00bd9 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -15,7 +15,7 @@
#include <tqwhatsthis.h>
#include <tqvgroupbox.h>
#include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kdebug.h>
#include <kurlrequester.h>
diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui
index a20a0f02..b784048e 100644
--- a/kcontrol/konqhtml/nsconfigwidget.ui
+++ b/kcontrol/konqhtml/nsconfigwidget.ui
@@ -258,7 +258,7 @@
<includes>
<include location="global" impldecl="in declaration">klocale.h</include>
<include location="global" impldecl="in declaration">kurlrequester.h</include>
- <include location="global" impldecl="in declaration">klistbox.h</include>
+ <include location="global" impldecl="in declaration">tdelistbox.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
@@ -268,6 +268,6 @@
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>klistbox.h</includehint>
+ <includehint>tdelistbox.h</includehint>
</includehints>
</UI>
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index 6be5c197..c02eb167 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -19,7 +19,7 @@
#include <kdebug.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kprocio.h>
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 6001c26d..56c09322 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -25,7 +25,7 @@
#include <kaboutdata.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kgenericfactory.h>
#include <kmessagebox.h>
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 950d40ad..87be37c0 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -31,7 +31,7 @@
#include <tdefiledialog.h>
#include <kglobal.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kservicegroup.h>
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index c02101d5..6b979ab1 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -155,7 +155,7 @@ LaunchConfig::load()
void
LaunchConfig::load(bool useDefaults)
{
- TDEConfig c("klaunchrc", false, false);
+ TDEConfig c("tdelaunchrc", false, false);
c.setReadDefaults( useDefaults );
@@ -194,7 +194,7 @@ LaunchConfig::load(bool useDefaults)
void
LaunchConfig::save()
{
- TDEConfig c("klaunchrc", false, false);
+ TDEConfig c("tdelaunchrc", false, false);
c.setGroup("FeedbackStyle");
c.writeEntry("BusyCursor", cb_busyCursor->currentItem() != 0);
@@ -228,7 +228,7 @@ LaunchConfig::defaults()
void
LaunchConfig::checkChanged()
{
- TDEConfig c("klaunchrc", false, false);
+ TDEConfig c("tdelaunchrc", false, false);
c.setGroup("FeedbackStyle");
diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui
index 5c2afe25..05d23882 100644
--- a/kcontrol/privacy/kcmprivacydialog.ui
+++ b/kcontrol/privacy/kcmprivacydialog.ui
@@ -194,7 +194,7 @@
</vbox>
</widget>
<includes>
- <include location="global" impldecl="in implementation">klistview.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
<include location="global" impldecl="in implementation">ktextedit.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 13b376cd..cfed89e7 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -27,7 +27,7 @@
#include <kglobal.h>
#include <kapplication.h>
#include <kdebug.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
#include <kstandarddirs.h>
#include <tqstringlist.h>
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index c175384c..dc2dcacc 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -30,7 +30,7 @@
#include <tdeconfig.h>
#include <kdialog.h>
#include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <ktextedit.h>
diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h
index 495b2fa6..18d23423 100644
--- a/kcontrol/privacy/privacy.h
+++ b/kcontrol/privacy/privacy.h
@@ -22,7 +22,7 @@
#define _PRIVACY_H_
#include <tdecmodule.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include "kcmprivacydialog.h"
#include "kprivacymanager.h"
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index f2344f1c..1d7ffcc4 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -28,7 +28,7 @@
#include <kiconloader.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <twinmodule.h>
#include <kregexpeditorinterface.h>
#include <tdeparts/componentfactory.h>
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 9ec75583..0728146e 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -30,7 +30,7 @@
#include <kdialogbase.h>
#include <keditlistbox.h>
#include <kkeydialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <knuminput.h>
class TDEGlobalAccel;
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 845f3e49..d44600c1 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -20,14 +20,14 @@
#include <tqimage.h>
#include <tqtooltip.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kcmultidialog.h>
#include <kdebug.h>
#include <khelpmenu.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstdaction.h>
#include <kstdguiitem.h>
#include <kglobal.h>
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index d802df1a..989ef45f 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -36,10 +36,10 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include "smartcard.h"
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 1b592cc5..c9f1ecfc 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -49,7 +49,7 @@
#include <kaboutdata.h>
#include <kdialog.h>
#include <klibloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kmessagebox.h>
#include <ksimpleconfig.h>
#include <kstyle.h>
diff --git a/kcontrol/tdefontinst/CMakeLists.txt b/kcontrol/tdefontinst/CMakeLists.txt
index e974f2a1..42f3f497 100644
--- a/kcontrol/tdefontinst/CMakeLists.txt
+++ b/kcontrol/tdefontinst/CMakeLists.txt
@@ -14,7 +14,7 @@ add_subdirectory( thumbnail )
add_subdirectory( viewpart )
add_subdirectory( kcmfontinst )
add_subdirectory( tdefile-plugin )
-add_subdirectory( kfontinst )
+add_subdirectory( tdefontinst )
add_subdirectory( tdeio )
install( FILES installfont.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
diff --git a/kcontrol/tdefontinst/ChangeLog b/kcontrol/tdefontinst/ChangeLog
index 27f3c8c9..9dc01a57 100644
--- a/kcontrol/tdefontinst/ChangeLog
+++ b/kcontrol/tdefontinst/ChangeLog
@@ -175,9 +175,9 @@ KDE3.1 -> KDE3.2
1. StarOffice psstd.fonts generated output is no longer marked line-by line, instead it is marked as a section, e.g.
- # kfontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType
+ # tdefontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType
<fonts...>
- # kfontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType
+ # tdefontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType
...Likewise for Ghostscript's Fontmap
@@ -200,7 +200,7 @@ KDE3.1 -> KDE3.2
for helping me discover the various bugs with Bitmap output.
3. When displaying bitmap details, if individual entries (family, point size, etc) can't be read, then the
Xlfd will be displayed.
-4. Ghostscript & StarOffice include guards changed from "kfontinst" to "kfi" -- this will *require" removing of any previous output!
+4. Ghostscript & StarOffice include guards changed from "tdefontinst" to "kfi" -- this will *require" removing of any previous output!
5. Shortened generated TrueType foundry fields - to help with StarOffice
0.10b6->0.10b7 (Test version...)
@@ -237,7 +237,7 @@ KDE3.1 -> KDE3.2
==============
*** NOTE
-*** Please delete your existing ~/.kde/share/config/kfontinstrc -or- ~/.kde2/share/config/kfontinstrc file
+*** Please delete your existing ~/.kde/share/config/tdefontinstrc -or- ~/.kde2/share/config/tdefontinstrc file
*** before using this version
1. Added support for X font server config files.
@@ -316,8 +316,8 @@ KDE3.1 -> KDE3.2
font, then TDEFontinst itself will try to read the header information (although no preview will be available,
everything else should still work).
4. Fixed multiple installing of programs in other/ directory. For instance TDEFontinst's version of ttmkfdir
- was being installed into $(PREFIX) (usually /usr/bin) as well as $(KDE_DATADIR)/kfontinst - this was incorrect
- as TDEFontinst will only use the version in $(KDE_DATADIR)/kfontinst, and it was possible that a previous version
+ was being installed into $(PREFIX) (usually /usr/bin) as well as $(KDE_DATADIR)/tdefontinst - this was incorrect
+ as TDEFontinst will only use the version in $(KDE_DATADIR)/tdefontinst, and it was possible that a previous version
of ttmkfdir (such as that supplied with XFree86) would have been overwritten.
5. Fixed bug where the user was allowed to select (and subsequently install) fonts which could not be loaded correctly.
6. Added the ability to enter a custom preview string.
@@ -345,13 +345,13 @@ KDE3.1 -> KDE3.2
0.8.2->0.8.3
============
-1. Modified 'kfontinst.kdelnk' so that tdesu is now used - so that a user will automatically be prompted
+1. Modified 'tdefontinst.kdelnk' so that tdesu is now used - so that a user will automatically be prompted
for the root password.
-2. Modified dialogs to use the KDE caption ("Font Installer") instead of the app name ("kfontinst")
+2. Modified dialogs to use the KDE caption ("Font Installer") instead of the app name ("tdefontinst")
3. Corrected size of Configure dialog.
4. Fixed a minor bug where if all fonts were uninstalled, the 'Configure System' button was disabled - therefore not
allowing you to activate the changes!
-5. Added a command line interface. (type 'kfontinst --help' for details)
+5. Added a command line interface. (type 'tdefontinst --help' for details)
6. Added option to automatically fix TTF postscript names upon install.
0.8.1->0.8.2
@@ -400,21 +400,21 @@ KDE3.1 -> KDE3.2
2. Modified ttf2pt1 to accept a parameter to just create .afm files
3. Added option to modify a .afm file when installing.
4. Added "Unicode" to list of encodings that can be used.
-5. Removed kfontinst-cp1252.enc, kfontinst-cp1252.xpp -- these were hacks anyway, and seing as Qt2 is going to
+5. Removed tdefontinst-cp1252.enc, tdefontinst-cp1252.xpp -- these were hacks anyway, and seing as Qt2 is going to
support cp1252 by a hard-coded codec, there's no real point...
6. Rearranged the Configure System dialog - so that Force AFM regeneration is grouped next to the Generate AFMs option.
-7. Encoding files now stored in <TDEDIR>/share/apps/kfontinst/Encodings
+7. Encoding files now stored in <TDEDIR>/share/apps/tdefontinst/Encodings
0.6.1->0.7
==========
1. Modified ttmkfdir & ttf2pt1 to allow usage of X11 style font re-encoding files.
-2. Because .enc files are now used by kfontinst, removed the possibility of using gzipped encodings.
+2. Because .enc files are now used by tdefontinst, removed the possibility of using gzipped encodings.
3. Added the ability to delete an installed font's .afm file.
4. Fixed a bug in the TtfPsNameFixer class - this would cause ttf2pt1 to creash when accessing a modified font!
5. Font encodings are now stored in <KDEDir>/share/x11encodings
6. Removed the reencode shell script, as the encodng is all done by ttmkfdir.
7. Removed xfinst shell script - handled internally.
-8. Supplied a kfontinst-cp1252 encoding - with the ugly single-quotes normaly found in .ttf files remapped to
+8. Supplied a tdefontinst-cp1252 encoding - with the ugly single-quotes normaly found in .ttf files remapped to
the nice looking ones.
9. Added functionality, when configuring StarOffice, to select an appropriate xprinter.prolog for the selected
encoding (if one exists)...
@@ -434,9 +434,9 @@ KDE3.1 -> KDE3.2
to use the microsoft cp1252 enocding scheme. (Previosuly the PS output from StarOffice would not print
OK with ghostscript - when using extra characters - unless the .ttf file was modified.)
2. Because of 1, removed the abilty to modify a TrueType font's internal charactermap - this was a hack anyway.
-3. xfinst now uses mkfontdir to create encodings.dir - instead of kfontinst's install procedure copying a standard
+3. xfinst now uses mkfontdir to create encodings.dir - instead of tdefontinst's install procedure copying a standard
one in (this didn't actually work...)
-4. As kfontinst no longer reads the .enc files themselves, added the ability to use .enc.gz files as well
+4. As tdefontinst no longer reads the .enc files themselves, added the ability to use .enc.gz files as well
when selecting an encoding for X.
5. Re-wrote xfinst & reencode to be plain 'sh' scripts, as opposed to 'tcsh' scripts.
diff --git a/kcontrol/tdefontinst/Makefile.am b/kcontrol/tdefontinst/Makefile.am
index 190855a8..f81ef525 100644
--- a/kcontrol/tdefontinst/Makefile.am
+++ b/kcontrol/tdefontinst/Makefile.am
@@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail
FONTINST_VP_SUBDIR=viewpart
endif
-SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin kfontinst kio
+SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst kio
EXTRA_DIST = TODO
@@ -11,4 +11,4 @@ konqservicedir = $(kde_datadir)/konqueror/servicemenus
konqservice_DATA = installfont.desktop
messages: rc.cpp
- $(XGETTEXT) rc.cpp */*.cpp */*.h -o $(podir)/kfontinst.pot
+ $(XGETTEXT) rc.cpp */*.cpp */*.h -o $(podir)/tdefontinst.pot
diff --git a/kcontrol/tdefontinst/configure.in.in b/kcontrol/tdefontinst/configure.in.in
index df6d3d34..65a5bc3f 100644
--- a/kcontrol/tdefontinst/configure.in.in
+++ b/kcontrol/tdefontinst/configure.in.in
@@ -119,7 +119,7 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; then
fi
AC_SUBST(LIB_FONT_ENC)
- FONTINST_SUBDIR="kfontinst"
+ FONTINST_SUBDIR="tdefontinst"
# Check for Xft...
ac_xft_headers=0
ac_CXXFLAGS_save="$CXXFLAGS"
@@ -140,10 +140,10 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; then
CFLAGS="$ac_CFLAGS_save"
CPPFLAGS="$ac_CPPFLAGS_save"
else
- AC_MSG_WARN([Missing FontConfig - disabling kfontinst!])
+ AC_MSG_WARN([Missing FontConfig - disabling tdefontinst!])
fi
else
- AC_MSG_WARN([Missing FreeType2 - disabling kfontinst!])
+ AC_MSG_WARN([Missing FreeType2 - disabling tdefontinst!])
fi
AM_CONDITIONAL(include_fontinst_tn, test "$ac_xft_headers" -eq 1)
@@ -152,4 +152,4 @@ if test "$ac_xft_headers" -eq 1 ; then
AC_DEFINE(HAVE_XFT, 1, [Defines if you have Xft])
fi
-AM_CONDITIONAL(include_kcontrol_kfontinst, test -n "$FONTINST_SUBDIR")
+AM_CONDITIONAL(include_kcontrol_tdefontinst, test -n "$FONTINST_SUBDIR")
diff --git a/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt b/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt
index b5a0da81..e3b89dfb 100644
--- a/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt
+++ b/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt
@@ -12,8 +12,8 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
- ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/viewpart
+ ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
+ ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/viewpart
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -35,6 +35,6 @@ tde_add_kpart( kcm_fontinst AUTOMOC
SOURCES
KCmFontInst.cpp KFileFontIconView.cpp KFileFontView.cpp
PrintDialog.cpp SettingsDialog.cpp
- LINK kfontinstprint-static kfontinst-shared
+ LINK tdefontinstprint-static tdefontinst-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index da1e5f2e..2a46fd2d 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -47,10 +47,10 @@
#include "Misc.h"
#include "KFileFontIconView.h"
#include "KFileFontView.h"
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
-#include <kstdaccel.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
+#include <tdestdaccel.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <kcmdlineargs.h>
@@ -76,7 +76,7 @@ namespace KFI
{
CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
- : TDECModule(parent, "kfontinst"),
+ : TDECModule(parent, "tdefontinst"),
#ifdef HAVE_XFT
itsPreview(NULL),
#endif
@@ -107,7 +107,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
TQFrame *fontsFrame;
#ifdef HAVE_XFT
- KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart");
+ KLibFactory *factory=KLibLoader::self()->factory("libtdefontviewpart");
if(factory)
{
diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
index 2950d3c3..64635928 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
@@ -39,7 +39,7 @@ class KFileItem;
class TQWidget;
class TQKeyEvent;
-#include <klistview.h>
+#include <tdelistview.h>
#include <kmimetyperesolver.h>
#include "tdefileview.h"
diff --git a/kcontrol/tdefontinst/kcmfontinst/Makefile.am b/kcontrol/tdefontinst/kcmfontinst/Makefile.am
index 7a4c7892..b6e65809 100644
--- a/kcontrol/tdefontinst/kcmfontinst/Makefile.am
+++ b/kcontrol/tdefontinst/kcmfontinst/Makefile.am
@@ -1,10 +1,10 @@
if include_fontinst_tn
FONTINST_PRINT_INC=-I$(srcdir)/../viewpart
-FONTINST_PRINT_LIB=../viewpart/libkfontinstprint.la
+FONTINST_PRINT_LIB=../viewpart/libtdefontinstprint.la
endif
kde_module_LTLIBRARIES = kcm_fontinst.la
-kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libkfontinst.la
+kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la
METASOURCES = AUTO
kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
diff --git a/kcontrol/tdefontinst/lib/CMakeLists.txt b/kcontrol/tdefontinst/lib/CMakeLists.txt
index 83f977aa..325b1b51 100644
--- a/kcontrol/tdefontinst/lib/CMakeLists.txt
+++ b/kcontrol/tdefontinst/lib/CMakeLists.txt
@@ -23,9 +23,9 @@ link_directories(
)
-##### kfontinst (shared) ########################
+##### tdefontinst (shared) ########################
-tde_add_library( kfontinst SHARED
+tde_add_library( tdefontinst SHARED
SOURCES Misc.cpp FcEngine.cpp
VERSION 0.0.0
LINK tdeio-shared ${XFT_LIBRARIES}
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
index 6faf700c..8ac8f4fb 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
+++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
@@ -734,7 +734,7 @@ TQString CFcEngine::getFcString(FcPattern *pat, const char *val, int faceNo)
TQString CFcEngine::createName(FcPattern *pat, int faceNo)
{
-//CPD: TODO: the names *need* to match up with kfontchooser's...
+//CPD: TODO: the names *need* to match up with tdefontchooser's...
TQString name(getFcString(pat, FC_FAMILY, faceNo)),
str;
int intVal;
diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h
index e50acb5f..d7f5ef03 100644
--- a/kcontrol/tdefontinst/lib/KfiConstants.h
+++ b/kcontrol/tdefontinst/lib/KfiConstants.h
@@ -3,7 +3,7 @@
#include <klocale.h>
-#define KFI_CATALOGUE "kfontinst"
+#define KFI_CATALOGUE "tdefontinst"
// io-slave
#define KFI_KIO_FONTS_PROTOCOL "fonts"
diff --git a/kcontrol/tdefontinst/lib/Makefile.am b/kcontrol/tdefontinst/lib/Makefile.am
index 59b85e0a..a0ecdfbb 100644
--- a/kcontrol/tdefontinst/lib/Makefile.am
+++ b/kcontrol/tdefontinst/lib/Makefile.am
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libkfontinst.la
+lib_LTLIBRARIES = libtdefontinst.la
-libkfontinst_la_SOURCES = \
+libtdefontinst_la_SOURCES = \
Misc.cpp \
FcEngine.cpp
@@ -9,6 +9,6 @@ Misc.h \
FcEngine.h \
KfiConstants.h
-libkfontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB)
-libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
+libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB)
+libtdefontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
diff --git a/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
index d1253790..37fab144 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
+++ b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
@@ -12,7 +12,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+ ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -31,6 +31,6 @@ install( FILES tdefile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
tde_add_kpart( tdefile_font
SOURCES KFileFont.cpp
- LINK kfontinst-shared tdeio-shared
+ LINK tdefontinst-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
index 4ac55807..6cbeb5b3 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
+++ b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
@@ -260,7 +260,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt
}
typedef KGenericFactory<KFI::KFileFontPlugin> KFileFontPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("kfontinst"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("tdefontinst"))
namespace KFI
{
diff --git a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
index 04ab4186..a7f82921 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
+++ b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdefile_font.la
tdefile_font_la_SOURCES = KFileFont.cpp
tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
-tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la
+tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la
kdelnkdir = $(kde_servicesdir)
kde_services_DATA = tdefile_font.desktop
diff --git a/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
index fdcb51b1..b1f541f0 100644
--- a/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
+++ b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
@@ -13,7 +13,7 @@ add_definitions( -DOS_${CMAKE_SYSTEM_NAME} )
include_directories(
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+ ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
${CMAKE_SOURCE_DIR}/kcontrol/fonts/
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
@@ -25,12 +25,12 @@ link_directories(
)
-##### kfontinst (executable) ####################
+##### tdefontinst (executable) ####################
-tde_add_executable( kfontinst
+tde_add_executable( tdefontinst
SOURCES
Main.cpp FontEngine.cpp Fontmap.cpp GetPid.c
XConfig.cpp
- LINK kxftconfig-static kfontinst-shared tdeio-shared
+ LINK kxftconfig-static tdefontinst-shared tdeio-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kcontrol/tdefontinst/tdefontinst/Makefile.am b/kcontrol/tdefontinst/tdefontinst/Makefile.am
index 3cfcfa68..a8b782b8 100644
--- a/kcontrol/tdefontinst/tdefontinst/Makefile.am
+++ b/kcontrol/tdefontinst/tdefontinst/Makefile.am
@@ -1,5 +1,5 @@
-bin_PROGRAMS = kfontinst
-kfontinst_SOURCES = \
+bin_PROGRAMS = tdefontinst
+tdefontinst_SOURCES = \
Main.cpp \
FontEngine.cpp \
Fontmap.cpp \
@@ -11,6 +11,6 @@ FontEngine.h \
Fontmap.h \
XConfig.h
-kfontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
-kfontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
+tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libtdefontinst.la
+tdefontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
diff --git a/kcontrol/tdefontinst/tdeio/CMakeLists.txt b/kcontrol/tdefontinst/tdeio/CMakeLists.txt
index dff38b28..ac242916 100644
--- a/kcontrol/tdefontinst/tdeio/CMakeLists.txt
+++ b/kcontrol/tdefontinst/tdeio/CMakeLists.txt
@@ -12,7 +12,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+ ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
${CMAKE_SOURCE_DIR}/kcontrol/fonts
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
@@ -34,6 +34,6 @@ install( FILES folder.desktop system-folder.desktop package.desktop DESTINATION
tde_add_kpart( tdeio_fonts AUTOMOC
SOURCES KioFonts.cpp
- LINK kxftconfig-static kfontinst-shared tdesu-shared
+ LINK kxftconfig-static tdefontinst-shared tdesu-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
index 171cb806..f42d50c0 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
@@ -785,7 +785,7 @@ CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
Misc::createDir(itsFolders[mainFolder].location);
//
- // Work out best params to send to kfontinst
+ // Work out best params to send to tdefontinst
// ...determine if X already knows about the system font path...
Display *xDisplay=XOpenDisplay(NULL);
@@ -1723,7 +1723,7 @@ void CKioFonts::modified(EFolder folder, bool clearList, const CDirList &dirs)
if(FOLDER_SYS==folder && !itsRoot && !itsCanStorePasswd)
{
- // If we modified sys, we're not root, and couldn't store the passwd, then kfontinst has already been called
+ // If we modified sys, we're not root, and couldn't store the passwd, then tdefontinst has already been called
// so no need to ask it to add folder to fontconfig and X's config files...
itsHasSys=true;
itsAddToSysFc=false;
@@ -1797,7 +1797,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool
if(!tmpCmd.isEmpty())
{
- cmd+=" && kfontinst ";
+ cmd+=" && tdefontinst ";
cmd+=tmpCmd;
cmd+=" ";
cmd+=TQFile::encodeName(TDEProcess::quote(*it));
@@ -1806,7 +1806,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool
}
else if (0!=itsNrsKfiParams[0])
{
- cmd+=" && kfontinst ";
+ cmd+=" && tdefontinst ";
cmd+=itsNrsKfiParams;
cmd+=" ";
cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[FOLDER_SYS].location));
@@ -1846,8 +1846,8 @@ void CKioFonts::doModified()
for(; it!=end; ++it)
{
- Misc::doCmd("kfontinst", itsKfiParams, TQFile::encodeName(*it));
- KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl;
+ Misc::doCmd("tdefontinst", itsKfiParams, TQFile::encodeName(*it));
+ KFI_DBUG << "RUN(root): tdefontinst " << itsKfiParams << ' ' << *it << endl;
}
if(itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
@@ -1885,8 +1885,8 @@ void CKioFonts::doModified()
for(; it!=end; ++it)
{
- Misc::doCmd("kfontinst", itsKfiParams, TQFile::encodeName(*it));
- KFI_DBUG << "RUN(non-root): kfontinst " << itsKfiParams << ' ' << *it << endl;
+ Misc::doCmd("tdefontinst", itsKfiParams, TQFile::encodeName(*it));
+ KFI_DBUG << "RUN(non-root): tdefontinst " << itsKfiParams << ' ' << *it << endl;
}
}
itsFolders[FOLDER_USER].modified.clear();
diff --git a/kcontrol/tdefontinst/tdeio/Makefile.am b/kcontrol/tdefontinst/tdeio/Makefile.am
index 9f59e28b..bde65435 100644
--- a/kcontrol/tdefontinst/tdeio/Makefile.am
+++ b/kcontrol/tdefontinst/tdeio/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdeio_fonts.la
tdeio_fonts_la_SOURCES = \
KioFonts.cpp
-tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la
+tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libtdefontinst.la
tdeio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
diff --git a/kcontrol/tdefontinst/thumbnail/CMakeLists.txt b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt
index 8d3c04b8..7d4ce2fb 100644
--- a/kcontrol/tdefontinst/thumbnail/CMakeLists.txt
+++ b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt
@@ -11,7 +11,7 @@
include_directories(
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+ ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -30,6 +30,6 @@ install( FILES fontthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
tde_add_kpart( fontthumbnail
SOURCES FontThumbnail.cpp
- LINK kfontinst-shared
+ LINK tdefontinst-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kcontrol/tdefontinst/thumbnail/Makefile.am b/kcontrol/tdefontinst/thumbnail/Makefile.am
index 49213a01..d9005a33 100644
--- a/kcontrol/tdefontinst/thumbnail/Makefile.am
+++ b/kcontrol/tdefontinst/thumbnail/Makefile.am
@@ -1,7 +1,7 @@
kde_module_LTLIBRARIES = fontthumbnail.la
fontthumbnail_la_SOURCES = FontThumbnail.cpp
-fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libkfontinst.la
+fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libtdefontinst.la
fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
METASOURCES = AUTO
diff --git a/kcontrol/tdefontinst/viewpart/CMakeLists.txt b/kcontrol/tdefontinst/viewpart/CMakeLists.txt
index 7fb621fe..5dd3ddc6 100644
--- a/kcontrol/tdefontinst/viewpart/CMakeLists.txt
+++ b/kcontrol/tdefontinst/viewpart/CMakeLists.txt
@@ -12,7 +12,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+ ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -24,32 +24,32 @@ link_directories(
##### other data ################################
-install( FILES kfontviewpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kfontview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kfontviewpart.rc kfontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/kfontview )
+install( FILES tdefontviewpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefontview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES tdefontviewpart.rc tdefontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/tdefontview )
-##### libkfontviewpart (module) #################
+##### libtdefontviewpart (module) #################
-tde_add_kpart( libkfontviewpart AUTOMOC
+tde_add_kpart( libtdefontviewpart AUTOMOC
SOURCES FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
- LINK kfontinstprint-static kfontinst-shared tdeparts-shared
+ LINK tdefontinstprint-static tdefontinst-shared tdeparts-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-##### kfontview (executable) ####################
+##### tdefontview (executable) ####################
-tde_add_executable( kfontview AUTOMOC
+tde_add_executable( tdefontview AUTOMOC
SOURCES FontViewerApp.cpp
LINK tdeparts-shared
DESTINATION ${BIN_INSTALL_DIR}
)
-##### kfontinstprint (static) ###################
+##### tdefontinstprint (static) ###################
-tde_add_library( kfontinstprint STATIC_PIC
+tde_add_library( tdefontinstprint STATIC_PIC
SOURCES KfiPrint.cpp
LINK tdeprint-shared
)
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index a95c4e4e..d04d1b3d 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -49,7 +49,7 @@
#include <kmessagebox.h>
#include <knuminput.h>
#include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kinputdialog.h>
#include <kdialog.h>
#include <kprinter.h>
@@ -85,7 +85,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
itsToolsFrame->setFrameShape(TQFrame::NoFrame);
previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
previewFrame->setFrameShape(TQFrame::Panel);
- setInstance(new TDEInstance("kfontview"));
+ setInstance(new TDEInstance("tdefontview"));
itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
@@ -113,7 +113,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print");
itsPrintAction->setEnabled(false);
- setXMLFile("kfontviewpart.rc");
+ setXMLFile("tdefontviewpart.rc");
setWidget(itsFrame);
}
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.h b/kcontrol/tdefontinst/viewpart/FontViewPart.h
index 29ef28d6..24f6d8d8 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.h
@@ -5,7 +5,7 @@
//
// Class Name : KFI::CFontViewPart
// Author : Craig Drummond
-// Project : K Font Installer (kfontinst-kcontrol)
+// Project : K Font Installer (tdefontinst-kcontrol)
// Creation Date : 03/08/2002
// Version : $Revision$ $Date$
//
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
index 41d06984..244c223d 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
@@ -35,9 +35,9 @@
extern "C"
{
- KDE_EXPORT void* init_libkfontviewpart()
+ KDE_EXPORT void* init_libtdefontviewpart()
{
- TDEGlobal::locale()->insertCatalogue("kfontinst");
+ TDEGlobal::locale()->insertCatalogue("tdefontinst");
return new KFI::CFontViewPartFactory;
}
}
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index 6690cc44..7df50ac8 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
@@ -2,7 +2,7 @@
//
// Class Names : KFI::CFontViewerApp, KFI::CFontViewerAppMainWindow
// Author : Craig Drummond
-// Project : K Font Installer (kfontinst-kcontrol)
+// Project : K Font Installer (tdefontinst-kcontrol)
// Creation Date : 30/04/2004
// Version : $Revision$ $Date$
//
@@ -45,7 +45,7 @@ namespace KFI
CFontViewerAppMainWindow::CFontViewerAppMainWindow()
: KParts::MainWindow((TQWidget *)0L)
{
- KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart");
+ KLibFactory *factory=KLibLoader::self()->factory("libtdefontviewpart");
if(factory)
{
@@ -112,7 +112,7 @@ static KCmdLineOptions options[] =
KCmdLineLastOption
};
-static TDEAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"),
+static TDEAboutData aboutData("tdefontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"),
TDEAboutData::License_GPL,
I18N_NOOP("(c) Craig Drummond, 2004"));
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
index 150c8cca..61ec7e4b 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
@@ -5,7 +5,7 @@
//
// Class Name : KFI::CFontViewerApp, KFI::CFontViewAppMainWindow
// Author : Craig Drummond
-// Project : K Font Installer (kfontinst-kcontrol)
+// Project : K Font Installer (tdefontinst-kcontrol)
// Creation Date : 30/04/2004
// Version : $Revision$ $Date$
//
diff --git a/kcontrol/tdefontinst/viewpart/Makefile.am b/kcontrol/tdefontinst/viewpart/Makefile.am
index dc6bbd11..22403916 100644
--- a/kcontrol/tdefontinst/viewpart/Makefile.am
+++ b/kcontrol/tdefontinst/viewpart/Makefile.am
@@ -1,30 +1,30 @@
-noinst_LTLIBRARIES = libkfontinstprint.la
-libkfontinstprint_la_SOURCES = KfiPrint.cpp
-libkfontinstprint_la_LDFLAGS = $(all_libraries)
-libkfontinstprint_la_LIBADD = $(LIB_TDEPRINT) ../lib/libkfontinst.la
+noinst_LTLIBRARIES = libtdefontinstprint.la
+libtdefontinstprint_la_SOURCES = KfiPrint.cpp
+libtdefontinstprint_la_LDFLAGS = $(all_libraries)
+libtdefontinstprint_la_LIBADD = $(LIB_TDEPRINT) ../lib/libtdefontinst.la
-kde_module_LTLIBRARIES = libkfontviewpart.la
+kde_module_LTLIBRARIES = libtdefontviewpart.la
-libkfontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
-libkfontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkfontviewpart_la_LIBADD = $(LIB_KPARTS) libkfontinstprint.la ../lib/libkfontinst.la
+libtdefontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
+libtdefontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+libtdefontviewpart_la_LIBADD = $(LIB_KPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la
noinst_HEADERS = FontViewPart.h FontViewPartFactory.h FontPreview.h FontViewerApp.h KfiPrint.h
-kde_services_DATA = kfontviewpart.desktop
+kde_services_DATA = tdefontviewpart.desktop
AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
METASOURCES = AUTO
-kfontview_LDADD = $(LIB_KPARTS)
-kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdefontview_LDADD = $(LIB_KPARTS)
+tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-bin_PROGRAMS = kfontview
-xdg_apps_DATA = kfontview.desktop
+bin_PROGRAMS = tdefontview
+xdg_apps_DATA = tdefontview.desktop
-appdata_DATA = kfontviewpart.rc kfontviewui.rc
-appdatadir = $(kde_datadir)/kfontview
+appdata_DATA = tdefontviewpart.rc tdefontviewui.rc
+appdatadir = $(kde_datadir)/tdefontview
-kfontview_SOURCES = FontViewerApp.cpp
+tdefontview_SOURCES = FontViewerApp.cpp
diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
index 88a96497..3e52511b 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
@@ -20,7 +20,7 @@ Name[tg]=Намоишгари КҲарф
Name[vi]=Trình xem phông chữ TDE
Name[wa]=Håyneu di fontes (TDEFontView)
Name[zh_CN]=字体预览
-Exec=kfontview %i %u
+Exec=tdefontview %i %u
Icon=fonts
X-TDE-StartupNotify=true
Type=Application
diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
index 1e624e00..ac1746bd 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
+++ b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
@@ -80,7 +80,7 @@ Name[zh_TW]=字型檢視器
Name[zu]=Umbukisi Wohlobo lwamagama
MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;fonts/package
ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-TDE-Library=libkfontviewpart
+X-TDE-Library=libtdefontviewpart
Type=Service
InitialPreference=1
Icon=fonts
diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc b/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc
index 5df54a47..cbd4bdfa 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc
+++ b/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kfontviewpart" version="1">
+<kpartgui name="tdefontviewpart" version="1">
<ToolBar name="mainToolBar">
<text>&amp;Main Toolbar</text>
<Action name="print"/>
diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewui.rc b/kcontrol/tdefontinst/viewpart/tdefontviewui.rc
index f2e4a86f..ad26d192 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontviewui.rc
+++ b/kcontrol/tdefontinst/viewpart/tdefontviewui.rc
@@ -1,4 +1,4 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kfontviewui" version="1">
+<kpartgui name="tdefontviewui" version="1">
</kpartgui>
diff --git a/kcontrol/tdeio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp
index 172b0f5e..0fc8e994 100644
--- a/kcontrol/tdeio/kcookiesmanagement.cpp
+++ b/kcontrol/tdeio/kcookiesmanagement.cpp
@@ -35,8 +35,8 @@
#include <kdialog.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
#include <kmessagebox.h>
#include <dcopref.h>
diff --git a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
index 6b7bd409..724901cc 100644
--- a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
@@ -318,6 +318,6 @@
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>klistviewsearchline.h</includehint>
+ <includehint>tdelistviewsearchline.h</includehint>
</includehints>
</UI>
diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp
index 9241e1a0..7e9b39f6 100644
--- a/kcontrol/tdeio/kcookiespolicies.cpp
+++ b/kcontrol/tdeio/kcookiespolicies.cpp
@@ -35,8 +35,8 @@
#include <kiconloader.h>
#include <kidna.h>
#include <kmessagebox.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
#include <klocale.h>
#include <tdeconfig.h>
#include <dcopref.h>
diff --git a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
index fb315acf..03703bf1 100644
--- a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
@@ -317,7 +317,7 @@ List of sites for which you have set a specific cookie policy. Specific policies
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>klistview.h</includehint>
- <includehint>klistviewsearchline.h</includehint>
+ <includehint>tdelistview.h</includehint>
+ <includehint>tdelistviewsearchline.h</includehint>
</includehints>
</UI>
diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp
index dd5dcfd1..eed6d6f7 100644
--- a/kcontrol/tdeio/kmanualproxydlg.cpp
+++ b/kcontrol/tdeio/kmanualproxydlg.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <knuminput.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <klineedit.h>
#include <kicontheme.h>
#include <kurifilter.h>
@@ -411,7 +411,7 @@ bool KManualProxyDlg::isValidURL( const TQString& _url, KURL* result ) const
KURL url (_url);
TQStringList filters;
- filters << "kshorturifilter" << "localdomainurifilter";
+ filters << "tdeshorturifilter" << "localdomainurifilter";
// If the typed URL is malformed, and the filters cannot filter it
// then it must be an invalid entry.
diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp
index a27f0c2d..0456aabd 100644
--- a/kcontrol/tdeio/socks.cpp
+++ b/kcontrol/tdeio/socks.cpp
@@ -26,7 +26,7 @@
#include <tqcheckbox.h>
#include <tdefiledialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kmessagebox.h>
#include <ksocks.h>
#include <kapplication.h>
diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp
index 67f13bf8..c325d2bc 100644
--- a/kcontrol/tdeio/useragentdlg.cpp
+++ b/kcontrol/tdeio/useragentdlg.cpp
@@ -34,7 +34,7 @@
#include <kdebug.h>
#include <tdeconfig.h>
#include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kmessagebox.h>
#include <ksimpleconfig.h>
#include <tdeio/http_slave_defaults.h>
diff --git a/kcontrol/tdeio/useragentdlg_ui.ui b/kcontrol/tdeio/useragentdlg_ui.ui
index db158b1d..c3c364f8 100644
--- a/kcontrol/tdeio/useragentdlg_ui.ui
+++ b/kcontrol/tdeio/useragentdlg_ui.ui
@@ -350,6 +350,6 @@ By default, only minimal identification information is sent to remote sites. The
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klineedit.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
</includehints>
</UI>
diff --git a/kcontrol/tdm/tdm-conv.h b/kcontrol/tdm/tdm-conv.h
index 1a086ec6..4015e21b 100644
--- a/kcontrol/tdm/tdm-conv.h
+++ b/kcontrol/tdm/tdm-conv.h
@@ -30,10 +30,10 @@
#include <tqcheckbox.h>
#include <tqspinbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kcombobox.h>
#include <kcolorbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kurl.h>
#include <pwd.h>
diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp
index 954759df..c0e31718 100644
--- a/kcontrol/tdm/tdm-font.cpp
+++ b/kcontrol/tdm/tdm-font.cpp
@@ -31,7 +31,7 @@
#include <kdialog.h>
#include <ksimpleconfig.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
#include <klocale.h>
#include "tdm-font.h"
diff --git a/kcontrol/tdm/tdm-users.h b/kcontrol/tdm/tdm-users.h
index c5167655..08c66c6f 100644
--- a/kcontrol/tdm/tdm-users.h
+++ b/kcontrol/tdm/tdm-users.h
@@ -30,7 +30,7 @@
#include <tqwidgetstack.h>
#include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kcombobox.h>
#include <kurl.h>
diff --git a/kdcop/kdcoplistview.h b/kdcop/kdcoplistview.h
index 1851d956..8b537a15 100644
--- a/kdcop/kdcoplistview.h
+++ b/kdcop/kdcoplistview.h
@@ -8,7 +8,7 @@
#define __KDCOPLISTVIEW_H__
-#include <klistview.h>
+#include <tdelistview.h>
class TQDragObject;
class KDCOPListView : public TDEListView
diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui
index 60092917..3b67fa24 100644
--- a/kdcop/kdcopview.ui
+++ b/kdcop/kdcopview.ui
@@ -142,8 +142,8 @@
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>klistviewsearchline.h</includehint>
+ <includehint>tdelistviewsearchline.h</includehint>
<includehint>kdcoplistview.h</includehint>
- <includehint>klistbox.h</includehint>
+ <includehint>tdelistbox.h</includehint>
</includehints>
</UI>
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index d9e6baaa..9ffc0cc2 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -12,7 +12,7 @@
#include <klocale.h>
#include <kdatastream.h>
#include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kmessagebox.h>
#include <kdialog.h>
@@ -20,11 +20,11 @@
#include <kiconloader.h>
#include <klineedit.h>
#include <keditlistbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kdialogbase.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kcolorbutton.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
#include <tqtimer.h>
#include <tqwidgetstack.h>
diff --git a/kdcop/kdcopwindow.h b/kdcop/kdcopwindow.h
index ce8d94a4..bf0fe532 100644
--- a/kdcop/kdcopwindow.h
+++ b/kdcop/kdcopwindow.h
@@ -15,7 +15,7 @@ class TQWidgetStack;
class TQLabel;
class KDCOPListView;
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include "kdcoplistview.h"
#include "kdcopview.h"
diff --git a/kdebugdialog/CMakeLists.txt b/kdebugdialog/CMakeLists.txt
index 8c478bbc..f6eccd0f 100644
--- a/kdebugdialog/CMakeLists.txt
+++ b/kdebugdialog/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
tde_add_executable( kdebugdialog AUTOMOC
SOURCES
main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp
- klistdebugdialog.cpp
+ tdelistdebugdialog.cpp
LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdebugdialog/Makefile.am b/kdebugdialog/Makefile.am
index e3ed333f..9d5a6e25 100644
--- a/kdebugdialog/Makefile.am
+++ b/kdebugdialog/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES= $(all_includes)
bin_PROGRAMS = kdebugdialog
-kdebugdialog_SOURCES = main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp klistdebugdialog.cpp
+kdebugdialog_SOURCES = main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp tdelistdebugdialog.cpp
kdebugdialog_METASOURCES = AUTO
kdebugdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH)
kdebugdialog_LDADD = $(LIB_TDEUI)
diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp
index e1635ef2..1cc085a0 100644
--- a/kdebugdialog/main.cpp
+++ b/kdebugdialog/main.cpp
@@ -18,7 +18,7 @@
*/
#include "kdebugdialog.h"
-#include "klistdebugdialog.h"
+#include "tdelistdebugdialog.h"
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <kstandarddirs.h>
diff --git a/kdebugdialog/tdelistdebugdialog.cpp b/kdebugdialog/tdelistdebugdialog.cpp
index 68d02fd7..42d0cd8c 100644
--- a/kdebugdialog/tdelistdebugdialog.cpp
+++ b/kdebugdialog/tdelistdebugdialog.cpp
@@ -18,7 +18,7 @@
*/
-#include "klistdebugdialog.h"
+#include "tdelistdebugdialog.h"
#include <tdeconfig.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -190,4 +190,4 @@ void TDEListDebugDialog::activateArea( TQCString area, bool activate )
}
}
-#include "klistdebugdialog.moc"
+#include "tdelistdebugdialog.moc"
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index 968cdcc3..2f88769d 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -53,7 +53,7 @@ configure_file( kdesktop.desktop.cmake kdesktop.desktop @ONLY )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kdesktop.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kdesktop_custom_menu1 kdesktop_custom_menu2 DESTINATION ${CONFIG_INSTALL_DIR} )
install( FILES kdesktopSetAsBackground.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
-install( FILES kdesktop.kcfg klaunch.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES kdesktop.kcfg tdelaunch.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
##### kcheckrunning (executable) ################
@@ -101,5 +101,5 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
##### kdesktopsettings (static) #################
tde_add_library( kdesktopsettings STATIC_PIC
- SOURCES kdesktopsettings.kcfgc klaunchsettings.kcfgc
+ SOURCES kdesktopsettings.kcfgc tdelaunchsettings.kcfgc
)
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index f363ac17..959018af 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -15,7 +15,7 @@ noinst_LTLIBRARIES = libkdesktopsettings.la
libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined
libkdesktopsettings_la_LIBADD = $(LIB_TDECORE)
-libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc klaunchsettings.kcfgc
+libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc tdelaunchsettings.kcfgc
kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
lockeng.cc KDesktopIface.skel \
@@ -56,10 +56,10 @@ lockeng.lo: kdesktopsettings.h
main.lo: kdesktopsettings.h
minicli.lo: kdesktopsettings.h
-# List made with: grep -l klaunchsettings.h *[pc] | sed -e 's/\.c.*$/.lo: klaunchsettings.h/'
-desktop.lo: klaunchsettings.h
-klaunchsettings.lo: klaunchsettings.h
-startupid.lo: klaunchsettings.h
+# List made with: grep -l tdelaunchsettings.h *[pc] | sed -e 's/\.c.*$/.lo: tdelaunchsettings.h/'
+desktop.lo: tdelaunchsettings.h
+tdelaunchsettings.lo: tdelaunchsettings.h
+startupid.lo: tdelaunchsettings.h
messages: rc.cpp
$(EXTRACTRC) lock/*.ui >> rc.cpp
@@ -74,4 +74,4 @@ autostartdir = $(datadir)/autostart
konqservice_DATA = kdesktopSetAsBackground.desktop
konqservicedir = $(kde_datadir)/konqueror/servicemenus
-kde_kcfg_DATA = kdesktop.kcfg klaunch.kcfg
+kde_kcfg_DATA = kdesktop.kcfg tdelaunch.kcfg
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index cc7838b4..65e532af 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -27,7 +27,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kipc.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <twinmodule.h>
#include <krootpixmap.h>
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 9ff390ec..5b125de2 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -26,7 +26,7 @@
#include "kdiconview.h"
#include "minicli.h"
#include "kdesktopsettings.h"
-#include "klaunchsettings.h"
+#include "tdelaunchsettings.h"
#include <string.h>
#include <unistd.h>
@@ -59,12 +59,12 @@
#include <krun.h>
#include <twin.h>
#include <kglobalsettings.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kapplication.h>
#include <kdirlister.h>
// Create the equivalent of TDEAccelBase::connectItem
// and then remove this include and fix reconnects in initRoot() -- ellis
-//#include <kaccelbase.h>
+//#include <tdeaccelbase.h>
extern int kdesktop_screen_number;
extern TQCString kdesktop_name, kicker_name, twin_name;
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index d80af8fe..e8e95b2d 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -23,7 +23,7 @@
#include "kdesktopsettings.h"
#include <tdeio/paste.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kapplication.h>
#include <kcolordrag.h>
#include <kdebug.h>
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index 7d8ff152..f74b6795 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -23,7 +23,7 @@
#include <tqlistview.h>
#include <konq_iconviewwidget.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdefileitem.h>
#include <kdirnotify.h>
#include <kmessagebox.h>
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 62bb0e2b..71998713 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -34,7 +34,7 @@
#include <kprocess.h>
#include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kcmultidialog.h>
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 0572413a..e61167fc 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -20,7 +20,7 @@
#include <config.h>
#include "startupid.h"
-#include "klaunchsettings.h"
+#include "tdelaunchsettings.h"
#include <kiconloader.h>
#include <tqcursor.h>
diff --git a/kdesktop/tdelaunch.kcfg b/kdesktop/tdelaunch.kcfg
index f43592e7..0bd19a0d 100644
--- a/kdesktop/tdelaunch.kcfg
+++ b/kdesktop/tdelaunch.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="klaunchrc" />
+ <kcfgfile name="tdelaunchrc" />
<!-- generated by TDEConfig XTraKtor -->
<group name="BusyCursorSettings">
diff --git a/kdesktop/tdelaunchsettings.kcfgc b/kdesktop/tdelaunchsettings.kcfgc
index 4d10d280..f7043920 100644
--- a/kdesktop/tdelaunchsettings.kcfgc
+++ b/kdesktop/tdelaunchsettings.kcfgc
@@ -1,4 +1,4 @@
-File=klaunch.kcfg
+File=tdelaunch.kcfg
ClassName=TDELaunchSettings
Singleton=true
Mutators=true
diff --git a/kdialog/CMakeLists.txt b/kdialog/CMakeLists.txt
index 2ec728f6..6620430d 100644
--- a/kdialog/CMakeLists.txt
+++ b/kdialog/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
tde_add_executable( kdialog AUTOMOC
SOURCES
- kdialog.cpp widgets.cpp klistboxdialog.cpp
+ kdialog.cpp widgets.cpp tdelistboxdialog.cpp
progressdialog.cpp progressdialogiface.skel
LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR}
diff --git a/kdialog/Makefile.am b/kdialog/Makefile.am
index 6340ce37..be19a45b 100644
--- a/kdialog/Makefile.am
+++ b/kdialog/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kdialog
-kdialog_SOURCES = kdialog.cpp widgets.cpp klistboxdialog.cpp progressdialog.cpp progressdialogiface.skel
+kdialog_SOURCES = kdialog.cpp widgets.cpp tdelistboxdialog.cpp progressdialog.cpp progressdialogiface.skel
kdialog_LDADD = $(LIB_KIO)
kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index 2f365c12..67b1af20 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -33,9 +33,9 @@
#include <kapplication.h>
#include <kdebug.h>
//#include <ktopwidget.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kpassivepopup.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
#include <kapplication.h>
#include "widgets.h"
diff --git a/kdialog/tdelistboxdialog.cpp b/kdialog/tdelistboxdialog.cpp
index 65be6c71..f3fc6242 100644
--- a/kdialog/tdelistboxdialog.cpp
+++ b/kdialog/tdelistboxdialog.cpp
@@ -21,8 +21,8 @@
#include <tqlistbox.h>
#include <tqvbox.h>
-#include "klistboxdialog.h"
-#include "klistboxdialog.moc"
+#include "tdelistboxdialog.h"
+#include "tdelistboxdialog.moc"
#include "klocale.h"
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index 1563a817..cf1040ed 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -22,7 +22,7 @@
#include <kmessagebox.h>
#include "widgets.h"
-#include "klistboxdialog.h"
+#include "tdelistboxdialog.h"
#include "progressdialog.h"
#include <kinputdialog.h>
#include <kpassdlg.h>
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index 7b5f510b..d9c285f6 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -31,7 +31,7 @@
#include <kmessagebox.h>
#include <kmimetype.h>
#include <kglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tdeio/netaccess.h>
#include <kurldrag.h>
#include <tqptrlist.h>
diff --git a/kfind/kfwin.h b/kfind/kfwin.h
index 66d9424b..5a019a38 100644
--- a/kfind/kfwin.h
+++ b/kfind/kfwin.h
@@ -7,7 +7,7 @@
#ifndef KFWIN_H
#define KFWIN_H
-#include <klistview.h>
+#include <tdelistview.h>
#include <tdefileitem.h>
#include <kurl.h>
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index 9bea6800..1f0df453 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -23,7 +23,7 @@
#include <kcharsets.h>
#include <kcombobox.h>
#include <tdeconfig.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
#include <tdehtmldefaults.h>
#include <klocale.h>
#include <knuminput.h>
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index e1f6aaa7..3f8fc50e 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kprocess.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index e0d9fd90..616c51b8 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -20,7 +20,7 @@
#ifndef KHC_GLOSSARY_H
#define KHC_GLOSSARY_H
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqdict.h>
#include <tqdom.h>
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index 1a5218da..c15ce681 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -20,11 +20,11 @@
#include "history.h"
#include "view.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
-#include <kmainwindow.h>
-#include <kpopupmenu.h>
+#include <tdemainwindow.h>
+#include <tdepopupmenu.h>
#include <kstdguiitem.h>
#include <kstringhandler.h>
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index 0e8e5875..4b9c3087 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -27,7 +27,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kurl.h>
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 12646c33..303dbfec 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -39,7 +39,7 @@
#include <ktempfile.h>
#include <kurlrequester.h>
#include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klineedit.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index c5b4932b..f8d02f18 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -37,9 +37,9 @@
#include <kdebug.h>
#include <tdehtmlview.h>
#include <tdehtml_settings.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kdialogbase.h>
#include <tqsplitter.h>
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 698e0150..795b6e13 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -3,7 +3,7 @@
#include <tqptrlist.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tdeio/job.h>
#include <kurl.h>
#include <tdeparts/browserextension.h>
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index eb5e0c4f..55809904 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -37,14 +37,14 @@
#include <tqpushbutton.h>
#include <tqtooltip.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kglobal.h>
#include <klocale.h>
#include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <kprocio.h>
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index fef806e2..f91de432 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -23,7 +23,7 @@
#include "glossary.h"
-#include <klistview.h>
+#include <tdelistview.h>
#include <kurl.h>
#include <tqfile.h>
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index c4bf2c18..8be81361 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -5,14 +5,14 @@
#include <dom/html_document.h>
#include <dom/html_misc.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
#include <kapplication.h>
#include <kdebug.h>
#include <tdehtml_settings.h>
#include <tdehtmlview.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <tqfileinfo.h>
diff --git a/khotkeys/data/trinity2b1.khotkeys b/khotkeys/data/trinity2b1.khotkeys
index 405dc47b..203f65fa 100644
--- a/khotkeys/data/trinity2b1.khotkeys
+++ b/khotkeys/data/trinity2b1.khotkeys
@@ -1063,7 +1063,7 @@ Comment[ru]=С версии 3.1 Konqueror поддерживает работу
Comment[sk]=Dobre, Konqi v TDE má panely a teraz môžete mať tiež gestá. Nepotrebujete používať iné prehliadače >;).\n\nJednoducho stlačte stredné tlačidlo myši a začnite kresliť jedno z gest a keď skončíte, pustite tlačidlo myši. Ak iba potrebujete vložiť výber, stále to funguje, stačí jednoducho kliknúť stredným tlačidlom myši. (Môžete zmeniť tlačidlo myši, ktoré má byť použité v globálnych nastaveniach).\n\nMomentálne sú dostupné tieto gestá:\npresunúť doprava a späť doľava - Vpred (Alt+Vpravo)\npresunúť doľava a späť doprava - Späť (Alt+Vľavo)\npresunúť nahor a späť nadol - Hore (Alt+Hore)\nKruh proti hodinovým ručičkám - Obnoviť (F5)\n (Akonáhle zistím, ktoré sú v Opere alebo Mozille, pridám viac a uistím sa, že sú také isté. Alebo ak ich chcete vytvoriť sami, kľudne mi pomôžte a pošlite mi vaše khotkeysrc.)\n\nTvary gest (niektoré dialógy sú z KGesture, vďaka Mikeovi Pilonovi) môžete jednoducho zadať ich vykonaním v konfiguračnom dialógu. Môžete sa tiež pozrieť na numerickú časť klávesnice, gestá sú totiž rozoznávané ako mriežka 3x3 poľa očíslovaného od 1 do 9.\n\nVšimnite si, že musíte urobiť gesto presne tak, ako je definované, aby sa akcia spustila. Kvôli tomu je možné zadať viac gest pre jednu akciu. Snažte sa vyhnúť komplikovaným gestám, tde meníte smer pohybu myši viac než raz (t.j. urobiť napríklad 45654 alebo 74123, pretože sú jednoduché na vykonanie, ale napríklad 1236987 už môže byť celkom zložité).\n\nPodmienky pre všetky gestá sú definované v tejto skupine. Všetky tieto gestá sú aktívne iba vtedy, keď je aktívne okno Konqueror (trieda obsahuje 'konqueror').
Comment[sr]=У реду, Konqi од TDE има језичке, а сад може имати и гестове. Нема потребе да користити друге прегледаче >;).\n\nСамо притисните средње дугме миша и почните да цртате један од гестова, и пошто завршите, пустите дугме миша. Ако само желите да пренесете избора, може и то, само кликните на средње дугме миша. (можете у глобалним поставкама променити дугме миша за гестове).\n\nТренутно, доступни су следећи гестови:\nпокред десно па лево — Напред (Alt+Right)\nпокрет лево па десно — Назад (Alt+Left)\nпокрет горе па доле — Горе (Alt+Up)\nкруг обрнуто казаљки на сату — Поновно учитавње (F5)\n (Чим сазнам које су у Opera-и или Mozilla-и, додаћу их и осигурати да су исте. Или ако то сами учините, слободно ми помозите тако што ћете ми послати свој khotkeysrc.)\n\nОблици гестова (неки од дијалога су из KGesture-а, хвала Мајку Пајлонеу) могу се уносити једноставним извођењем у дијалогу за подешавања. Можете као помоћ такође гледати у нумерички блок тастатуре, јер се гестови препознају као 3×3 мрежа поља, нумерисана од 1 до 9.\n\nГест се мора тачно извести да би се покренула радња, због чега је могуће задати више гестова за исту радњу. Требало би да избегавате компликоване гестове, код којих се смер миша мора мењати више од једанпут (нпр. 45654 или 74123 једноставни су за извођење, али већ нпр. 1236987 може бити врло захтеван).\n\nУслов за све гестове дефинисан је у овој групи. Сви ови гестови активни су само ако је активан прозор Konqueror-а (класа садржи „konqueror“).
Comment[sr@Latn]=U redu, Konqi od TDE ima jezičke, a sad može imati i gestove. Nema potrebe da koristiti druge pregledače >;).\n\nSamo pritisnite srednje dugme miša i počnite da crtate jedan od gestova, i pošto završite, pustite dugme miša. Ako samo želite da prenesete izbora, može i to, samo kliknite na srednje dugme miša. (možete u globalnim postavkama promeniti dugme miša za gestove).\n\nTrenutno, dostupni su sledeći gestovi:\npokred desno pa levo — Napred (Alt+Right)\npokret levo pa desno — Nazad (Alt+Left)\npokret gore pa dole — Gore (Alt+Up)\nkrug obrnuto kazaljki na satu — Ponovno učitavnje (F5)\n (Čim saznam koje su u Opera-i ili Mozilla-i, dodaću ih i osigurati da su iste. Ili ako to sami učinite, slobodno mi pomozite tako što ćete mi poslati svoj khotkeysrc.)\n\nOblici gestova (neki od dijaloga su iz KGesture-a, hvala Majku Pajloneu) mogu se unositi jednostavnim izvođenjem u dijalogu za podešavanja. Možete kao pomoć takođe gledati u numerički blok tastature, jer se gestovi prepoznaju kao 3×3 mreža polja, numerisana od 1 do 9.\n\nGest se mora tačno izvesti da bi se pokrenula radnja, zbog čega je moguće zadati više gestova za istu radnju. Trebalo bi da izbegavate komplikovane gestove, kod kojih se smer miša mora menjati više od jedanput (npr. 45654 ili 74123 jednostavni su za izvođenje, ali već npr. 1236987 može biti vrlo zahtevan).\n\nUslov za sve gestove definisan je u ovoj grupi. Svi ovi gestovi aktivni su samo ako je aktivan prozor Konqueror-a (klasa sadrži „konqueror“).
-Comment[sv]=Ja, Konqeror i TDE har flikar, och nu kan du också få gester. Ingen anledning att använda andra webbläsare.\n\nTryck bara på musens mittenknapp och börja rita en gest. Släpp musknappen när du är klar. Om du bara behöver klistra in markeringen, fungerar det också. Klicka helt enkelt bara med musens mittenknapp. (Du kan ändra musknapp som används i de allmänna inställningarna.)\n\nFör närvarande finns följande gester tillgängliga:\nFlytta höger och tillbaka åt vänster - Framåt (Alt+Högerpil)\nFlytta vänster och tillbaka åt höger - Bakåt (Alt+Vänsterpil)\nFlytta uppåt och tillbaka neråt - Upp (Alt+Uppåtpil)\nCirkel moturs - Uppdatera (F5)\n(Så fort jag får reda på vilka som finns i Opera och Mozilla, ska jag lägga till flera, och försäkra mig om att de är likadana. Eller om du gör det själv, hjälp mig gärna och skicka mig din khotkeysrc.)\n\nGesternas form kan helt enkelt matas in genom att utföra dem i inställningsdialogrutan (några av dialogrutorna kommer från Kgesture, tack till Mike Pilone). Du kan också titta på det numeriska tangentbordet för hjälp. Gester känns igen som ett 3x3 rutnät av fält, numrerade från 1 till 9.\n\nObservera att du måste utföra gesten exakt för att åtgärden ska utlösas. På grund av det är det möjligt att mata in flera gester för en åtgärd. Du bör försöka undvika komplicerade gester där musens riktning ändras mer än en gång (dvs. använd till exempel 45654 eller 74123 efter som de är enkla att utföra, men till exempel 1236987 kan redan den vara ganska svår).\n\nVillkor för alla gester definieras i denna grupp. Alla gester är bara aktiva om det aktiva fönstret är Konqueror (klassen innehåller 'konqueror').
+Comment[sv]=Ja, Konqeror i TDE har flikar, och nu kan du också få gester. Ingen anledning att använda andra webbläsare.\n\nTryck bara på musens mittenknapp och börja rita en gest. Släpp musknappen när du är klar. Om du bara behöver tdelistra in markeringen, fungerar det också. Klicka helt enkelt bara med musens mittenknapp. (Du kan ändra musknapp som används i de allmänna inställningarna.)\n\nFör närvarande finns följande gester tillgängliga:\nFlytta höger och tillbaka åt vänster - Framåt (Alt+Högerpil)\nFlytta vänster och tillbaka åt höger - Bakåt (Alt+Vänsterpil)\nFlytta uppåt och tillbaka neråt - Upp (Alt+Uppåtpil)\nCirkel moturs - Uppdatera (F5)\n(Så fort jag får reda på vilka som finns i Opera och Mozilla, ska jag lägga till flera, och försäkra mig om att de är likadana. Eller om du gör det själv, hjälp mig gärna och skicka mig din khotkeysrc.)\n\nGesternas form kan helt enkelt matas in genom att utföra dem i inställningsdialogrutan (några av dialogrutorna kommer från Kgesture, tack till Mike Pilone). Du kan också titta på det numeriska tangentbordet för hjälp. Gester känns igen som ett 3x3 rutnät av fält, numrerade från 1 till 9.\n\nObservera att du måste utföra gesten exakt för att åtgärden ska utlösas. På grund av det är det möjligt att mata in flera gester för en åtgärd. Du bör försöka undvika komplicerade gester där musens riktning ändras mer än en gång (dvs. använd till exempel 45654 eller 74123 efter som de är enkla att utföra, men till exempel 1236987 kan redan den vara ganska svår).\n\nVillkor för alla gester definieras i denna grupp. Alla gester är bara aktiva om det aktiva fönstret är Konqueror (klassen innehåller 'konqueror').
Comment[zh_TW]=TDE 中的 Konqi 有分頁,現在您也可以用手勢。不需要使用其它的瀏覽器了。\n\n只要按住滑鼠中鍵,然後開始畫某個手勢,畫完以後放開。如果您只是要貼上選擇的文字,您還是可以只簡單點選中鍵。(您可以在全域設定中改變滑鼠按鍵的定義。)\n\n現在,有這些手勢可以使用:\n往右移再往左移─表示往下一頁(Alt+右鍵)\n往左移再往右移─表示返回前一頁(Alt+左鍵)\n往上移再往下移─表示往上一層(Alt+上鍵)\n逆時針畫圈圈─重新載入(F5)\n(等我找出更多 Opera 或 Mozilla 的手勢,我會再加入。您也可以自己加入,並將您的 khotkeysrc 寄送給我。)\n\n手勢的形狀(有些對話框是從 KGesture 而來,感謝 Mike Pilone)可以在設定對話框中輸入。您也可以用鍵盤上的數字方向鍵。手勢就像是個 3x3 的格子,從 1 到 9。\n\n注意,您必須要完整做完手勢才會觸發動作,因此您可以對某動作輸入多個手勢。您應該避免使用太複雜的手勢,(例如:45654 或 74123 夠簡單,可以使用,但是 1236987 就可能有點困難)。\n\n所有手勢的條件都定義在此群組中。這些手勢只會在視窗類別為 Konqueror 才有作用。
DataCount=4
Enabled=false
diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h
index 58751599..2fffc2b1 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.h
+++ b/khotkeys/kcontrol/kcmkhotkeys.h
@@ -12,7 +12,7 @@
#define _KCMKHOTKEYS_H_
#include <tdecmodule.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <actions.h>
#include <settings.h>
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 97e37282..56909b0a 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -20,7 +20,7 @@
#include <kglobal.h>
#include <klocale.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kapplication.h>
#include <dcopclient.h>
#include <tqlabel.h>
diff --git a/khotkeys/kcontrol/menuedit.h b/khotkeys/kcontrol/menuedit.h
index 56a87079..f7aa4343 100644
--- a/khotkeys/kcontrol/menuedit.h
+++ b/khotkeys/kcontrol/menuedit.h
@@ -13,7 +13,7 @@
#include <tqstring.h>
#include <kdialogbase.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kservice.h>
// see also tdebase/kmenuedit/khotkeys.h
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 258c6cfd..cbd16edc 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -27,9 +27,9 @@
#include <kdebug.h>
#include <klocale.h>
#include <kapplication.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <tdeconfig.h>
-#include <kshortcutlist.h>
+#include <tdeshortcutlist.h>
#include <kkeybutton.h>
#include <kkeydialog.h>
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index bc383b92..6f87fee1 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -26,7 +26,7 @@
#include <dcopclient.h>
#include <kdesktopfile.h>
#include <klocale.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kservice.h>
#include <kprocess.h>
diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h
index ac1f70f6..c6bbdf1e 100644
--- a/khotkeys/shared/input.h
+++ b/khotkeys/shared/input.h
@@ -16,7 +16,7 @@
#include <tqmap.h>
#include <tqwidget.h>
#include <tqvaluelist.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <X11/X.h>
#include <fixx11h.h>
diff --git a/khotkeys/shared/khlistbox.h b/khotkeys/shared/khlistbox.h
index 9ffe9d42..d0f9b51a 100644
--- a/khotkeys/shared/khlistbox.h
+++ b/khotkeys/shared/khlistbox.h
@@ -13,7 +13,7 @@
#include <tqtimer.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
namespace KHotKeys
{
diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h
index 619fbb1e..2cee3461 100644
--- a/khotkeys/shared/khlistview.h
+++ b/khotkeys/shared/khlistview.h
@@ -13,7 +13,7 @@
#include <tqtimer.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kdemacros.h>
namespace KHotKeys
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index 2820c2c5..43f9ad7c 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -19,7 +19,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kglobal.h>
#include <kmessagebox.h>
diff --git a/khotkeys/shared/settings.h b/khotkeys/shared/settings.h
index c7b16287..e28502cf 100644
--- a/khotkeys/shared/settings.h
+++ b/khotkeys/shared/settings.h
@@ -12,7 +12,7 @@
#define _SETTINGS_H_
#include "actions.h"
-#include <kshortcut.h>
+#include <tdeshortcut.h>
class TDEConfig;
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index 29cd1025..1f883827 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -22,7 +22,7 @@
#include <twinmodule.h>
#include <klocale.h>
#include <netwm_def.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <X11/Xlib.h>
#include <X11/keysym.h>
diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h
index 145652a9..ccd07563 100644
--- a/khotkeys/shared/voices.h
+++ b/khotkeys/shared/voices.h
@@ -12,7 +12,7 @@
#define VOICES_H_
#include <tqwidget.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
class Sound;
class TQTimer;
diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui
index 024caaef..e7181c52 100644
--- a/kicker/applets/clock/analog.ui
+++ b/kicker/applets/clock/analog.ui
@@ -332,7 +332,7 @@
</tabstops>
<includes>
<include location="local" impldecl="in implementation">kdialog.h</include>
- <include location="local" impldecl="in implementation">kfontrequester.h</include>
+ <include location="local" impldecl="in implementation">tdefontrequester.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 92420e65..58f6d9da 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -45,10 +45,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kapplication.h>
#include <kprocess.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstringhandler.h>
#include <tdefiledialog.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
#include <kglobalsettings.h>
#include <tdeconfigdialogmanager.h>
#include <kcalendarsystem.h>
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index 1450e6f4..7fad4283 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -289,7 +289,7 @@
</tabstops>
<includes>
<include location="local" impldecl="in implementation">kdialog.h</include>
- <include location="local" impldecl="in implementation">kfontrequester.h</include>
+ <include location="local" impldecl="in implementation">tdefontrequester.h</include>
<include location="local" impldecl="in implementation">digital.ui.h</include>
</includes>
<Q_SLOTS>
diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui
index 28bcd718..386315bc 100644
--- a/kicker/applets/clock/fuzzy.ui
+++ b/kicker/applets/clock/fuzzy.ui
@@ -275,13 +275,13 @@
</tabstops>
<includes>
<include location="local" impldecl="in implementation">kdialog.h</include>
- <include location="local" impldecl="in implementation">kfontrequester.h</include>
+ <include location="local" impldecl="in implementation">tdefontrequester.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
- <includehint>kfontrequester.h</includehint>
+ <includehint>tdefontrequester.h</includehint>
</includehints>
</UI>
diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index 8cf33686..4285ff74 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -45,10 +45,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kapplication.h>
#include <kprocess.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstringhandler.h>
#include <tdefiledialog.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
#include <kglobalsettings.h>
#include <tdeconfigdialogmanager.h>
#include <kcalendarsystem.h>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 170a830f..6f63694a 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -497,7 +497,7 @@
<includes>
<include location="local" impldecl="in implementation">tqheader.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
- <include location="local" impldecl="in implementation">kfontrequester.h</include>
+ <include location="local" impldecl="in implementation">tdefontrequester.h</include>
</includes>
<Q_SLOTS>
<slot>configureType()</slot>
@@ -507,10 +507,10 @@
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
- <includehint>kfontrequester.h</includehint>
+ <includehint>tdefontrequester.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
- <includehint>kfontrequester.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdefontrequester.h</includehint>
+ <includehint>tdelistview.h</includehint>
</includehints>
</UI>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index f8c2fc59..3a313fbe 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqfile.h>
#include <tqtooltip.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <time.h>
#include <stdlib.h> // for getenv()
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index c66f4ceb..199a7b75 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpopupmenu.h>
#include <tqtooltip.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <kickertip.h>
#include <klocale.h>
#include <kdesktopfile.h>
diff --git a/kicker/applets/launcher/quictdelauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp
index 15439f9c..8a1c1c9d 100644
--- a/kicker/applets/launcher/quictdelauncher.cpp
+++ b/kicker/applets/launcher/quictdelauncher.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h>
#include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kaboutapplication.h>
#include <kaboutdata.h>
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index b6e1e799..f2aa6be2 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -24,7 +24,7 @@
#include <kaboutdata.h>
#include <kaboutapplication.h>
#include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kiconloader.h>
#include "mediaapplet.h"
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index a180cfbd..7f4118bf 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -38,7 +38,7 @@
#include <kipc.h>
#include <kiconloader.h>
#include <kurldrag.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <konq_operations.h>
#include <konq_popupmenu.h>
diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h
index 1bc6380c..76e448b2 100644
--- a/kicker/applets/media/mediumbutton.h
+++ b/kicker/applets/media/mediumbutton.h
@@ -28,7 +28,7 @@
#include <tqtimer.h>
#include <tdefileitem.h>
#include <kpanelapplet.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
class MediumButton : public PanelPopupButton
{
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index bd1a21b0..8fbd958f 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -23,7 +23,7 @@
#include <kmimetype.h>
#include <tqvbox.h>
#include <tqwhatsthis.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tdefiledetailview.h>
class MediumTypeItem : public TQCheckListItem
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 6662d57d..7ff922ed 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klocale.h>
#include <kdebug.h>
#include <kprocess.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <dcopclient.h>
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index eb1ba784..78353abb 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -590,9 +590,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
bp.drawRect(0, 0, ww, wh);
bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background());
- Task::List tasklist;
- tasklist.append(m_currentWindow);
- TaskDrag* drag = new TaskDrag(tasklist, this);
+ Task::List tastdelist;
+ tastdelist.append(m_currentWindow);
+ TaskDrag* drag = new TaskDrag(tastdelist, this);
TQPoint offset(m_pager->clickPos.x() - (r.x() * w / dw),
m_pager->clickPos.y() - (r.y() * h / dh));
drag->setPixmap(windowImage, offset);
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 4e333276..c953ec63 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -32,7 +32,7 @@
#include <kaboutapplication.h>
#include <kaboutdata.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <tqpushbutton.h>
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index 5f930190..eec48637 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -213,7 +213,7 @@ void RunApplet::run_command(const TQString& command)
_filterData->setData( _input->currentText().stripWhiteSpace() );
TQStringList filters;
- filters << "kurisearchfilter" << "kshorturifilter";
+ filters << "kurisearchfilter" << "tdeshorturifilter";
KURIFilter::self()->filterURI( *(_filterData), filters );
_input->addToHistory(command);
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 850e4a51..c1117fb2 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <krun.h>
#include <twinmodule.h>
#include <kdialogbase.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
#include <kiconloader.h>
#include <twin.h>
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 478ac01e..3b7ae419 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -24,7 +24,7 @@
#include <kaboutdata.h>
#include <kaboutapplication.h>
#include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kiconloader.h>
#include "trashapplet.h"
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index fe8ad320..526048c5 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <krun.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tdeio/netaccess.h>
diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index 15c5d598..bbf596a0 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -28,7 +28,7 @@
#include <tqtimer.h>
#include <tdefileitem.h>
#include <kpanelapplet.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
class TrashButton : public PanelPopupButton
{
diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp
index 5a9ea355..71419922 100644
--- a/kicker/extensions/dockbar/dockcontainer.cpp
+++ b/kicker/extensions/dockbar/dockcontainer.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqvalidator.h>
#include <kinputdialog.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kdebug.h>
#include "dockcontainer.h"
diff --git a/kicker/extensions/kasbar/CMakeLists.txt b/kicker/extensions/kasbar/CMakeLists.txt
index c9fd0e73..31a1db89 100644
--- a/kicker/extensions/kasbar/CMakeLists.txt
+++ b/kicker/extensions/kasbar/CMakeLists.txt
@@ -33,7 +33,7 @@ set( target kasbar )
set( ${target}_SRCS
kasbar.cpp kasitem.cpp kastaskitem.cpp kastasker.cpp
- kaspopup.cpp kastaskpopup.cpp kasstartupitem.cpp
+ kaspopup.cpp kastastdepopup.cpp kasstartupitem.cpp
kasaboutdlg.cpp kasprefsdlg.cpp kasclockitem.cpp
kasgroupitem.cpp kasresources.cpp kasgrouper.cpp
kasloaditem.cpp
diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am
index e186aad1..25635299 100644
--- a/kicker/extensions/kasbar/Makefile.am
+++ b/kicker/extensions/kasbar/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkasbar.la
libkasbar_la_SOURCES = kasbar.cpp kasitem.cpp \
kastaskitem.cpp kastasker.cpp kaspopup.cpp \
- kastaskpopup.cpp kasstartupitem.cpp \
+ kastastdepopup.cpp kasstartupitem.cpp \
kasaboutdlg.cpp kasprefsdlg.cpp kasclockitem.cpp \
kasgroupitem.cpp kasresources.cpp kasgrouper.cpp \
kasloaditem.cpp
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 912c9b0d..b1d4d2c9 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -13,7 +13,7 @@
#include <kpixmapeffect.h>
#include <klocale.h>
#include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <taskmanager.h>
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index 638213e8..3c73e21f 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -62,7 +62,7 @@
#include <kiconloader.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <klocale.h>
#include <taskmanager.h>
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index f89e210e..5a62349c 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -20,7 +20,7 @@
#include <kpixmapeffect.h>
#include <klocale.h>
#include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <taskmanager.h>
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 54ed56e4..a62b5958 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -54,11 +54,11 @@
#include <tqapplication.h>
#include <tqtimer.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kiconloader.h>
//#include <tdeconfiggroupsaver.h>
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index b986ea54..fc2bea8b 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -69,10 +69,10 @@
#include <kdialog.h>
#include <kglobal.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kpassivepopup.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kprocess.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -81,7 +81,7 @@
#include <taskrmbmenu.h>
#include "kastasker.h"
-#include "kastaskpopup.h"
+#include "kastastdepopup.h"
#include "kastaskitem.h"
#include "kasbarextension.h"
diff --git a/kicker/extensions/kasbar/kastastdepopup.cpp b/kicker/extensions/kasbar/kastastdepopup.cpp
index 6529fafe..74c8631a 100644
--- a/kicker/extensions/kasbar/kastastdepopup.cpp
+++ b/kicker/extensions/kasbar/kastastdepopup.cpp
@@ -1,4 +1,4 @@
-/* kastaskpopup.cpp
+/* kastastdepopup.cpp
**
** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
** Contributor: Mosfet
@@ -63,8 +63,8 @@
#include "kastaskitem.h"
#include "kastasker.h"
-#include "kastaskpopup.h"
-#include "kastaskpopup.moc"
+#include "kastastdepopup.h"
+#include "kastastdepopup.moc"
static const int TITLE_HEIGHT = 13;
diff --git a/kicker/extensions/kasbar/kastastdepopup.h b/kicker/extensions/kasbar/kastastdepopup.h
index dcdc3310..60cff87b 100644
--- a/kicker/extensions/kasbar/kastastdepopup.h
+++ b/kicker/extensions/kasbar/kastastdepopup.h
@@ -1,4 +1,4 @@
-/* kastaskpopup.h
+/* kastastdepopup.h
**
** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
** Contributor: Mosfet
diff --git a/kicker/kicker/buttons/bookmarksbutton.cpp b/kicker/kicker/buttons/bookmarksbutton.cpp
index 5dc8190a..8b4559c5 100644
--- a/kicker/kicker/buttons/bookmarksbutton.cpp
+++ b/kicker/kicker/buttons/bookmarksbutton.cpp
@@ -23,12 +23,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kbookmark.h>
#include <kbookmarkmenu.h>
#include <konqbookmarkmanager.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include "bookmarksbutton.h"
#include "bookmarksbutton.moc"
diff --git a/kicker/kicker/buttons/windowlist.desktop b/kicker/kicker/buttons/windowlist.desktop
index f3d15fd6..3b2e677f 100644
--- a/kicker/kicker/buttons/windowlist.desktop
+++ b/kicker/kicker/buttons/windowlist.desktop
@@ -25,7 +25,7 @@ Name[fy]=Finsterlistmenu
Name[gl]=Lista de Fiestras
Name[he]=תפריט רשימת חלונות
Name[hr]=Izbornik popisa prozora
-Name[hu]=Ablaklista menü
+Name[hu]=Ablatdelista menü
Name[is]=Gluggalista valmynd
Name[it]=Menu elenco delle finestre
Name[ja]=ウィンドウリストメニュー
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 969a8184..44bad20b 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klocale.h>
#include <kmessagebox.h>
#include <kpanelapplet.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kprocess.h>
#include <kstandarddirs.h>
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index fbf6b9e4..fa4ca15d 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <khelpmenu.h>
#include <klocale.h>
#include <kglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kiconloader.h>
#include <tdeconfig.h>
#include <kstdguiitem.h>
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 6d0f2b54..abe5370a 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kapplication.h>
#include <kaboutkde.h>
#include <kpixmapeffect.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kbookmarkmenu.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h
index 995cc57b..27807c93 100644
--- a/kicker/kicker/ui/itemview.h
+++ b/kicker/kicker/ui/itemview.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpixmap.h>
#include <tqframe.h>
#include <tqtoolbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqdragobject.h>
#include "kmenubase.h"
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index f19d59d8..46d66b09 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dcopclient.h>
#include <kapplication.h>
#include <kaboutkde.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kbookmarkmenu.h>
#include <tdeconfig.h>
#include <kdebug.h>
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
#include <twin.h>
#include "client_mnu.h"
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index a8d69c22..f8e3eaef 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -46,7 +46,7 @@
#include <dcopclient.h>
#include <kapplication.h>
#include <kaboutkde.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kbookmarkmenu.h>
#include <tdeconfig.h>
#include <kdebug.h>
@@ -64,7 +64,7 @@
#include <kurllabel.h>
#include <krun.h>
#include <kmimetype.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
#include <kcompletionbox.h>
#include <kurifilter.h>
#include <kbookmarkmanager.h>
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index 314ceae1..9ace6483 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -7,7 +7,7 @@
#include <kbookmarkimporter.h>
#include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 3284c7a0..420a17c3 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -5,7 +5,7 @@
#include <kbookmarkimporter.h>
#include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
//#include <kbookmarkmenu.h>
@@ -16,7 +16,7 @@
#include <tqfile.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 95f46dad..c30ff04b 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kglobalsettings.h>
#include <kapplication.h>
#include <kurldrag.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
#include "recentdocsmenu.h"
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index a02d88a6..00a4b1a5 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -44,7 +44,7 @@ using namespace std;
#include <kmessagebox.h>
#include <kmimetype.h>
#include <kpixmap.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
#include <kservice.h>
#include <kservicegroup.h>
#include <kstandarddirs.h>
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 18f04452..8803b1cd 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -93,7 +93,7 @@ TaskManager::~TaskManager()
void TaskManager::configure_startup()
{
- TDEConfig c("klaunchrc", true);
+ TDEConfig c("tdelaunchrc", true);
c.setGroup("FeedbackStyle");
if (!c.readBoolEntry("TaskbarButton", false))
return;
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 0c1b5379..1a4c66e1 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -28,7 +28,7 @@
#include <kiconloader.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <twinmodule.h>
#include <kregexpeditorinterface.h>
#include <tdeparts/componentfactory.h>
diff --git a/klipper/configdialog.h b/klipper/configdialog.h
index c7751485..345a9f05 100644
--- a/klipper/configdialog.h
+++ b/klipper/configdialog.h
@@ -30,7 +30,7 @@
#include <kdialogbase.h>
#include <keditlistbox.h>
#include <kkeydialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <knuminput.h>
#include "urlgrabber.h"
diff --git a/klipper/klipper.desktop b/klipper/klipper.desktop
index 32dbf8d9..36cc043f 100644
--- a/klipper/klipper.desktop
+++ b/klipper/klipper.desktop
@@ -154,7 +154,7 @@ Comment[sk]=Vystrihnúť a vložiť históriu
Comment[sl]=Orodje z zgodovino za izreži in prilepi
Comment[sr]=Алат за историјат исецања и преношења
Comment[sr@Latn]=Alat za istorijat isecanja i prenošenja
-Comment[sv]=Ett verktyg med historik för klipp ut och klistra in
+Comment[sv]=Ett verktyg med historik för klipp ut och tdelistra in
Comment[th]=โปรแกรมอรรถประโยชน์สำหรับดูประวัติการตัดและวาง
Comment[tr]=Kes & yapıştır geçmişine erişim
Comment[uk]=Утиліта історії кишені
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 048ea8b1..7b2eed57 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -25,7 +25,7 @@
#include <klineedit.h>
#include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kglobalsettings.h>
#include <twin.h>
#include <kapplication.h>
diff --git a/klipper/klipperpopup.h b/klipper/klipperpopup.h
index a9849e8c..ea800c67 100644
--- a/klipper/klipperpopup.h
+++ b/klipper/klipperpopup.h
@@ -20,7 +20,7 @@
#ifndef _KLIPPERPOPUP_H_
#define _KLIPPERPOPUP_H_
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqptrlist.h>
#include <tqstring.h>
diff --git a/klipper/popupproxy.h b/klipper/popupproxy.h
index 6526a8c5..bc99daea 100644
--- a/klipper/popupproxy.h
+++ b/klipper/popupproxy.h
@@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqregexp.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <history.h>
class HistoryItem;
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index f9254dee..a2777d07 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -32,7 +32,7 @@
#include <tqdragobject.h>
#include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kglobal.h>
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index dc2682ea..cdc5ffa0 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -23,7 +23,7 @@
#include <kapplication.h>
#include <kglobalaccel.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqmap.h>
#include <tqpixmap.h>
#include <dcopobject.h>
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 5a93f1c1..dd832bf0 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -26,7 +26,7 @@
#include <kdialogbase.h>
#include <ktextedit.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kservice.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 80f5eabf..8e7073b6 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -20,7 +20,7 @@
#include <tqsplitter.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
@@ -30,7 +30,7 @@
#include <kmessagebox.h>
#include <kservice.h>
#include <kstdaction.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include "treeview.h"
#include "basictab.h"
diff --git a/kmenuedit/kmenuedit.h b/kmenuedit/kmenuedit.h
index fdd79bce..15e5c797 100644
--- a/kmenuedit/kmenuedit.h
+++ b/kmenuedit/kmenuedit.h
@@ -20,7 +20,7 @@
#ifndef __kmenuedit_h__
#define __kmenuedit_h__
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <treeview.h>
class BasicTab;
diff --git a/kmenuedit/menuinfo.h b/kmenuedit/menuinfo.h
index 616df68a..9497022d 100644
--- a/kmenuedit/menuinfo.h
+++ b/kmenuedit/menuinfo.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kservice.h>
class MenuFile;
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index c58d7bf0..dc90bcda 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -41,7 +41,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kdesktopfile.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kmessagebox.h>
#include <kapplication.h>
#include <kservice.h>
diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h
index 562a3330..3370f5bc 100644
--- a/kmenuedit/treeview.h
+++ b/kmenuedit/treeview.h
@@ -23,7 +23,7 @@
#define __treeview_h__
#include <tqstring.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kservice.h>
#include <kservicegroup.h>
diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h
index 352d711f..f29abec4 100644
--- a/knetattach/knetattach.ui.h
+++ b/knetattach/knetattach.ui.h
@@ -18,7 +18,7 @@ void KNetAttach::init()
finishButton()->setText(i18n("Save && C&onnect"));
//setResizeMode(Fixed); FIXME: make the wizard fixed-geometry
setFinishEnabled(_folderParameters, false);
- TDEConfig recent("krecentconnections", true, false);
+ TDEConfig recent("tderecentconnections", true, false);
recent.setGroup("General");
TQStringList idx = recent.readListEntry("Index");
if (idx.isEmpty()) {
@@ -75,7 +75,7 @@ void KNetAttach::showPage( TQWidget *page )
setInformationText("SMB");
updateForProtocol("SMB");
} else { //if (_recent->isChecked()) {
- TDEConfig recent("krecentconnections", true, false);
+ TDEConfig recent("tderecentconnections", true, false);
if (!recent.hasGroup(_recentConnectionName->currentText())) {
recent.setGroup("General");
TQStringList idx = recent.readListEntry("Index");
@@ -186,7 +186,7 @@ void KNetAttach::finished()
}
if (!name.isEmpty()) {
- TDEConfig recent("krecentconnections", false, false);
+ TDEConfig recent("tderecentconnections", false, false);
recent.setGroup("General");
TQStringList idx = recent.readListEntry("Index");
recent.deleteGroup(name); // erase anything stale
diff --git a/konqueror/KonqMainWindowIface.h b/konqueror/KonqMainWindowIface.h
index c6ce6443..4776dd39 100644
--- a/konqueror/KonqMainWindowIface.h
+++ b/konqueror/KonqMainWindowIface.h
@@ -24,7 +24,7 @@
#include <dcopobject.h>
#include <tqvaluelist.h>
#include <dcopref.h>
-#include <kmainwindowiface.h>
+#include <tdemainwindowiface.h>
class KonqMainWindow;
class KDCOPActionProxy;
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index b9c596db..4e671ce5 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -9,7 +9,7 @@
#include <kmessagebox.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kiconloader.h>
#include <kurifilter.h>
#include <ktrader.h>
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index ff125a91..08756107 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -27,7 +27,7 @@
#include <unistd.h>
#include <tqfile.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kdirlister.h>
diff --git a/konqueror/keditbookmarks/TODO b/konqueror/keditbookmarks/TODO
index 98e37956..399cfa74 100644
--- a/konqueror/keditbookmarks/TODO
+++ b/konqueror/keditbookmarks/TODO
@@ -64,19 +64,19 @@ on startup:
==31246== at 0x4026A4DF: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786)
==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905)
==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702)
- ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872)
+ ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (tdelistview.cpp:1872)
==31246==
==31246== Conditional jump or move depends on uninitialised value(s)
==31246== at 0x4026A4E4: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786)
==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905)
==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702)
- ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872)
+ ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (tdelistview.cpp:1872)
==31246==
==31246== Conditional jump or move depends on uninitialised value(s)
==31246== at 0x4026A4E8: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786)
==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905)
==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702)
- ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872)
+ ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (tdelistview.cpp:1872)
==31246==
lots of crap when using file->open
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 81d47f07..dc767081 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -42,7 +42,7 @@
#include <kdebug.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kedittoolbar.h>
#include <tdefiledialog.h>
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index 7780196c..31d76edd 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -34,7 +34,7 @@
#include <kapplication.h>
#include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <dcopclient.h>
#include <dcopref.h>
diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp
index c30d890e..c22d2e62 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.cpp
+++ b/konqueror/keditbookmarks/bookmarkiterator.cpp
@@ -28,7 +28,7 @@
#include <tqtimer.h>
-BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) {
+BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_btdelist(bks) {
connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ),
TQT_SLOT( slotCancelTest(BookmarkIterator *) ));
delayedEmitNextOne();
@@ -60,12 +60,12 @@ const KBookmark BookmarkIterator::curBk() const {
void BookmarkIterator::nextOne() {
// kdDebug() << "BookmarkIterator::nextOne" << endl;
- if (m_bklist.isEmpty()) {
+ if (m_btdelist.isEmpty()) {
emit deleteSelf(this);
return;
}
- TQValueListIterator<KBookmark> head = m_bklist.begin();
+ TQValueListIterator<KBookmark> head = m_btdelist.begin();
KBookmark bk = (*head);
bool viable = bk.hasParent() && isApplicable(bk);
@@ -75,7 +75,7 @@ void BookmarkIterator::nextOne() {
doAction();
}
- m_bklist.remove(head);
+ m_btdelist.remove(head);
if (!viable)
delayedEmitNextOne();
diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h
index 0931ccaf..a7d06952 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.h
+++ b/konqueror/keditbookmarks/bookmarkiterator.h
@@ -53,7 +53,7 @@ protected:
private:
KBookmark m_bk;
- TQValueList<KBookmark> m_bklist;
+ TQValueList<KBookmark> m_btdelist;
};
class BookmarkIteratorHolder
diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h
index b2cdfce6..c7031a37 100644
--- a/konqueror/keditbookmarks/kebsearchline.h
+++ b/konqueror/keditbookmarks/kebsearchline.h
@@ -19,7 +19,7 @@
#ifndef __kebsearchline_h
#define __kebsearchline_h
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
#include <tqobject.h>
class KEBSearchLine : public TDEListViewSearchLine
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 55f28b90..6efd1440 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -40,7 +40,7 @@
#include <kdebug.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kedittoolbar.h>
#include <tdefiledialog.h>
@@ -48,7 +48,7 @@
#include <kmessagebox.h>
#include <klineedit.h>
#include <krun.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
#include <kbookmarkdrag.h>
#include <kbookmarkmanager.h>
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 1ada9506..13bf2a15 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -28,7 +28,7 @@
#include <klocale.h>
#include <kbookmark.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kiconloader.h>
#include "toplevel.h"
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 72ababe3..97e7ec0e 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -110,7 +110,7 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) {
return true;
}
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
TDELocale::setMainCatalogue("konqueror");
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 97386a3e..5a7b5ce0 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -34,7 +34,7 @@
#include <kcharsets.h>
#include <kbookmarkmanager.h>
-#include <kaction.h>
+#include <tdeaction.h>
TestLinkItrHolder *TestLinkItrHolder::s_self = 0;
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 24ab4fbb..aafd988c 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -42,7 +42,7 @@
#include <kapplication.h>
#include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <dcopclient.h>
#include <dcopref.h>
diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h
index 31f10a01..7dd056d8 100644
--- a/konqueror/keditbookmarks/toplevel.h
+++ b/konqueror/keditbookmarks/toplevel.h
@@ -22,7 +22,7 @@
#ifndef __toplevel_h
#define __toplevel_h
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kcommand.h>
#include <kbookmark.h>
diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc
index ed5a5002..a8b6640d 100644
--- a/konqueror/konq_actions.cc
+++ b/konqueror/konq_actions.cc
@@ -21,14 +21,14 @@
#include <assert.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
#include <kanimwidget.h>
#include <kdebug.h>
#include <kstringhandler.h>
#include <konq_pixmapprovider.h>
#include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kapplication.h>
#include "konq_view.h"
diff --git a/konqueror/konq_actions.h b/konqueror/konq_actions.h
index 8b24c28a..134c8996 100644
--- a/konqueror/konq_actions.h
+++ b/konqueror/konq_actions.h
@@ -21,7 +21,7 @@
#define __konq_actions_h__
#include <konq_historymgr.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqptrlist.h>
class HistoryEntry;
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index 6b814a64..3d99ed33 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -27,7 +27,7 @@
#include <kicontheme.h>
#include <klineedit.h>
#include <konq_pixmapprovider.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kurldrag.h>
#include <konq_mainwindow.h>
#include <kstringhandler.h>
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc
index bfc37f6e..99f31dba 100644
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cc
@@ -43,7 +43,7 @@
#include "konq_viewmgr.h"
#include <konq_pixmapprovider.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <assert.h>
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index afe4f8c5..48b5ae59 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -85,7 +85,7 @@
#include "konq_main.h"
#include <konq_undo.h>
#include <kprotocolinfo.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kstdaction.h>
#include <kstandarddirs.h>
#include <tdesycoca.h>
@@ -97,11 +97,11 @@
#include <tdefiledialog.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kprocess.h>
#include <tdeio/scheduler.h>
#include <tdeio/netaccess.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kstringhandler.h>
#include <kuser.h>
#include <netwm.h>
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 453762c3..9226c9e1 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -28,7 +28,7 @@
#include <tqheader.h>
#include <tqlineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kdebug.h>
#include <kstdguiitem.h>
#include <tdeio/global.h>
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index 6e8d08fe..70cbcafd 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -40,9 +40,9 @@
#include "konq_misc.h"
#include "konq_settingsxt.h"
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <konq_pixmapprovider.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <tqtabbar.h>
#include <tqwhatsthis.h>
#include <tqstyle.h>
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index a556ac52..136c3409 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -29,7 +29,7 @@
#include <tqfileinfo.h>
#include <tqptrlist.h>
-#include <kaccelgen.h>
+#include <tdeaccelgen.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kapplication.h>
@@ -40,7 +40,7 @@
#include <kmessagebox.h>
#include <assert.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
// #define DEBUG_VIEWMGR
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index b17b16b7..9502f338 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -19,7 +19,7 @@
#include <dom/dom_string.h>
#include <kdebug.h>
#include "tdehtmlkttsd.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <tqmessagebox.h>
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index 60a3ec2b..ef77cc1b 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <tdefilemetainfo.h>
#include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kservicetype.h>
#include <kuserprofile.h>
#include <tdeio/metainfojob.h>
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 43a6468f..b872be4a 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -23,7 +23,7 @@
#include "konq_infolistviewwidget.h"
#include "konq_listviewsettings.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kdirlister.h>
diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h
index c96bff5a..6ea4e79d 100644
--- a/konqueror/listview/konq_listviewitems.h
+++ b/konqueror/listview/konq_listviewitems.h
@@ -20,7 +20,7 @@
#ifndef __konq_listviewitems_h__
#define __konq_listviewitems_h__
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqstring.h>
#include <kicontheme.h>
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index af705874..8eb2cd6b 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -29,7 +29,7 @@
#include <kdirlister.h>
#include <klocale.h>
#include <kprotocolinfo.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kurldrag.h>
#include <kmessagebox.h>
#include <kiconloader.h>
@@ -1508,7 +1508,7 @@ bool KonqBaseListViewWidget::caseInsensitiveSort() const
return m_pBrowserView->m_pProps->isCaseInsensitiveSort();
}
-// based on isExecuteArea from klistview.cpp
+// based on isExecuteArea from tdelistview.cpp
int KonqBaseListViewWidget::executeArea( TQListViewItem *_item )
{
if ( !_item )
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 1fc8b0eb..5c9cade4 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -25,7 +25,7 @@
#include <kurl.h>
#include <tdefileitem.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tdeparts/browserextension.h>
#include <konq_propsview.h>
#include "konq_listviewitems.h"
diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h
index 3f08cc3d..01b85ddf 100644
--- a/konqueror/listview/konq_treeviewwidget.h
+++ b/konqueror/listview/konq_treeviewwidget.h
@@ -23,7 +23,7 @@
#include "konq_treeviewitem.h"
#include <tqdict.h>
#include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
class KonqListView;
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 5e669972..846fae1b 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -25,12 +25,12 @@
*/
#include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kcharsets.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <dcopclient.h>
#include <kgenericfactory.h>
#include <kprotocolmanager.h>
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index 8558b71b..bf30ce02 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -20,7 +20,7 @@
#include <konq_events.h>
#include <kdebug.h>
#include <tqapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, bool universalMode )
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 4638d0ba..4dc29dbd 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -38,7 +38,7 @@
#include <konq_events.h>
#include <tdefileitem.h>
#include <tdeio/netaccess.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kprocess.h>
#include <kurlrequesterdlg.h>
#include <kinputdialog.h>
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index 4457d12e..36612a03 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -24,7 +24,7 @@
#include <kdockwidget.h>
#include <kurl.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <tdeparts/part.h>
#include <tdemultitabbar.h>
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 5b170b10..9194e8f0 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -20,8 +20,8 @@
#include <tqcursor.h>
#include <tqpopupmenu.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
#include <kapplication.h>
#include <kbookmarkdrag.h>
#include <kiconloader.h>
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 5d27e010..ba3428c9 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -21,7 +21,7 @@
#include <tqpopupmenu.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcursor.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 813ece3d..6c84fdf3 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -31,7 +31,7 @@
#include <kapplication.h>
#include <tdeconfig.h>
#include <kdialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kgenericfactory.h>
#include <kglobal.h>
#include <kiconloader.h>
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 028a531f..4d1a7ba9 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -30,7 +30,7 @@
#include <dcopclient.h>
#include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kdesktopfile.h>
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index f8626298..6498d0ff 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -20,7 +20,7 @@
#ifndef konq_tree_h
#define konq_tree_h
-#include <klistview.h>
+#include <tdelistview.h>
#include "konq_sidebartreetoplevelitem.h"
#include "konqsidebar_tree.h"
#include <kdirnotify.h>
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 04454ecb..1903c232 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -6,7 +6,7 @@
#include <ksimpleconfig.h>
#include <kinputdialog.h>
#include <kiconloader.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
#include <tqclipboard.h>
#include <tqdragobject.h>
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index 65566c4c..494f1050 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -24,7 +24,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <konqsidebarplugin.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqobject.h>
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 72c69e8c..8aae214f 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -79,7 +79,7 @@
#include <klocale.h>
#include <knotifyclient.h>
#include <kglobalsettings.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kurldrag.h>
#include <tdeio/netaccess.h>
#include <tqlabel.h>
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index 1ca74464..1e2c36d8 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -29,7 +29,7 @@
#include <tqscrollbar.h>
#include <tqdragobject.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include "TECommon.h"
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 189ebb3a..d78908cd 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -97,7 +97,7 @@ Time to start a requirement list.
#include <tdefiledialog.h>
#include <kurlrequesterdlg.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kkeydialog.h>
#include <kstandarddirs.h>
#include <tqpainter.h>
@@ -114,13 +114,13 @@ Time to start a requirement list.
#include <knotifydialog.h>
#undef B0
#include <kprinter.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kurifilter.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kshell.h>
#include <tqlabel.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <klocale.h>
#include <sys/wait.h>
#include <sys/stat.h>
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index c5c77d0c..468764e2 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -26,7 +26,7 @@
#define KONSOLE_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kdialogbase.h>
#include <ksimpleconfig.h>
#include <keditcl.h>
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index ac0b65bf..930c951f 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -30,7 +30,7 @@
#include <kaboutdata.h>
#include <kcharsets.h>
#include <kdebug.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
#include <kinputdialog.h>
@@ -44,10 +44,10 @@
#include <tqcheckbox.h>
#include <tqspinbox.h>
#include <tqpushbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <krootpixmap.h>
#include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
// We can't use the ARGB32 visual when embedded in another application
bool argb_visual = false;
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index 4f2dca84..13af12ca 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -18,7 +18,7 @@
// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <kshell.h>
#include <tdeio/job.h>
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp
index 0aae87d7..0afe6a69 100644
--- a/konsole/konsole/konsolebookmarkmenu.cpp
+++ b/konsole/konsole/konsolebookmarkmenu.cpp
@@ -16,9 +16,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "konsole.h"
#include "konsolebookmarkmenu.h"
diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h
index d3bc9b8f..e375ec58 100644
--- a/konsole/konsole/session.h
+++ b/konsole/konsole/session.h
@@ -22,7 +22,7 @@
#define SESSION_H
#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tqstrlist.h>
#include "TEPty.h"
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index b1b37eca..717e9049 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -37,7 +37,7 @@
#include <kdebug.h>
#include <ksharedpixmap.h>
#include <kpixmapio.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <netwm.h>
#include <tqcstring.h>
#include <tqpixmap.h>
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index d689b714..dac64ab5 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -44,7 +44,7 @@
#include <kapplication.h>
#include <kglobalsettings.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kglobal.h>
#include <tdeconfig.h>
@@ -55,7 +55,7 @@
#include <netwm.h>
#include "desktop.h"
#include <tqpopupmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kiconloader.h>
#include <assert.h>
diff --git a/kpager/kpager.h b/kpager/kpager.h
index b1d0dacf..4a3d2ef8 100644
--- a/kpager/kpager.h
+++ b/kpager/kpager.h
@@ -27,7 +27,7 @@
#include <tqwidget.h>
#include <tqintdict.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <twin.h>
#include "kpagerIface.h"
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index 1aa8f422..48c00117 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -31,7 +31,7 @@
#include <dcopclient.h>
#include <kipc.h>
#include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <krun.h>
#include <kmessagebox.h>
#include <kiconloader.h>
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index 6b7590bd..26964e0f 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -42,7 +42,7 @@ KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name)
slotKDEDescription();
// Set the configfiles
cglobal = new TDEConfig("kdeglobals");
- claunch = new TDEConfig("klaunchrc", false, false);
+ claunch = new TDEConfig("tdelaunchrc", false, false);
cwin = new TDEConfig("twinrc");
cdesktop = new TDEConfig("kdesktoprc");
ckcminput = new TDEConfig("kcminputrc");
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 1a3dcc40..dfd7319e 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -31,7 +31,7 @@
#include <kstandarddirs.h>
#include <klocale.h>
#include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <krun.h>
#include <kmessagebox.h>
#include <tdeconfig.h>
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp
index a4408460..09a99391 100644
--- a/kpersonalizer/kstylepage.cpp
+++ b/kpersonalizer/kstylepage.cpp
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <kdesktopfile.h>
#include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kipc.h>
#include <ksimpleconfig.h>
#include <dcopclient.h>
diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui
index 9a11887d..b9b6b7ac 100644
--- a/kpersonalizer/kstylepagedlg.ui
+++ b/kpersonalizer/kstylepagedlg.ui
@@ -120,7 +120,7 @@
</image>
</images>
<includes>
- <include location="global" impldecl="in declaration">klistview.h</include>
+ <include location="global" impldecl="in declaration">tdelistview.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index c5a01353..f67dda72 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -63,7 +63,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include <stdlib.h>
#include <math.h>
#include <dmctl.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <netwm.h>
#include <X11/Xlib.h>
diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp
index 0ec5d02d..383649e8 100644
--- a/ksmserver/startupdlg.cpp
+++ b/ksmserver/startupdlg.cpp
@@ -54,7 +54,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include <stdlib.h>
#include <math.h>
#include <dmctl.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <netwm.h>
#include <X11/Xlib.h>
diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h
index 93d4bb76..7a46e368 100644
--- a/ksplashml/kcmksplash/installer.h
+++ b/ksplashml/kcmksplash/installer.h
@@ -14,7 +14,7 @@
#include <tqmap.h>
#include <tqpoint.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kurl.h>
class TQLabel;
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 4b19a301..95c21b83 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -17,7 +17,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
#include <kgenericfactory.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc
index b1141686..2e77eba5 100644
--- a/ksysguard/gui/KSGAppletSettings.cc
+++ b/ksysguard/gui/KSGAppletSettings.cc
@@ -22,7 +22,7 @@
#include <tqlayout.h>
#include <tqspinbox.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <klocale.h>
#include "KSGAppletSettings.h"
diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc
index eba27669..0da48768 100644
--- a/ksysguard/gui/KSysGuardApplet.cc
+++ b/ksysguard/gui/KSysGuardApplet.cc
@@ -35,7 +35,7 @@
#include <kmessagebox.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <ksgrd/SensorClient.h>
#include <ksgrd/SensorManager.h>
diff --git a/ksysguard/gui/SensorBrowser.h b/ksysguard/gui/SensorBrowser.h
index 7545391a..aec4f343 100644
--- a/ksysguard/gui/SensorBrowser.h
+++ b/ksysguard/gui/SensorBrowser.h
@@ -26,7 +26,7 @@
#include <tqdict.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <ksgrd/SensorClient.h>
class TQMouseEvent;
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
index c6ad058b..a4a97ee4 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
@@ -21,11 +21,11 @@
*/
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kcolorbutton.h>
#include <klineedit.h>
#include <kinputdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <knuminput.h>
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
index 0c0ee3b7..3ba91aa9 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
@@ -21,11 +21,11 @@
*/
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kcolorbutton.h>
#include <kcolordialog.h>
#include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <knuminput.h>
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc
index bae2d0e7..a1ec685e 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc
@@ -27,7 +27,7 @@
#include <tqfile.h>
#include <tqlistbox.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kdebug.h>
#include <klocale.h>
#include <kcolorbutton.h>
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
index c7cfa0ca..2c31f15a 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
@@ -30,7 +30,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kdialogbase.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
#include <ksgrd/SensorManager.h>
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h
index db3f7637..51ac510e 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h
@@ -32,7 +32,7 @@
#include <tqwidget.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include "SensorClient.h"
diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc
index 4ec41662..386b0950 100644
--- a/ksysguard/gui/WorkSheet.cc
+++ b/ksysguard/gui/WorkSheet.cc
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <SensorManager.h>
diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc
index e2ba052e..4174aa40 100644
--- a/ksysguard/gui/WorkSheetSettings.cc
+++ b/ksysguard/gui/WorkSheetSettings.cc
@@ -21,7 +21,7 @@
*/
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <klineedit.h>
#include <knuminput.h>
#include <klocale.h>
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc
index 22b46269..9cb0e56e 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cc
@@ -31,7 +31,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include "WorkSheet.h"
#include "WorkSheetSettings.h"
diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc
index a4aba76c..a025fcf4 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cc
+++ b/ksysguard/gui/ksgrd/HostConnector.cc
@@ -19,7 +19,7 @@
*/
#include <kapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kcombobox.h>
#include <klocale.h>
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc
index a13e385b..9c04ae05 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cc
+++ b/ksysguard/gui/ksgrd/StyleSettings.cc
@@ -30,7 +30,7 @@
#include <tqspinbox.h>
#include <tqtabwidget.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kcolorbutton.h>
#include <kcolordialog.h>
#include <klocale.h>
diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cc
index 2a5e0d47..9384cb05 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.cc
+++ b/ksysguard/gui/ksgrd/TimerSettings.cc
@@ -21,7 +21,7 @@
*/
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <klocale.h>
#include <tqcheckbox.h>
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc
index 0d138917..e942e954 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cc
@@ -35,7 +35,7 @@
#include <unistd.h>
#include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <kdebug.h>
diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h
index 50a4212e..42f53484 100644
--- a/ksysguard/gui/ksysguard.h
+++ b/ksysguard/gui/ksysguard.h
@@ -29,7 +29,7 @@
#include <dcopclient.h>
#include <dcopobject.h>
#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <dnssd/servicebrowser.h>
#include <ksgrd/SensorClient.h>
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 673b71f3..0f10cf54 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -8,7 +8,7 @@
#include <kglobal.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kprocess.h>
#include <twinmodule.h>
#include <tdeconfig.h>
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index 47fabcdf..c39204ed 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -43,8 +43,8 @@ DESCRIPTION
#include <ktempfile.h>
#include <kstandarddirs.h>
#include <kipc.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp
index 6f899ead..80b4979d 100644
--- a/kxkb/kxkbtraywindow.cpp
+++ b/kxkb/kxkbtraywindow.cpp
@@ -15,8 +15,8 @@
#include <klocale.h>
#include <kiconeffect.h>
#include <kiconloader.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
#include <kuniqueapplication.h>
#include "kxkbtraywindow.h"
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index 52bb605a..e27277ac 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -28,7 +28,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kprotocolinfo.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <krun.h>
#include <tdeio/job.h>
diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h
index 17239f11..a0ea38f4 100644
--- a/libkonq/knewmenu.h
+++ b/libkonq/knewmenu.h
@@ -23,7 +23,7 @@
#include <tqintdict.h>
#include <tqstringlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdialogbase.h>
#include <kurl.h>
#include <libkonq_export.h>
diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc
index 1ba236a8..77905b0c 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cc
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <kimagefilepreview.h>
#include <klocale.h>
-//#include <krecentdocument.h>
+//#include <tderecentdocument.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc
index 46226a6d..6d326d44 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cc
@@ -24,7 +24,7 @@
#include <tdeio/paste.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdatastream.h>
#include <kdebug.h>
#include <kdirlister.h>
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index cbd38a60..b3a499ce 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -26,7 +26,7 @@
#include <knotifyclient.h>
#include <krun.h>
#include <kshell.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kdirnotify_stub.h>
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index 01b1247c..4be06956 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -25,7 +25,7 @@
#include <tqpopupmenu.h>
#include <tqmap.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqstringlist.h>
diff --git a/libkonq/konq_xmlguiclient.h b/libkonq/konq_xmlguiclient.h
index c219c648..685b58a3 100644
--- a/libkonq/konq_xmlguiclient.h
+++ b/libkonq/konq_xmlguiclient.h
@@ -22,7 +22,7 @@
#include <sys/types.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kxmlguiclient.h>
#include <tqstringlist.h>
#include <libkonq_export.h>
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index ef189d9e..a7033d85 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -22,7 +22,7 @@
#include <dcopclient.h>
#include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
#include <tdefiledialog.h>
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index 98659581..6e029e87 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -26,7 +26,7 @@
#include <dcopclient.h>
#include <kdebug.h>
#include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "testnsplugin.h"
#include "../NSPluginClassIface_stub.h"
diff --git a/nsplugins/test/testnsplugin.h b/nsplugins/test/testnsplugin.h
index 0b007aba..252cea2c 100644
--- a/nsplugins/test/testnsplugin.h
+++ b/nsplugins/test/testnsplugin.h
@@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqwidget.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tqlayout.h>
#include <tqptrlist.h>
diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index c7422819..4efe155d 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <kstandarddirs.h>
#include <tdeio/global.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqpushbutton.h>
diff --git a/tdeioslave/media/medianotifier/notificationdialog.h b/tdeioslave/media/medianotifier/notificationdialog.h
index 01792c2a..d50baa49 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.h
+++ b/tdeioslave/media/medianotifier/notificationdialog.h
@@ -21,7 +21,7 @@
#define _NOTIFICATIONDIALOG_H_
#include <kdialogbase.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kdirwatch.h>
#include <tdefileitem.h>
diff --git a/tdeioslave/media/medianotifier/notificationdialogview.ui b/tdeioslave/media/medianotifier/notificationdialogview.ui
index 351799dd..1feea806 100644
--- a/tdeioslave/media/medianotifier/notificationdialogview.ui
+++ b/tdeioslave/media/medianotifier/notificationdialogview.ui
@@ -112,6 +112,6 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>klistbox.h</includehint>
+ <includehint>tdelistbox.h</includehint>
</includehints>
</UI>
diff --git a/tdeioslave/media/tdecmodule/notifiermoduleview.ui b/tdeioslave/media/tdecmodule/notifiermoduleview.ui
index a5cd1162..ad32f7a3 100644
--- a/tdeioslave/media/tdecmodule/notifiermoduleview.ui
+++ b/tdeioslave/media/tdecmodule/notifiermoduleview.ui
@@ -166,6 +166,6 @@
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>klistbox.h</includehint>
+ <includehint>tdelistbox.h</includehint>
</includehints>
</UI>
diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
index 61dd060f..98941970 100644
--- a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
+++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
@@ -21,7 +21,7 @@
#include <klocale.h>
#include <klineedit.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
#include <kicondialog.h>
#include <tqlistbox.h>
#include <kservice.h>
diff --git a/tdeioslave/media/tdecmodule/serviceview.ui b/tdeioslave/media/tdecmodule/serviceview.ui
index 98a9f866..2991d4c9 100644
--- a/tdeioslave/media/tdecmodule/serviceview.ui
+++ b/tdeioslave/media/tdecmodule/serviceview.ui
@@ -240,7 +240,7 @@
<includehints>
<includehint>kicondialog.h</includehint>
<includehint>klineedit.h</includehint>
- <includehint>kactionselector.h</includehint>
+ <includehint>tdeactionselector.h</includehint>
<includehint>kactivelabel.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index 9795ef01..610dceb7 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -31,7 +31,7 @@
#include <ksystemtray.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <twin.h>
#include <kstartupinfo.h>
diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp
index c725aa87..64686dde 100644
--- a/tdeprint/tdeprint_part/printpart.cpp
+++ b/tdeprint/tdeprint_part/printpart.cpp
@@ -21,7 +21,7 @@
#include <tdeprint/kmmainview.h>
#include <tdeprint/kiconselectaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kinstance.h>
#include <kiconloader.h>
diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp
index 212d9698..4937b88b 100644
--- a/tdeprint/tdeprintfax/conffilters.cpp
+++ b/tdeprint/tdeprintfax/conffilters.cpp
@@ -30,7 +30,7 @@
#include <tqheader.h>
#include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp
index 97b2986c..4385827d 100644
--- a/tdeprint/tdeprintfax/faxab.cpp
+++ b/tdeprint/tdeprintfax/faxab.cpp
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqheader.h>
#include <klocale.h>
#include <kabc/stdaddressbook.h>
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 38e15425..a52c5ade 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -36,10 +36,10 @@
#include <kapplication.h>
#include <kstdaction.h>
#include <kmenubar.h>
-#include <ktoolbar.h>
-#include <kaction.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdetoolbar.h>
+#include <tdeaction.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
#include <tqheader.h>
#include <klocale.h>
#include <kiconloader.h>
diff --git a/tdeprint/tdeprintfax/tdeprintfax.h b/tdeprint/tdeprintfax/tdeprintfax.h
index 192ba7b1..783593c3 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.h
+++ b/tdeprint/tdeprintfax/tdeprintfax.h
@@ -21,7 +21,7 @@
#ifndef TDEPRINTFAX_H
#define TDEPRINTFAX_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kurl.h>
class TDEListBox;
diff --git a/tdm/backend/socket.c b/tdm/backend/socket.c
index 677a3d32..151fbc55 100644
--- a/tdm/backend/socket.c
+++ b/tdm/backend/socket.c
@@ -99,9 +99,9 @@ CreateListeningSocket( struct sockaddr *sock_addr, int salen )
return fd;
}
-struct socklist {
- struct socklist *next;
- struct socklist *mcastgroups;
+struct soctdelist {
+ struct soctdelist *next;
+ struct soctdelist *mcastgroups;
struct sockaddr *addr;
int salen;
int addrlen;
@@ -109,12 +109,12 @@ struct socklist {
int ref; /* referenced bit - see UpdateListenSockets */
};
-static struct socklist *listensocks;
+static struct soctdelist *listensocks;
static void
-DestroyListeningSocket( struct socklist *s )
+DestroyListeningSocket( struct soctdelist *s )
{
- struct socklist *g, *n;
+ struct soctdelist *g, *n;
if (s->fd >= 0) {
CloseNClearCloseOnFork( s->fd );
@@ -134,10 +134,10 @@ DestroyListeningSocket( struct socklist *s )
s->mcastgroups = NULL;
}
-static struct socklist*
-FindInList( struct socklist *list, ARRAY8Ptr addr )
+static struct soctdelist*
+FindInList( struct soctdelist *list, ARRAY8Ptr addr )
{
- struct socklist *s;
+ struct soctdelist *s;
for (s = list; s; s = s->next) {
if (s->addrlen == addr->length) {
@@ -165,12 +165,12 @@ FindInList( struct socklist *list, ARRAY8Ptr addr )
return NULL;
}
-static struct socklist *
-CreateSocklistEntry( ARRAY8Ptr addr )
+static struct soctdelist *
+CreateSoctdelistEntry( ARRAY8Ptr addr )
{
- struct socklist *s;
+ struct soctdelist *s;
- if (!(s = Calloc( 1, sizeof(struct socklist) )))
+ if (!(s = Calloc( 1, sizeof(struct soctdelist) )))
return NULL;
if (addr->length == 4) { /* IPv4 */
@@ -212,7 +212,7 @@ CreateSocklistEntry( ARRAY8Ptr addr )
static void
UpdateListener( ARRAY8Ptr addr, void **closure )
{
- struct socklist *s;
+ struct soctdelist *s;
*closure = NULL;
@@ -242,7 +242,7 @@ UpdateListener( ARRAY8Ptr addr, void **closure )
return;
}
- if (!(s = CreateSocklistEntry( addr )))
+ if (!(s = CreateSoctdelistEntry( addr )))
return;
if ((s->fd = CreateListeningSocket( s->addr, s->salen )) < 0) {
@@ -260,7 +260,7 @@ UpdateListener( ARRAY8Ptr addr, void **closure )
#define LEAVE_MCAST_GROUP 1
static void
-ChangeMcastMembership( struct socklist *s, struct socklist *g, int op )
+ChangeMcastMembership( struct soctdelist *s, struct soctdelist *g, int op )
{
int sockopt;
@@ -342,8 +342,8 @@ ChangeMcastMembership( struct socklist *s, struct socklist *g, int op )
static void
UpdateMcastGroup( ARRAY8Ptr addr, void **closure )
{
- struct socklist *s = (struct socklist *)*closure;
- struct socklist *g;
+ struct soctdelist *s = (struct soctdelist *)*closure;
+ struct soctdelist *g;
if (!s)
return;
@@ -355,7 +355,7 @@ UpdateMcastGroup( ARRAY8Ptr addr, void **closure )
}
/* Need to join the group */
- if (!(g = CreateSocklistEntry( addr )))
+ if (!(g = CreateSoctdelistEntry( addr )))
return;
ChangeMcastMembership( s, g, JOIN_MCAST_GROUP );
@@ -367,7 +367,7 @@ UpdateMcastGroup( ARRAY8Ptr addr, void **closure )
void
UpdateListenSockets( void )
{
- struct socklist *s, *g, **ls, **lg;
+ struct soctdelist *s, *g, **ls, **lg;
void *tmpPtr = NULL;
/* Clear Ref bits - any not marked by UpdateCallback will be closed */
@@ -404,7 +404,7 @@ AnyListenSockets( void )
int
ProcessListenSockets( FD_TYPE *reads )
{
- struct socklist *s;
+ struct soctdelist *s;
int ret = 0;
for (s = listensocks; s; s = s->next)
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index 809f309a..998573c5 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <klocale.h>
#include <kstandarddirs.h>
#include <kseparator.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <ksimpleconfig.h>
#include <kstringhandler.h>
#include <kdebug.h>
diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp
index 67eb6287..fc332711 100644
--- a/tqt3integration/module/module.cpp
+++ b/tqt3integration/module/module.cpp
@@ -27,7 +27,7 @@
#include <tdefiledialog.h>
#include <kglobalsettings.h>
#include <klocale.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
#include <twin.h>
#include <tqtimer.h>
#include <stdlib.h>
diff --git a/tqt3integration/module/module.h b/tqt3integration/module/module.h
index 1430e053..1d805bcc 100644
--- a/tqt3integration/module/module.h
+++ b/tqt3integration/module/module.h
@@ -25,7 +25,7 @@
#include <kdedmodule.h>
#include <kdirselectdialog.h>
#include <tdefiledialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kdialogbase.h>
class DCOPClientTransaction;
diff --git a/twin/client.h b/twin/client.h
index ffa32859..674251a5 100644
--- a/twin/client.h
+++ b/twin/client.h
@@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <netwm.h>
#include <kdebug.h>
#include <assert.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h
index d3a79456..e31c09d4 100644
--- a/twin/kcmtwin/twindecoration/buttons.h
+++ b/twin/kcmtwin/twindecoration/buttons.h
@@ -36,7 +36,7 @@
#include <tqdragobject.h>
#include <tqlistbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
class KDecorationFactory;
diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp
index 2f7c4582..8961874a 100644
--- a/twin/kcmtwin/twinrules/ruleslist.cpp
+++ b/twin/kcmtwin/twinrules/ruleslist.cpp
@@ -18,7 +18,7 @@
#include "ruleslist.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kpushbutton.h>
#include <assert.h>
#include <kdebug.h>
diff --git a/twin/kcmtwin/twinrules/ruleswidget.h b/twin/kcmtwin/twinrules/ruleswidget.h
index f3f6f988..4d22e182 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.h
+++ b/twin/kcmtwin/twinrules/ruleswidget.h
@@ -22,7 +22,7 @@
#include <kdialogbase.h>
#include <twin.h>
-#include <kshortcutdialog.h>
+#include <tdeshortcutdialog.h>
#include "ruleswidgetbase.h"
#include "editshortcutbase.h"
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index d99b475b..90a43884 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -2547,7 +2547,7 @@
<includehint>kcombobox.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>klistbox.h</includehint>
+ <includehint>tdelistbox.h</includehint>
<includehint>kcombobox.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/twin/utils.h b/twin/utils.h
index 94edb8b4..e8bc09a4 100644
--- a/twin/utils.h
+++ b/twin/utils.h
@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <tqwidget.h>
#include <kmanagerselection.h>
#include <netwm_def.h>
-#include <kshortcutdialog.h>
+#include <tdeshortcutdialog.h>
namespace KWinInternal
{
diff --git a/twin/workspace.h b/twin/workspace.h
index 74f89866..e88e68c8 100644
--- a/twin/workspace.h
+++ b/twin/workspace.h
@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <tqtimer.h>
#include <tqvaluevector.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <tqcursor.h>
#include <netwm.h>
#include <kxmessages.h>