summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--applnk/kde-utilities-xutils.directory4
-rw-r--r--applnk/kde-utilities.directory4
-rw-r--r--drkonqi/backtrace.cpp10
-rw-r--r--drkonqi/backtrace.h2
-rw-r--r--drkonqi/debugger.cpp12
-rw-r--r--drkonqi/krashconf.cpp26
-rw-r--r--drkonqi/toplevel.cpp8
-rw-r--r--kappfinder/README.apps2
-rw-r--r--kappfinder/apps/Games/Toys/xpinguin.desktop22
-rw-r--r--kappfinder/apps/Utilities/Editors/emacs.desktop2
-rw-r--r--kappfinder/apps/Utilities/Editors/gvim.desktop2
-rw-r--r--kappfinder/apps/Utilities/Editors/lemacs.desktop2
-rw-r--r--kappfinder/apps/Utilities/Editors/nedit.desktop2
-rw-r--r--kappfinder/apps/Utilities/Editors/xemacs.desktop2
-rw-r--r--kappfinder/apps/Utilities/calctool.desktop4
-rw-r--r--kappfinder/apps/Utilities/xutils/xcalc.desktop4
-rw-r--r--kappfinder/apps/Utilities/xutils/xload.desktop2
-rw-r--r--kappfinder/toplevel.cpp20
-rw-r--r--kate/COPYING.LIB12
-rw-r--r--kate/ChangeLog6
-rw-r--r--kate/README2
-rw-r--r--kate/app/kateapp.cpp4
-rw-r--r--kate/app/kateappIface.cpp2
-rw-r--r--kate/app/kateconfigdialog.cpp2
-rw-r--r--kate/app/kateconsole.cpp6
-rw-r--r--kate/app/katedocmanager.cpp8
-rw-r--r--kate/app/katedocmanager.h2
-rw-r--r--kate/app/kateexternaltools.cpp26
-rw-r--r--kate/app/kateexternaltools.h2
-rw-r--r--kate/app/katefilelist.cpp18
-rw-r--r--kate/app/katefilelist.h2
-rw-r--r--kate/app/katefileselector.cpp18
-rw-r--r--kate/app/katefileselector.h2
-rw-r--r--kate/app/kategrepdialog.cpp58
-rw-r--r--kate/app/katemailfilesdialog.cpp6
-rw-r--r--kate/app/katemain.cpp2
-rw-r--r--kate/app/katemainwindow.cpp12
-rw-r--r--kate/app/katemainwindow.h2
-rw-r--r--kate/app/katemdi.cpp14
-rw-r--r--kate/app/katemdi.h2
-rw-r--r--kate/app/katemwmodonhddialog.cpp4
-rw-r--r--kate/app/katemwmodonhddialog.h2
-rw-r--r--kate/app/katesession.cpp2
-rw-r--r--kate/app/katetabwidget.cpp6
-rw-r--r--kate/app/kateviewmanager.cpp2
-rw-r--r--kate/app/kateviewspace.cpp24
-rw-r--r--kate/app/kateviewspace.h4
-rw-r--r--kate/app/kateviewspacecontainer.cpp38
-rw-r--r--kate/app/kwritemain.cpp12
-rw-r--r--kate/app/kwritemain.h4
-rw-r--r--kate/data/tips4
-rw-r--r--kate/interfaces/mainwindow.cpp2
-rw-r--r--kate/interfaces/mainwindow.h2
-rw-r--r--kate/utils/dockviewbase.cpp2
-rw-r--r--kcminit/main.cpp10
-rw-r--r--kcontrol/TODO12
-rw-r--r--kcontrol/access/eventsrc8
-rw-r--r--kcontrol/access/kaccess.cpp22
-rw-r--r--kcontrol/access/kcmaccess.cpp24
-rw-r--r--kcontrol/accessibility/accessibilityconfigwidget.ui38
-rw-r--r--kcontrol/arts/arts.cpp40
-rw-r--r--kcontrol/arts/arts.h2
-rw-r--r--kcontrol/arts/generaltab.ui18
-rw-r--r--kcontrol/arts/hardwaretab.ui20
-rw-r--r--kcontrol/arts/krichtextlabel.cpp10
-rw-r--r--kcontrol/arts/krichtextlabel.h6
-rw-r--r--kcontrol/background/bgadvanced.cpp2
-rw-r--r--kcontrol/background/bgadvanced_ui.ui16
-rw-r--r--kcontrol/background/bgdialog.cpp20
-rw-r--r--kcontrol/background/bgdialog_ui.ui40
-rw-r--r--kcontrol/background/bghash.h2
-rw-r--r--kcontrol/background/bgmonitor.cpp14
-rw-r--r--kcontrol/background/bgrender.cpp34
-rw-r--r--kcontrol/background/bgsettings.cpp10
-rw-r--r--kcontrol/background/bgwallpaper_ui.ui16
-rw-r--r--kcontrol/background/main.cpp6
-rw-r--r--kcontrol/bell/bell.cpp8
-rw-r--r--kcontrol/clock/dtime.cpp26
-rw-r--r--kcontrol/clock/main.cpp8
-rw-r--r--kcontrol/colors/colorscm.cpp2
-rw-r--r--kcontrol/colors/stdclient_bitmaps.h14
-rw-r--r--kcontrol/colors/widgetcanvas.cpp36
-rw-r--r--kcontrol/componentchooser/EXAMPLE.desktop4
-rw-r--r--kcontrol/componentchooser/browserconfig_ui.ui12
-rw-r--r--kcontrol/componentchooser/componentchooser.cpp16
-rw-r--r--kcontrol/componentchooser/componentchooser_ui.ui8
-rw-r--r--kcontrol/componentchooser/componentconfig_ui.ui8
-rw-r--r--kcontrol/componentchooser/emailclientconfig_ui.ui16
-rw-r--r--kcontrol/componentchooser/terminalemulatorconfig_ui.ui12
-rw-r--r--kcontrol/crypto/certgen.ui66
-rw-r--r--kcontrol/crypto/crypto.cpp42
-rw-r--r--kcontrol/css/cssconfig.ui22
-rw-r--r--kcontrol/css/csscustom.ui20
-rw-r--r--kcontrol/css/preview.ui8
-rw-r--r--kcontrol/css/template.cpp2
-rw-r--r--kcontrol/dnssd/configdialog.ui20
-rw-r--r--kcontrol/dnssd/kcmdnssd.cpp10
-rw-r--r--kcontrol/ebrowsing/ebrowsing.desktop2
-rw-r--r--kcontrol/ebrowsing/main.cpp6
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui8
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp38
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop2
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui4
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop2
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop2
-rw-r--r--kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp8
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp30
-rw-r--r--kcontrol/energy/energy.cpp8
-rw-r--r--kcontrol/energy/energy.desktop2
-rw-r--r--kcontrol/filetypes/filegroupdetails.cpp8
-rw-r--r--kcontrol/filetypes/filegroupdetails.h2
-rw-r--r--kcontrol/filetypes/filetypedetails.cpp12
-rw-r--r--kcontrol/filetypes/filetypedetails.h2
-rw-r--r--kcontrol/filetypes/filetypesview.cpp2
-rw-r--r--kcontrol/filetypes/typeslistitem.cpp28
-rw-r--r--kcontrol/fonts/fonts.cpp30
-rw-r--r--kcontrol/fonts/kxftconfig.cpp16
-rw-r--r--kcontrol/fonts/kxftconfig.h2
-rw-r--r--kcontrol/iccconfig/iccconfig.cpp8
-rw-r--r--kcontrol/iccconfig/iccconfigbase.ui8
-rw-r--r--kcontrol/icons/icons.cpp12
-rw-r--r--kcontrol/icons/iconthemes.cpp2
-rw-r--r--kcontrol/icons/main.cpp4
-rw-r--r--kcontrol/info/info.cpp22
-rw-r--r--kcontrol/info/info_aix.cpp2
-rw-r--r--kcontrol/info/info_linux.cpp4
-rw-r--r--kcontrol/info/info_netbsd.cpp16
-rw-r--r--kcontrol/info/info_openbsd.cpp8
-rw-r--r--kcontrol/info/info_osx.cpp2
-rw-r--r--kcontrol/info/info_solaris.cpp4
-rw-r--r--kcontrol/info/memory.cpp10
-rw-r--r--kcontrol/info/opengl.cpp8
-rw-r--r--kcontrol/info/opengl.desktop4
-rw-r--r--kcontrol/input/core/themepage.cpp8
-rw-r--r--kcontrol/input/kmousedlg.ui34
-rw-r--r--kcontrol/input/logitechmouse.cpp20
-rw-r--r--kcontrol/input/logitechmouse.h28
-rw-r--r--kcontrol/input/logitechmouse_base.ui6
-rw-r--r--kcontrol/input/mouse.cpp10
-rw-r--r--kcontrol/input/mouse.desktop2
-rw-r--r--kcontrol/input/mouse.h2
-rw-r--r--kcontrol/input/xcursor/previewwidget.cpp8
-rw-r--r--kcontrol/input/xcursor/themepage.cpp42
-rw-r--r--kcontrol/ioslaveinfo/kcmioslaveinfo.cpp6
-rw-r--r--kcontrol/joystick/caldialog.cpp4
-rw-r--r--kcontrol/joystick/joystick.cpp2
-rw-r--r--kcontrol/joystick/joywidget.cpp2
-rw-r--r--kcontrol/kcontrol/aboutwidget.cpp2
-rw-r--r--kcontrol/kcontrol/dockcontainer.cpp4
-rw-r--r--kcontrol/kcontrol/global.cpp4
-rw-r--r--kcontrol/kcontrol/kcrootonly.cpp8
-rw-r--r--kcontrol/kcontrol/main.cpp8
-rw-r--r--kcontrol/kcontrol/modulemenu.cpp8
-rw-r--r--kcontrol/kcontrol/modules.cpp10
-rw-r--r--kcontrol/kcontrol/moduletreeview.cpp10
-rw-r--r--kcontrol/kcontrol/moduletreeview.h2
-rw-r--r--kcontrol/kcontrol/proxywidget.cpp4
-rw-r--r--kcontrol/kcontrol/toplevel.cpp6
-rw-r--r--kcontrol/kded/kcmkded.cpp16
-rw-r--r--kcontrol/kded/kcmkded.h2
-rw-r--r--kcontrol/kdm/ChangeLog2
-rw-r--r--kcontrol/kdm/background.cpp4
-rw-r--r--kcontrol/kdm/kbackedcombobox.cpp2
-rw-r--r--kcontrol/kdm/kdm-appear.cpp20
-rw-r--r--kcontrol/kdm/kdm-conv.cpp4
-rw-r--r--kcontrol/kdm/kdm-users.cpp14
-rw-r--r--kcontrol/kdm/main.cpp4
-rw-r--r--kcontrol/keys/commandShortcuts.cpp4
-rwxr-xr-xkcontrol/keys/convertShortcuts.pl2
-rw-r--r--kcontrol/keys/kaccelaction.h4
-rw-r--r--kcontrol/keys/keyconfig.cpp10
-rw-r--r--kcontrol/keys/keys.desktop2
-rw-r--r--kcontrol/keys/modifiers.cpp2
-rw-r--r--kcontrol/keys/shortcuts.cpp18
-rw-r--r--kcontrol/keys/treeview.cpp12
-rw-r--r--kcontrol/kfontinst/ChangeLog6
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp34
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.h2
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.h2
-rw-r--r--kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp12
-rw-r--r--kcontrol/kfontinst/kfile-plugin/KFileFont.cpp48
-rw-r--r--kcontrol/kfontinst/kfontinst/FontEngine.cpp4
-rw-r--r--kcontrol/kfontinst/kfontinst/Fontmap.cpp4
-rw-r--r--kcontrol/kfontinst/kfontinst/GetPid.c2
-rw-r--r--kcontrol/kfontinst/kfontinst/XConfig.cpp2
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.cpp50
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.h2
-rw-r--r--kcontrol/kfontinst/lib/FcEngine.cpp2
-rw-r--r--kcontrol/kfontinst/lib/Misc.cpp4
-rw-r--r--kcontrol/kfontinst/viewpart/FontPreview.cpp4
-rw-r--r--kcontrol/kfontinst/viewpart/FontPreview.h4
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPart.cpp24
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPart.h2
-rw-r--r--kcontrol/kicker/advancedDialog.cpp12
-rw-r--r--kcontrol/kicker/advancedOptions.ui18
-rw-r--r--kcontrol/kicker/applettab.ui16
-rw-r--r--kcontrol/kicker/applettab_impl.cpp4
-rw-r--r--kcontrol/kicker/extensionInfo.cpp16
-rw-r--r--kcontrol/kicker/extensionInfo.h4
-rw-r--r--kcontrol/kicker/hidingconfig.cpp6
-rw-r--r--kcontrol/kicker/hidingtab.ui36
-rw-r--r--kcontrol/kicker/lookandfeelconfig.cpp6
-rw-r--r--kcontrol/kicker/lookandfeeltab.ui22
-rw-r--r--kcontrol/kicker/lookandfeeltab_kcm.cpp6
-rw-r--r--kcontrol/kicker/main.cpp2
-rw-r--r--kcontrol/kicker/menuconfig.cpp6
-rw-r--r--kcontrol/kicker/menutab.ui32
-rw-r--r--kcontrol/kicker/menutab_impl.cpp12
-rw-r--r--kcontrol/kicker/positionconfig.cpp6
-rw-r--r--kcontrol/kicker/positiontab.ui76
-rw-r--r--kcontrol/kicker/positiontab_impl.cpp12
-rw-r--r--kcontrol/kio/UA-DESKTOP-FILE-HOWTO10
-rw-r--r--kcontrol/kio/cache_ui.ui8
-rw-r--r--kcontrol/kio/envvarproxy_ui.ui4
-rw-r--r--kcontrol/kio/fakeuaprovider.cpp24
-rw-r--r--kcontrol/kio/fakeuaprovider.h4
-rw-r--r--kcontrol/kio/kcookiesmain.cpp4
-rw-r--r--kcontrol/kio/kcookiesmanagement.cpp2
-rw-r--r--kcontrol/kio/kcookiesmanagementdlg_ui.ui14
-rw-r--r--kcontrol/kio/kcookiespolicies.cpp4
-rw-r--r--kcontrol/kio/kcookiespoliciesdlg_ui.ui12
-rw-r--r--kcontrol/kio/kenvvarproxydlg.cpp8
-rw-r--r--kcontrol/kio/kmanualproxydlg.cpp4
-rw-r--r--kcontrol/kio/kproxydlg.cpp4
-rw-r--r--kcontrol/kio/kproxydlg_ui.ui18
-rw-r--r--kcontrol/kio/lanbrowser.desktop2
-rw-r--r--kcontrol/kio/main.cpp4
-rw-r--r--kcontrol/kio/main.h2
-rw-r--r--kcontrol/kio/manualproxy_ui.ui12
-rw-r--r--kcontrol/kio/policydlg.cpp2
-rw-r--r--kcontrol/kio/policydlg.h6
-rw-r--r--kcontrol/kio/policydlg_ui.ui6
-rw-r--r--kcontrol/kio/smbrodlg.cpp28
-rw-r--r--kcontrol/kio/socks.cpp4
-rw-r--r--kcontrol/kio/socksbase.ui18
-rw-r--r--kcontrol/kio/uagentproviderdlg.cpp2
-rw-r--r--kcontrol/kio/uagentproviderdlg_ui.ui12
-rw-r--r--kcontrol/kio/useragentdlg.cpp28
-rw-r--r--kcontrol/kio/useragentdlg_ui.ui14
-rw-r--r--kcontrol/knotify/knotify.cpp6
-rw-r--r--kcontrol/knotify/playersettings.ui18
-rw-r--r--kcontrol/knotify/sounds/KDE_Star_Ship_1.oggbin44077 -> 44075 bytes
-rw-r--r--kcontrol/knotify/sounds/KDE_Startup_1.oggbin124444 -> 124445 bytes
-rw-r--r--kcontrol/knotify/sounds/KDE_Window_Iconify.wavbin26133 -> 26134 bytes
-rw-r--r--kcontrol/konq/README4
-rw-r--r--kcontrol/konq/behaviour.cpp6
-rw-r--r--kcontrol/konq/browser.cpp12
-rw-r--r--kcontrol/konq/desktop.cpp10
-rw-r--r--kcontrol/konq/desktopbehavior.ui12
-rw-r--r--kcontrol/konq/desktopbehavior_impl.cpp16
-rw-r--r--kcontrol/konq/previews.cpp2
-rw-r--r--kcontrol/konq/previews.h2
-rw-r--r--kcontrol/konq/rootopts.cpp14
-rw-r--r--kcontrol/konq/rootopts.h2
-rw-r--r--kcontrol/konqhtml/advancedTabDialog.cpp8
-rw-r--r--kcontrol/konqhtml/advancedTabOptions.ui10
-rw-r--r--kcontrol/konqhtml/domainlistview.cpp8
-rw-r--r--kcontrol/konqhtml/domainlistview.h6
-rw-r--r--kcontrol/konqhtml/filteropts.cpp2
-rw-r--r--kcontrol/konqhtml/htmlopts.cpp4
-rw-r--r--kcontrol/konqhtml/htmlopts.h2
-rw-r--r--kcontrol/konqhtml/javaopts.cpp6
-rw-r--r--kcontrol/konqhtml/javaopts.h6
-rw-r--r--kcontrol/konqhtml/jsopts.cpp4
-rw-r--r--kcontrol/konqhtml/jspolicies.cpp108
-rw-r--r--kcontrol/konqhtml/jspolicies.h26
-rw-r--r--kcontrol/konqhtml/main.cpp4
-rw-r--r--kcontrol/konqhtml/nsconfigwidget.ui14
-rw-r--r--kcontrol/konqhtml/pluginopts.cpp8
-rw-r--r--kcontrol/konqhtml/pluginopts.h6
-rw-r--r--kcontrol/konqhtml/policies.h6
-rw-r--r--kcontrol/konqhtml/policydlg.h2
-rw-r--r--kcontrol/konsole/kcmkonsoledialog.ui20
-rw-r--r--kcontrol/konsole/schemadialog.ui24
-rw-r--r--kcontrol/konsole/sessiondialog.ui28
-rw-r--r--kcontrol/krdb/krdb.cpp14
-rw-r--r--kcontrol/kthememanager/knewthemedlg.h2
-rw-r--r--kcontrol/kthememanager/ktheme.cpp16
-rw-r--r--kcontrol/kthememanager/kthemedlg.ui38
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp2
-rw-r--r--kcontrol/kthememanager/newthemewidget.ui6
-rw-r--r--kcontrol/launch/kcmlaunch.cpp12
-rw-r--r--kcontrol/locale/kcmlocale.cpp24
-rw-r--r--kcontrol/locale/klocalesample.cpp6
-rw-r--r--kcontrol/locale/localemon.cpp12
-rw-r--r--kcontrol/locale/localenum.cpp12
-rw-r--r--kcontrol/locale/localeother.cpp2
-rw-r--r--kcontrol/locale/localetime.cpp22
-rw-r--r--kcontrol/locale/toplevel.cpp6
-rw-r--r--kcontrol/nics/nic.cpp20
-rw-r--r--kcontrol/performance/kcmperformance.cpp4
-rw-r--r--kcontrol/performance/konqueror_ui.ui12
-rw-r--r--kcontrol/performance/system_ui.ui8
-rw-r--r--kcontrol/privacy/kcmprivacydialog.ui22
-rw-r--r--kcontrol/privacy/kprivacysettings.ui10
-rw-r--r--kcontrol/randr/configdialog.cpp2
-rw-r--r--kcontrol/randr/configdialog.h8
-rw-r--r--kcontrol/randr/krandrmodule.cpp2
-rw-r--r--kcontrol/randr/krandrpassivepopup.cpp4
-rw-r--r--kcontrol/randr/krandrtray.cpp6
-rw-r--r--kcontrol/randr/ktimerdialog.cpp8
-rw-r--r--kcontrol/randr/ktimerdialog.h2
-rw-r--r--kcontrol/samba/AUTHORS2
-rw-r--r--kcontrol/samba/kcmsambaimports.cpp6
-rw-r--r--kcontrol/samba/kcmsambalog.cpp16
-rw-r--r--kcontrol/samba/kcmsambastatistics.cpp40
-rw-r--r--kcontrol/samba/ksmbstatus.cpp8
-rw-r--r--kcontrol/samba/main.cpp6
-rw-r--r--kcontrol/samba/smbstatus.desktop22
-rw-r--r--kcontrol/screensaver/advanceddialogimpl.ui32
-rw-r--r--kcontrol/screensaver/category_list2
-rw-r--r--kcontrol/screensaver/kswidget.cpp2
-rw-r--r--kcontrol/screensaver/scrnsave.cpp26
-rw-r--r--kcontrol/smartcard/nosmartcardbase.ui12
-rw-r--r--kcontrol/smartcard/smartcard.cpp6
-rw-r--r--kcontrol/smartcard/smartcardbase.ui14
-rw-r--r--kcontrol/smserver/smserverconfigdlg.ui10
-rw-r--r--kcontrol/spellchecking/spellchecking.cpp8
-rw-r--r--kcontrol/style/kcmstyle.cpp32
-rw-r--r--kcontrol/style/keramik/keramikconf.cpp10
-rw-r--r--kcontrol/style/menupreview.cpp12
-rw-r--r--kcontrol/style/stylepreview.ui22
-rw-r--r--kcontrol/taskbar/kcmtaskbar.cpp4
-rw-r--r--kcontrol/taskbar/kcmtaskbarui.ui24
-rw-r--r--kcontrol/usbview/kcmusb.cpp10
-rw-r--r--kcontrol/usbview/kcmusb.desktop4
-rw-r--r--kcontrol/usbview/usb.ids18
-rw-r--r--kcontrol/usbview/usbdevices.cpp8
-rw-r--r--kcontrol/view1394/kcmview1394.desktop4
-rw-r--r--kcontrol/view1394/oui.db2
-rw-r--r--kcontrol/view1394/view1394widget.ui8
-rw-r--r--kcontrol/xinerama/kcmxinerama.cpp4
-rw-r--r--kcontrol/xinerama/xineramawidget.ui10
-rw-r--r--kdcop/kdcopview.ui10
-rw-r--r--kdcop/kdcopwindow.cpp22
-rw-r--r--kdebugdialog/kabstractdebugdialog.cpp8
-rw-r--r--kdebugdialog/kdebugdialog.cpp2
-rw-r--r--kdebugdialog/klistdebugdialog.cpp4
-rw-r--r--kdepasswd/kcm/chfnprocess.cpp8
-rw-r--r--kdepasswd/kcm/main.cpp6
-rw-r--r--kdepasswd/kcm/main_widget.ui20
-rw-r--r--kdepasswd/passwd.cpp4
-rw-r--r--kdeprint/descriptions/sortthem.cpp2
-rw-r--r--kdeprint/kdeprint_part/printpart.cpp4
-rw-r--r--kdeprint/kdeprint_part/printpart.h2
-rw-r--r--kdeprint/kdeprintfax/confgeneral.cpp20
-rw-r--r--kdeprint/kdeprintfax/confgeneral.h4
-rw-r--r--kdeprint/kdeprintfax/confsystem.cpp8
-rw-r--r--kdeprint/kdeprintfax/defcmds.cpp2
-rw-r--r--kdeprint/kdeprintfax/faxab.cpp2
-rw-r--r--kdeprint/kdeprintfax/faxctrl.cpp40
-rw-r--r--kdeprint/kdeprintfax/kdeprintfax.cpp6
-rw-r--r--kdeprint/kprinter/printwrapper.cpp4
-rw-r--r--kdeprint/slave/kio_print.cpp26
-rw-r--r--kdesktop/DESIGN2
-rw-r--r--kdesktop/bgmanager.cc16
-rw-r--r--kdesktop/bgmanager.h2
-rw-r--r--kdesktop/desktop.cc10
-rw-r--r--kdesktop/init.cc2
-rw-r--r--kdesktop/init/Templates/linkFloppy.desktop4
-rw-r--r--kdesktop/kcustommenu.cc4
-rw-r--r--kdesktop/kdiconview.cc56
-rw-r--r--kdesktop/kdiconview.h2
-rw-r--r--kdesktop/kfileividesktop.cpp10
-rw-r--r--kdesktop/kfileividesktop.h4
-rw-r--r--kdesktop/krootwm.cc12
-rw-r--r--kdesktop/kshadowengine.cpp20
-rw-r--r--kdesktop/kshadowengine.h4
-rw-r--r--kdesktop/kxdglauncher.cpp6
-rw-r--r--kdesktop/lock/autologout.cc10
-rw-r--r--kdesktop/lock/autologout.h2
-rw-r--r--kdesktop/lock/infodlg.cc14
-rw-r--r--kdesktop/lock/infodlg.h4
-rw-r--r--kdesktop/lock/lockdlg.cc54
-rw-r--r--kdesktop/lock/lockdlg.h6
-rw-r--r--kdesktop/lock/lockprocess.cc22
-rw-r--r--kdesktop/lock/querydlg.cc16
-rw-r--r--kdesktop/lock/querydlg.h4
-rw-r--r--kdesktop/lockeng.cc2
-rw-r--r--kdesktop/minicli.cpp48
-rw-r--r--kdesktop/minicli.h2
-rw-r--r--kdesktop/minicli_ui.ui32
-rw-r--r--kdesktop/pixmapserver.cc4
-rw-r--r--kdesktop/programs/xplanet.desktop4
-rw-r--r--kdesktop/startupid.cpp12
-rw-r--r--kdesktop/xautolock.cc2
-rw-r--r--kdesktop/xautolock_diy.c16
-rw-r--r--kdesktop/xautolock_engine.c18
-rw-r--r--kdesu/kdesud/handler.cpp4
-rw-r--r--kdesu/kdesud/kdesud.cpp2
-rw-r--r--kdesu/kdesud/repo.cpp2
-rw-r--r--kdialog/README2
-rw-r--r--kdialog/kdialog.cpp50
-rw-r--r--kdialog/klistboxdialog.cpp2
-rwxr-xr-xkdialog/progressdemo2
-rwxr-xr-xkdialog/test24
-rw-r--r--kdialog/widgets.cpp6
-rw-r--r--kdm/ChangeLog14
-rw-r--r--kdm/README10
-rw-r--r--kdm/TODO2
-rw-r--r--kdm/backend/auth.c8
-rw-r--r--kdm/backend/dm.c24
-rw-r--r--kdm/backend/dm.h12
-rw-r--r--kdm/backend/greet.h4
-rw-r--r--kdm/backend/server.c18
-rw-r--r--kdm/backend/session.c6
-rw-r--r--kdm/config.def72
-rw-r--r--kdm/kfrontend/genkdmconf.c18
-rw-r--r--kdm/kfrontend/kchooser.cpp10
-rw-r--r--kdm/kfrontend/kdm_greet.c38
-rw-r--r--kdm/kfrontend/kdm_greet.h4
-rw-r--r--kdm/kfrontend/kdmadmindialog.cpp8
-rw-r--r--kdm/kfrontend/kdmclock.cpp8
-rw-r--r--kdm/kfrontend/kdmconfig.cpp6
-rw-r--r--kdm/kfrontend/kdmshutdown.cpp22
-rw-r--r--kdm/kfrontend/kfdialog.cpp8
-rw-r--r--kdm/kfrontend/kgapp.cpp4
-rw-r--r--kdm/kfrontend/kgdialog.cpp4
-rw-r--r--kdm/kfrontend/kgreeter.cpp24
-rw-r--r--kdm/kfrontend/kgreeter.h2
-rw-r--r--kdm/kfrontend/kgverify.cpp56
-rw-r--r--kdm/kfrontend/kgverify.h10
-rw-r--r--kdm/kfrontend/krootimage.cpp2
-rw-r--r--kdm/kfrontend/sessions/ratpoison.desktop2
-rw-r--r--kdm/kfrontend/sessions/sawfish.desktop2
-rw-r--r--kdm/kfrontend/themer/kdmitem.cpp50
-rw-r--r--kdm/kfrontend/themer/kdmitem.h38
-rw-r--r--kdm/kfrontend/themer/kdmlabel.cpp10
-rw-r--r--kdm/kfrontend/themer/kdmlabel.h2
-rw-r--r--kdm/kfrontend/themer/kdmlayout.cpp32
-rw-r--r--kdm/kfrontend/themer/kdmlayout.h14
-rw-r--r--kdm/kfrontend/themer/kdmpixmap.cpp14
-rw-r--r--kdm/kfrontend/themer/kdmpixmap.h2
-rw-r--r--kdm/kfrontend/themer/kdmrect.cpp2
-rw-r--r--kdm/kfrontend/themer/kdmthemer.cpp2
-rw-r--r--kdm/kfrontend/themer/kdmthemer.h4
-rw-r--r--kdm/kfrontend/themes/o2_enterprise/gpl.txt6
-rw-r--r--kdmlib/dmctl.cpp4
-rw-r--r--kdmlib/kgreet_classic.cpp10
-rw-r--r--kdmlib/kgreet_pam.cpp22
-rw-r--r--kdmlib/kgreet_pam.h4
-rw-r--r--kdmlib/kgreet_winbind.cpp14
-rw-r--r--kdmlib/kgreeterplugin.h4
-rw-r--r--kfind/ChangeLog6
-rw-r--r--kfind/README2
-rw-r--r--kfind/TODO2
-rw-r--r--kfind/kdatecombo.cpp12
-rw-r--r--kfind/kdatecombo.h2
-rw-r--r--kfind/kfind.cpp4
-rw-r--r--kfind/kfindpart.cpp6
-rw-r--r--kfind/kfindpart.h2
-rw-r--r--kfind/kftabdlg.cpp24
-rw-r--r--kfind/kftabdlg.h2
-rw-r--r--kfind/kfwin.cpp20
-rw-r--r--kfind/kquery.cpp8
-rw-r--r--khelpcenter/COPYING6
-rw-r--r--khelpcenter/DESIGN12
-rw-r--r--khelpcenter/Help.desktop4
-rw-r--r--khelpcenter/README.metadata8
-rw-r--r--khelpcenter/docentry.cpp2
-rw-r--r--khelpcenter/docmetainfo.cpp4
-rw-r--r--khelpcenter/fontdialog.cpp58
-rw-r--r--khelpcenter/formatter.cpp4
-rw-r--r--khelpcenter/glossary.cpp42
-rw-r--r--khelpcenter/glossary.h6
-rw-r--r--khelpcenter/history.cpp6
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.cpp8
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.desktop4
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.cpp14
-rw-r--r--khelpcenter/htmlsearch/klangcombo.cpp6
-rw-r--r--khelpcenter/htmlsearch/ktagcombobox.cpp10
-rw-r--r--khelpcenter/htmlsearch/ktagcombobox.h2
-rw-r--r--khelpcenter/htmlsearchconfig.cpp6
-rw-r--r--khelpcenter/kcmhelpcenter.cpp18
-rw-r--r--khelpcenter/kcmhelpcenter.desktop12
-rw-r--r--khelpcenter/kcmhelpcenter.h2
-rw-r--r--khelpcenter/khelpcenter.desktop6
-rw-r--r--khelpcenter/mainwindow.cpp4
-rw-r--r--khelpcenter/navigator.cpp8
-rw-r--r--khelpcenter/plugins/kioslaves.desktop2
-rw-r--r--khelpcenter/scrollkeepertreebuilder.cpp2
-rw-r--r--khelpcenter/searchengine.cpp32
-rw-r--r--khelpcenter/searchhandler.cpp6
-rw-r--r--khelpcenter/searchhandlers/README.searchhandlers6
-rw-r--r--khelpcenter/toc.cpp14
-rw-r--r--khelpcenter/toc.h4
-rw-r--r--khelpcenter/view.cpp4
-rw-r--r--khelpcenter/view.h2
-rw-r--r--khotkeys/README2
-rw-r--r--khotkeys/TODO6
-rw-r--r--khotkeys/arts/soundrecorder_arts.cpp2
-rw-r--r--khotkeys/data/kde32b1.khotkeys8
-rw-r--r--khotkeys/data/printscreen.khotkeys2
-rw-r--r--khotkeys/kcontrol/action_list_widget.cpp2
-rw-r--r--khotkeys/kcontrol/actions_listview_widget.cpp2
-rw-r--r--khotkeys/kcontrol/condition_list_widget.cpp2
-rw-r--r--khotkeys/kcontrol/gesturedrawer.cpp20
-rw-r--r--khotkeys/kcontrol/gesturedrawer.h4
-rw-r--r--khotkeys/kcontrol/gesturerecorder.cpp2
-rw-r--r--khotkeys/kcontrol/gesturerecordpage.cpp2
-rw-r--r--khotkeys/kcontrol/gesturerecordpage.h2
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.cpp4
-rw-r--r--khotkeys/kcontrol/khotkeys.desktop2
-rw-r--r--khotkeys/kcontrol/main_buttons_widget.cpp2
-rw-r--r--khotkeys/kcontrol/menuedit.cpp2
-rw-r--r--khotkeys/kcontrol/tab_widget.cpp2
-rw-r--r--khotkeys/kcontrol/triggers_tab.cpp4
-rw-r--r--khotkeys/kcontrol/ui/action_group_tab_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/action_list_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/actions_listview_widget_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/command_url_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/condition_list_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/dcop_widget_ui.ui20
-rw-r--r--khotkeys/kcontrol/ui/general_settings_tab_ui.ui14
-rw-r--r--khotkeys/kcontrol/ui/general_tab_ui.ui10
-rw-r--r--khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui44
-rw-r--r--khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui12
-rw-r--r--khotkeys/kcontrol/ui/info_tab_ui.ui10
-rw-r--r--khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/main_buttons_widget_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/menuentry_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/triggers_tab_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/voice_input_widget_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/voice_settings_tab_ui.ui12
-rw-r--r--khotkeys/kcontrol/ui/window_trigger_widget_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui20
-rw-r--r--khotkeys/kcontrol/voicerecordpage.cpp2
-rw-r--r--khotkeys/kcontrol/windowdef_list_widget.cpp2
-rw-r--r--khotkeys/shared/actions.cpp2
-rw-r--r--khotkeys/shared/gestures.cpp8
-rw-r--r--khotkeys/shared/input.cpp22
-rw-r--r--khotkeys/shared/input.h2
-rw-r--r--khotkeys/shared/settings.cpp2
-rw-r--r--khotkeys/shared/sound.cpp62
-rw-r--r--khotkeys/shared/sound.h4
-rw-r--r--khotkeys/shared/triggers.cpp8
-rw-r--r--khotkeys/shared/voices.cpp4
-rw-r--r--khotkeys/shared/voicesignature.cpp10
-rw-r--r--khotkeys/shared/windows.cpp4
-rw-r--r--kicker/ChangeLog6
-rw-r--r--kicker/TODO10
-rw-r--r--kicker/applets/clock/analog.ui16
-rw-r--r--kicker/applets/clock/clock.cpp80
-rw-r--r--kicker/applets/clock/clock.h4
-rw-r--r--kicker/applets/clock/digital.ui14
-rw-r--r--kicker/applets/clock/fuzzy.ui14
-rw-r--r--kicker/applets/clock/settings.ui22
-rw-r--r--kicker/applets/clock/zone.cpp2
-rw-r--r--kicker/applets/launcher/configdlgbase.ui16
-rw-r--r--kicker/applets/launcher/flowgridmanager.h4
-rw-r--r--kicker/applets/launcher/popularity.cpp2
-rw-r--r--kicker/applets/launcher/quickaddappsmenu.cpp2
-rw-r--r--kicker/applets/launcher/quickbutton.cpp2
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp22
-rw-r--r--kicker/applets/launcher/quicklauncher.h2
-rw-r--r--kicker/applets/lockout/lockout.cpp30
-rw-r--r--kicker/applets/lockout/lockout.h2
-rw-r--r--kicker/applets/media/mediaapplet.cpp6
-rw-r--r--kicker/applets/media/preferencesdialog.cpp4
-rw-r--r--kicker/applets/menu/menuapplet.cpp8
-rw-r--r--kicker/applets/menu/menuapplet.h4
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp18
-rw-r--r--kicker/applets/minipager/pagerapplet.h2
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp46
-rw-r--r--kicker/applets/naughty/NaughtyApplet.cpp6
-rw-r--r--kicker/applets/naughty/NaughtyApplet.h2
-rw-r--r--kicker/applets/naughty/NaughtyProcessMonitor.cpp18
-rw-r--r--kicker/applets/run/runapplet.cpp12
-rw-r--r--kicker/applets/swallow/prefwidgetbase.ui8
-rw-r--r--kicker/applets/swallow/swallow.cpp22
-rw-r--r--kicker/applets/swallow/swallow.h4
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp74
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.desktop4
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.h4
-rw-r--r--kicker/applets/taskbar/taskbarapplet.cpp8
-rw-r--r--kicker/data/kickoff/kmenu_vertical.mngbin4130 -> 4131 bytes
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp24
-rw-r--r--kicker/extensions/dockbar/dockbarextension.h4
-rw-r--r--kicker/extensions/kasbar/ChangeLog30
-rw-r--r--kicker/extensions/kasbar/DESIGN2
-rw-r--r--kicker/extensions/kasbar/Doxyfile16
-rw-r--r--kicker/extensions/kasbar/kasbar.cpp40
-rw-r--r--kicker/extensions/kasbar/kasbar.h12
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp8
-rw-r--r--kicker/extensions/kasbar/kasbarextension.h2
-rw-r--r--kicker/extensions/kasbar/kasclockitem.cpp6
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.cpp4
-rw-r--r--kicker/extensions/kasbar/kasitem.cpp10
-rw-r--r--kicker/extensions/kasbar/kasitem.h6
-rw-r--r--kicker/extensions/kasbar/kasloaditem.cpp4
-rw-r--r--kicker/extensions/kasbar/kaspopup.cpp8
-rw-r--r--kicker/extensions/kasbar/kasprefsdlg.cpp2
-rw-r--r--kicker/extensions/kasbar/kasresources.cpp4
-rw-r--r--kicker/extensions/kasbar/kastasker.cpp2
-rw-r--r--kicker/extensions/kasbar/kastaskitem.cpp10
-rw-r--r--kicker/extensions/kasbar/kastaskitem.h2
-rw-r--r--kicker/extensions/kasbar/kastaskpopup.cpp2
-rw-r--r--kicker/extensions/sidebar/sidebarextension.cpp32
-rw-r--r--kicker/extensions/sidebar/sidebarextension.h4
-rw-r--r--kicker/extensions/taskbar/taskbarextension.cpp12
-rw-r--r--kicker/extensions/taskbar/taskbarextension.h2
-rw-r--r--kicker/kicker/buttons/bookmarksbutton.h2
-rw-r--r--kicker/kicker/buttons/browserbutton.cpp2
-rw-r--r--kicker/kicker/buttons/browserbutton.h2
-rw-r--r--kicker/kicker/buttons/desktopbutton.cpp2
-rw-r--r--kicker/kicker/buttons/kbutton.h2
-rw-r--r--kicker/kicker/buttons/knewbutton.cpp16
-rw-r--r--kicker/kicker/buttons/knewbutton.h4
-rw-r--r--kicker/kicker/buttons/nonkdeappbutton.cpp2
-rw-r--r--kicker/kicker/buttons/nonkdeappbutton.h2
-rw-r--r--kicker/kicker/buttons/servicemenubutton.h2
-rw-r--r--kicker/kicker/buttons/windowlistbutton.h2
-rw-r--r--kicker/kicker/core/applethandle.cpp36
-rw-r--r--kicker/kicker/core/applethandle.h14
-rw-r--r--kicker/kicker/core/container_applet.cpp36
-rw-r--r--kicker/kicker/core/container_applet.h6
-rw-r--r--kicker/kicker/core/container_base.cpp14
-rw-r--r--kicker/kicker/core/container_base.h12
-rw-r--r--kicker/kicker/core/container_button.cpp12
-rw-r--r--kicker/kicker/core/container_button.h4
-rw-r--r--kicker/kicker/core/container_extension.cpp222
-rw-r--r--kicker/kicker/core/container_extension.h12
-rw-r--r--kicker/kicker/core/containerarea.cpp150
-rw-r--r--kicker/kicker/core/containerarea.h8
-rw-r--r--kicker/kicker/core/containerarealayout.cpp76
-rw-r--r--kicker/kicker/core/containerarealayout.h28
-rw-r--r--kicker/kicker/core/extensionSettings.kcfg2
-rw-r--r--kicker/kicker/core/extensionmanager.cpp34
-rw-r--r--kicker/kicker/core/extensionmanager.h2
-rw-r--r--kicker/kicker/core/kmenubase.ui26
-rw-r--r--kicker/kicker/core/menumanager.cpp12
-rw-r--r--kicker/kicker/core/panelextension.cpp8
-rw-r--r--kicker/kicker/core/panelextension.h2
-rw-r--r--kicker/kicker/core/userrectsel.cpp6
-rw-r--r--kicker/kicker/core/userrectsel.h10
-rw-r--r--kicker/kicker/interfaces/kickoff-search-plugin.h2
-rw-r--r--kicker/kicker/kicker-3.4-reverseLayout.cpp2
-rw-r--r--kicker/kicker/plugins/beaglesearch.cpp2
-rw-r--r--kicker/kicker/plugins/kickoff-beagle-plugin.cpp2
-rw-r--r--kicker/kicker/ui/addapplet.cpp16
-rw-r--r--kicker/kicker/ui/addapplet_mnu.cpp4
-rw-r--r--kicker/kicker/ui/addappletvisualfeedback.cpp32
-rw-r--r--kicker/kicker/ui/addappletvisualfeedback.h2
-rw-r--r--kicker/kicker/ui/addbutton_mnu.cpp2
-rw-r--r--kicker/kicker/ui/addextension_mnu.cpp2
-rw-r--r--kicker/kicker/ui/appletitem.ui20
-rw-r--r--kicker/kicker/ui/appletop_mnu.cpp2
-rw-r--r--kicker/kicker/ui/appletview.ui12
-rw-r--r--kicker/kicker/ui/browser_mnu.cpp20
-rw-r--r--kicker/kicker/ui/clicklineedit.cpp8
-rw-r--r--kicker/kicker/ui/clicklineedit.h2
-rw-r--r--kicker/kicker/ui/exe_dlg.cpp6
-rw-r--r--kicker/kicker/ui/flipscrollview.cpp8
-rw-r--r--kicker/kicker/ui/hidebutton.cpp14
-rw-r--r--kicker/kicker/ui/itemview.cpp58
-rw-r--r--kicker/kicker/ui/itemview.h2
-rw-r--r--kicker/kicker/ui/k_mnu.cpp34
-rw-r--r--kicker/kicker/ui/k_mnu.h2
-rw-r--r--kicker/kicker/ui/k_mnu_stub.cpp6
-rw-r--r--kicker/kicker/ui/k_mnu_stub.h2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp146
-rw-r--r--kicker/kicker/ui/k_new_mnu.h6
-rw-r--r--kicker/kicker/ui/kickoff_bar.cpp28
-rw-r--r--kicker/kicker/ui/kickoff_bar.h4
-rw-r--r--kicker/kicker/ui/kmenuitembase.ui20
-rw-r--r--kicker/kicker/ui/nonKDEButtonSettings.ui14
-rw-r--r--kicker/kicker/ui/popupmenutitle.h4
-rw-r--r--kicker/kicker/ui/removeapplet_mnu.cpp2
-rw-r--r--kicker/kicker/ui/removeextension_mnu.cpp2
-rw-r--r--kicker/kicker/ui/service_mnu.cpp38
-rw-r--r--kicker/libkicker/global.cpp14
-rw-r--r--kicker/libkicker/global.h4
-rw-r--r--kicker/libkicker/kickertip.cpp56
-rw-r--r--kicker/libkicker/kickertip.h6
-rw-r--r--kicker/libkicker/kshadowengine.cpp20
-rw-r--r--kicker/libkicker/kshadowengine.h4
-rw-r--r--kicker/libkicker/menuinfo.cpp2
-rw-r--r--kicker/libkicker/panelbutton.cpp28
-rw-r--r--kicker/libkicker/paneldrag.cpp10
-rw-r--r--kicker/libkicker/paneldrag.h4
-rw-r--r--kicker/libkicker/panner.cpp26
-rw-r--r--kicker/libkicker/panner.h4
-rw-r--r--kicker/libkicker/simplebutton.cpp16
-rw-r--r--kicker/libkicker/simplebutton.h6
-rw-r--r--kicker/menuext/kate/katesessionmenu.cpp4
-rw-r--r--kicker/menuext/kate/katesessionmenu.h2
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.cpp4
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp16
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.cpp8
-rw-r--r--kicker/menuext/remote/remotemenu.cpp4
-rw-r--r--kicker/menuext/system/systemmenu.cpp2
-rw-r--r--kicker/menuext/tom/README2
-rw-r--r--kicker/menuext/tom/TASKGROUPS2
-rw-r--r--kicker/menuext/tom/tom.cc22
-rw-r--r--kicker/proxy/appletproxy.cpp18
-rw-r--r--kicker/proxy/appletproxy.h2
-rw-r--r--kicker/proxy/extensionproxy.cpp12
-rw-r--r--kicker/rich-ideas.txt8
-rw-r--r--kicker/taskbar/taskbar.cpp68
-rw-r--r--kicker/taskbar/taskbar.h8
-rw-r--r--kicker/taskbar/taskbarcontainer.cpp30
-rw-r--r--kicker/taskbar/taskbarcontainer.h4
-rw-r--r--kicker/taskbar/taskcontainer.cpp36
-rw-r--r--kicker/taskbar/taskcontainer.h8
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp4
-rw-r--r--kicker/taskmanager/tasklmbmenu.h2
-rw-r--r--kicker/taskmanager/taskmanager.cpp32
-rw-r--r--kicker/taskmanager/taskmanager.h14
-rw-r--r--kicker/taskmanager/taskrmbmenu.cpp4
-rw-r--r--kioslave/DEBUG.howto2
-rw-r--r--kioslave/cgi/cgi.cpp2
-rw-r--r--kioslave/filter/filter.cc8
-rw-r--r--kioslave/finger/kio_finger.cpp2
-rw-r--r--kioslave/fish/COPYING6
-rw-r--r--kioslave/fish/INSTALL2
-rw-r--r--kioslave/fish/fish.cpp20
-rw-r--r--kioslave/fish/fish.protocol2
-rw-r--r--kioslave/fish/nxfish.protocol2
-rw-r--r--kioslave/home/homeimpl.cpp6
-rw-r--r--kioslave/home/kdedmodule/homedirnotify.cpp4
-rwxr-xr-xkioslave/info/kde-info2html6
-rw-r--r--kioslave/ldap/kio_ldap.cpp14
-rw-r--r--kioslave/mac/README2
-rw-r--r--kioslave/mac/kio_mac.cpp32
-rw-r--r--kioslave/mac/mac.protocol2
-rw-r--r--kioslave/man/kio_man.cpp38
-rw-r--r--kioslave/man/kmanpart.cpp4
-rw-r--r--kioslave/man/kmanpart.h2
-rw-r--r--kioslave/man/man2html.cpp70
-rw-r--r--kioslave/media/kcmodule/main.cpp4
-rw-r--r--kioslave/media/kcmodule/managermoduleview.ui6
-rw-r--r--kioslave/media/kcmodule/notifiermodule.cpp6
-rw-r--r--kioslave/media/kcmodule/notifiermoduleview.ui14
-rw-r--r--kioslave/media/kcmodule/serviceconfigdialog.cpp2
-rw-r--r--kioslave/media/kcmodule/serviceview.ui22
-rw-r--r--kioslave/media/libmediacommon/actionlistboxitem.cpp2
-rw-r--r--kioslave/media/libmediacommon/mediamanagersettings.kcfg2
-rw-r--r--kioslave/media/libmediacommon/notifieraction.cpp2
-rw-r--r--kioslave/media/libmediacommon/notifieropenaction.cpp2
-rw-r--r--kioslave/media/libmediacommon/notifierserviceaction.cpp4
-rw-r--r--kioslave/media/libmediacommon/notifiersettings.cpp10
-rw-r--r--kioslave/media/mediaimpl.cpp10
-rw-r--r--kioslave/media/mediamanager/fstabbackend.cpp22
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp42
-rw-r--r--kioslave/media/mediamanager/linuxcdpolling.cpp10
-rw-r--r--kioslave/media/mediamanager/medialist.cpp22
-rw-r--r--kioslave/media/mediamanager/removablebackend.cpp16
-rw-r--r--kioslave/media/medianotifier/medianotifier.cpp4
-rw-r--r--kioslave/media/medianotifier/notificationdialog.cpp2
-rw-r--r--kioslave/media/medianotifier/notificationdialogview.ui10
-rw-r--r--kioslave/media/mimetypes/floppy5_mounted.desktop2
-rw-r--r--kioslave/media/mimetypes/floppy5_unmounted.desktop2
-rw-r--r--kioslave/media/mimetypes/floppy_mounted.desktop2
-rw-r--r--kioslave/media/mimetypes/floppy_unmounted.desktop2
-rw-r--r--kioslave/media/mounthelper/decryptdialog.ui22
-rw-r--r--kioslave/media/propsdlgplugin/propertiespage.cpp46
-rw-r--r--kioslave/media/propsdlgplugin/propertiespagegui.ui18
-rw-r--r--kioslave/nfs/kio_nfs.cpp16
-rw-r--r--kioslave/nfs/mount.h2
-rw-r--r--kioslave/nfs/mount.x12
-rw-r--r--kioslave/nfs/mount_xdr.c10
-rw-r--r--kioslave/nfs/nfs_prot.x2
-rw-r--r--kioslave/nntp/nntp.cpp2
-rw-r--r--kioslave/pop3/pop3.cc20
-rw-r--r--kioslave/remote/kdedmodule/remotedirnotify.cpp2
-rw-r--r--kioslave/remote/remoteimpl.cpp2
-rw-r--r--kioslave/sftp/kio_sftp.cpp236
-rw-r--r--kioslave/sftp/kio_sftp.h12
-rw-r--r--kioslave/sftp/ksshprocess.cpp14
-rw-r--r--kioslave/sftp/ksshprocess.h4
-rw-r--r--kioslave/sftp/process.cpp4
-rw-r--r--kioslave/sftp/sftpfileattr.cpp24
-rw-r--r--kioslave/sftp/sftpfileattr.h12
-rw-r--r--kioslave/smb/kio_smb_browse.cpp8
-rw-r--r--kioslave/smb/kio_smb_file.cpp2
-rw-r--r--kioslave/smb/kio_smb_mount.cpp2
-rw-r--r--kioslave/smtp/capabilities.cc10
-rw-r--r--kioslave/smtp/capabilities.h6
-rw-r--r--kioslave/smtp/command.cc4
-rw-r--r--kioslave/smtp/compliance.txt12
-rw-r--r--kioslave/smtp/interactivesmtpserver.h8
-rw-r--r--kioslave/smtp/request.cc2
-rw-r--r--kioslave/smtp/response.h2
-rw-r--r--kioslave/smtp/smtp.cc2
-rw-r--r--kioslave/smtp/test_commands.cc14
-rw-r--r--kioslave/system/kdedmodule/systemdirnotify.cpp2
-rw-r--r--kioslave/system/systemimpl.cpp8
-rw-r--r--kioslave/tar/tar.cc14
-rw-r--r--kioslave/thumbnail/cursorcreator.cpp12
-rw-r--r--kioslave/thumbnail/exrcreator.cpp2
-rw-r--r--kioslave/thumbnail/htmlcreator.cpp6
-rw-r--r--kioslave/thumbnail/textcreator.cpp2
-rw-r--r--kioslave/thumbnail/thumbnail.cpp6
-rw-r--r--kioslave/trash/kio_trash.cpp10
-rw-r--r--kioslave/trash/testtrash.cpp18
-rw-r--r--kioslave/trash/trashimpl.cpp34
-rw-r--r--kioslave/trash/trashimpl.h2
-rw-r--r--klipper/applet.cpp2
-rw-r--r--klipper/configdialog.cpp12
-rw-r--r--klipper/configdialog.h8
-rw-r--r--klipper/historyitem.cpp2
-rw-r--r--klipper/historyurlitem.cpp2
-rw-r--r--klipper/klipperpopup.cpp2
-rw-r--r--klipper/klipperrc.desktop24
-rw-r--r--klipper/popupproxy.cpp4
-rw-r--r--klipper/toplevel.cpp20
-rw-r--r--klipper/urlgrabber.cpp2
-rw-r--r--kmenuedit/basictab.cpp26
-rw-r--r--kmenuedit/menufile.cpp24
-rw-r--r--kmenuedit/menufile.h4
-rw-r--r--kmenuedit/menuinfo.cpp6
-rw-r--r--kmenuedit/treeview.cpp54
-rw-r--r--kmenuedit/treeview.h10
-rw-r--r--knetattach/knetattach.ui26
-rw-r--r--knetattach/knetattach.ui.h8
-rw-r--r--konqueror/ChangeLog6
-rw-r--r--konqueror/DESIGN6
-rw-r--r--konqueror/IDEAS2
-rw-r--r--konqueror/KonquerorIface.cc18
-rw-r--r--konqueror/about/konq_aboutpage.cc28
-rw-r--r--konqueror/about/konq_aboutpage.h4
-rw-r--r--konqueror/about/launch.html2
-rw-r--r--konqueror/about/specs.html2
-rw-r--r--konqueror/client/kfmclient.cc58
-rw-r--r--konqueror/iconview/konq_iconview.cc28
-rw-r--r--konqueror/iconview/konq_iconview.h2
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp8
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.cpp4
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.h2
-rw-r--r--konqueror/keditbookmarks/commands.cpp6
-rw-r--r--konqueror/keditbookmarks/commands.h2
-rw-r--r--konqueror/keditbookmarks/dcop.cpp4
-rw-r--r--konqueror/keditbookmarks/favicons.cpp8
-rw-r--r--konqueror/keditbookmarks/importers.cpp12
-rw-r--r--konqueror/keditbookmarks/keditbookmarks.kcfg2
-rw-r--r--konqueror/keditbookmarks/listview.cpp26
-rw-r--r--konqueror/keditbookmarks/listview.h20
-rw-r--r--konqueror/keditbookmarks/main.cpp6
-rw-r--r--konqueror/keditbookmarks/testlink.cpp36
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp16
-rw-r--r--konqueror/keditbookmarks/toplevel.h2
-rw-r--r--konqueror/konq_actions.cc4
-rw-r--r--konqueror/konq_combo.cc28
-rw-r--r--konqueror/konq_extensionmanager.cc2
-rw-r--r--konqueror/konq_factory.cc14
-rw-r--r--konqueror/konq_factory.h2
-rw-r--r--konqueror/konq_frame.cc94
-rw-r--r--konqueror/konq_frame.h20
-rw-r--r--konqueror/konq_guiclients.cc8
-rw-r--r--konqueror/konq_main.cc6
-rw-r--r--konqueror/konq_mainwindow.cc160
-rw-r--r--konqueror/konq_mainwindow.h4
-rw-r--r--konqueror/konq_misc.cc4
-rw-r--r--konqueror/konq_profiledlg.cc4
-rw-r--r--konqueror/konq_tabs.cc8
-rw-r--r--konqueror/konq_view.cc16
-rw-r--r--konqueror/konq_view.h2
-rw-r--r--konqueror/konq_viewmgr.cc62
-rw-r--r--konqueror/konq_viewmgr.h8
-rw-r--r--konqueror/konqueror.kcfg2
-rw-r--r--konqueror/listview/konq_infolistviewitem.cc4
-rw-r--r--konqueror/listview/konq_infolistviewitem.h2
-rw-r--r--konqueror/listview/konq_infolistviewwidget.cc4
-rw-r--r--konqueror/listview/konq_infolistviewwidget.h2
-rw-r--r--konqueror/listview/konq_listview.cc14
-rw-r--r--konqueror/listview/konq_listview.h4
-rw-r--r--konqueror/listview/konq_listviewitems.cc16
-rw-r--r--konqueror/listview/konq_listviewitems.h2
-rw-r--r--konqueror/listview/konq_listviewwidget.cc38
-rw-r--r--konqueror/listview/konq_listviewwidget.h4
-rw-r--r--konqueror/listview/konq_textviewitem.cc4
-rw-r--r--konqueror/listview/konq_textviewitem.h2
-rw-r--r--konqueror/listview/konq_textviewwidget.cc4
-rw-r--r--konqueror/listview/konq_textviewwidget.h2
-rw-r--r--konqueror/listview/konq_treeviewwidget.cc6
-rw-r--r--konqueror/listview/konq_treeviewwidget.h2
-rw-r--r--konqueror/preloader/preloader.cc4
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp2
-rw-r--r--konqueror/shellcmdplugin/kshellcmddialog.cpp8
-rw-r--r--konqueror/sidebar/Makefile.am2
-rw-r--r--konqueror/sidebar/konqsidebar.cpp8
-rw-r--r--konqueror/sidebar/konqsidebar.h4
-rw-r--r--konqueror/sidebar/konqsidebarplugin.h2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp60
-rw-r--r--konqueror/sidebar/sidebar_widget.h4
-rw-r--r--konqueror/sidebar/test/Makefile.am2
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp6
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp8
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.h2
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp6
-rw-r--r--konqueror/sidebar/trees/history_module/history_dlg.ui12
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.cpp6
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.h2
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp8
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.cpp8
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp8
-rw-r--r--konqueror/sidebar/trees/init/home.desktop2
-rw-r--r--konqueror/sidebar/trees/init/system.desktop4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp26
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.h2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp2
-rw-r--r--konsole/COPYING6
-rw-r--r--konsole/ChangeLog12
-rw-r--r--konsole/README.fonts6
-rw-r--r--konsole/README.unicode24
-rw-r--r--konsole/doc/Konsole2.Requirements2
-rw-r--r--konsole/doc/More/Ansi_esc.txt2
-rw-r--r--konsole/doc/More/Eterm.ref6
-rw-r--r--konsole/doc/More/ansix364.txt6
-rw-r--r--konsole/doc/More/dec_vt100_codes.txt2
-rw-r--r--konsole/doc/More/rxvt-ref.html8
-rw-r--r--konsole/doc/More/swedish_vt102_codes.txt4
-rw-r--r--konsole/doc/More/villanova-vt100-esc-codes.txt4
-rw-r--r--konsole/doc/More/vt100_codes_news.txt18
-rw-r--r--konsole/doc/More/vt100_reference_card.txt4
-rw-r--r--konsole/doc/More/vt100_setup.txt2
-rw-r--r--konsole/doc/More/xterm.codes2
-rw-r--r--konsole/doc/VT100/Table.Codes26
-rw-r--r--konsole/doc/VT100/db.trans2
-rwxr-xr-xkonsole/doc/VT100/genDocument6
-rwxr-xr-xkonsole/doc/VT100/genTC.pl42
-rw-r--r--konsole/doc/VT100/techref.html40
-rw-r--r--konsole/eventsrc8
-rw-r--r--konsole/konsole/TEHistory.cpp6
-rw-r--r--konsole/konsole/TEPty.cpp2
-rw-r--r--konsole/konsole/TEScreen.cpp12
-rw-r--r--konsole/konsole/TEWidget.cpp102
-rw-r--r--konsole/konsole/TEWidget.h2
-rw-r--r--konsole/konsole/TEmuVt102.cpp48
-rw-r--r--konsole/konsole/TEmuVt102.h2
-rw-r--r--konsole/konsole/TEmulation.cpp8
-rw-r--r--konsole/konsole/fontembedder.cpp12
-rw-r--r--konsole/konsole/keytrans.cpp34
-rw-r--r--konsole/konsole/keytrans.h8
-rw-r--r--konsole/konsole/konsole.cpp58
-rw-r--r--konsole/konsole/konsole_part.cpp52
-rw-r--r--konsole/konsole/konsole_part.h6
-rw-r--r--konsole/konsole/konsole_wcwidth.cpp12
-rw-r--r--konsole/konsole/konsole_wcwidth.h4
-rw-r--r--konsole/konsole/konsolebookmarkmenu.cpp4
-rw-r--r--konsole/konsole/linefont.h2
-rw-r--r--konsole/konsole/main.cpp6
-rw-r--r--konsole/konsole/schema.cpp18
-rw-r--r--konsole/konsole/schema.h6
-rw-r--r--konsole/konsole/session.cpp14
-rw-r--r--konsole/konsole/session.h2
-rw-r--r--konsole/kwrited.desktop6
-rw-r--r--konsole/tests/esc.c2
-rw-r--r--konsole/tests/main.c38
-rw-r--r--konsole/tests/vttest.12
-rw-r--r--kpager/config.cpp14
-rw-r--r--kpager/config.h4
-rw-r--r--kpager/desktop.cpp28
-rw-r--r--kpager/desktop.h2
-rw-r--r--kpager/kpager.cpp88
-rw-r--r--kpager/kpager.h6
-rw-r--r--kpersonalizer/Makefile.am4
-rw-r--r--kpersonalizer/README6
-rw-r--r--kpersonalizer/kcountrypage.cpp30
-rw-r--r--kpersonalizer/kcountrypagedlg.ui16
-rw-r--r--kpersonalizer/keyecandypagedlg.ui16
-rw-r--r--kpersonalizer/kfindlanguage.cpp14
-rw-r--r--kpersonalizer/kospage.cpp8
-rw-r--r--kpersonalizer/kospagedlg.ui14
-rw-r--r--kpersonalizer/kpersonalizer.cpp12
-rw-r--r--kpersonalizer/krefinepagedlg.ui24
-rw-r--r--kpersonalizer/kstylepage.cpp4
-rw-r--r--kpersonalizer/kstylepagedlg.ui8
-rw-r--r--kpersonalizer/ksysinfo.cpp26
-rw-r--r--kpersonalizer/stylepreview.ui6
-rw-r--r--kreadconfig/kwriteconfig.cpp2
-rw-r--r--kscreensaver/ChangeLog6
-rw-r--r--kscreensaver/blankscrn.cpp2
-rw-r--r--kscreensaver/random.cpp4
-rw-r--r--ksmserver/README2
-rw-r--r--ksmserver/client.cpp8
-rw-r--r--ksmserver/legacy.cpp10
-rw-r--r--ksmserver/main.cpp4
-rw-r--r--ksmserver/server.cpp24
-rw-r--r--ksmserver/server.h2
-rw-r--r--ksmserver/shutdown.cpp4
-rw-r--r--ksmserver/shutdowndlg.cpp30
-rw-r--r--ksmserver/startup.cpp6
-rw-r--r--ksmserver/timed.ui32
-rw-r--r--ksplashml/kcmksplash/installer.cpp18
-rw-r--r--ksplashml/kcmksplash/main.cpp2
-rw-r--r--ksplashml/pics/themes/default/Theme.rc2
-rw-r--r--ksplashml/pics/themes/default/locolor/Theme.rc2
-rw-r--r--ksplashml/themeengine/default/themelegacy.cpp2
-rw-r--r--ksplashml/themeengine/objkstheme.cpp2
-rw-r--r--ksplashml/themeengine/redmond/previewredmond.cpp4
-rw-r--r--ksplashml/themeengine/redmond/previewredmond.h2
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.cpp6
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.h2
-rw-r--r--ksplashml/themeengine/standard/Preview.pngbin290011 -> 290009 bytes
-rw-r--r--ksplashml/themeengine/standard/themestandard.cpp24
-rw-r--r--ksplashml/themeengine/standard/themestandard.h8
-rw-r--r--ksplashml/themeengine/standard/wndicon.cpp22
-rw-r--r--ksplashml/themeengine/standard/wndicon.h6
-rw-r--r--ksplashml/themeengine/standard/wndstatus.cpp12
-rw-r--r--ksplashml/themeengine/standard/wndstatus.h6
-rw-r--r--ksplashml/themeengine/themeengine.cpp2
-rw-r--r--ksplashml/wndmain.h2
-rw-r--r--kstart/kstart.cpp30
-rw-r--r--ksysguard/Makefile.in.temp14
-rw-r--r--ksysguard/gui/KSGAppletSettings.cc2
-rw-r--r--ksysguard/gui/KSysGuardApplet.cc10
-rw-r--r--ksysguard/gui/KSysGuardApplet.h2
-rw-r--r--ksysguard/gui/SensorBrowser.cc4
-rw-r--r--ksysguard/gui/SensorDisplayLib/BarGraph.cc4
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBars.cc12
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBars.h2
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc10
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotter.cc10
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotter.h2
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc20
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListView.cc50
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListView.h6
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui12
-rw-r--r--ksysguard/gui/SensorDisplayLib/LogFile.cc12
-rw-r--r--ksysguard/gui/SensorDisplayLib/LogFileSettings.ui20
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeter.cc6
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui40
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessController.cc20
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessController.h2
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessList.cc12
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessList.h2
-rw-r--r--ksysguard/gui/SensorDisplayLib/ReniceDlg.cc4
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorDisplay.cc14
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLogger.cc34
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLogger.h4
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui14
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui12
-rw-r--r--ksysguard/gui/SensorDisplayLib/SignalPlotter.cc6
-rw-r--r--ksysguard/gui/WorkSheet.cc32
-rw-r--r--ksysguard/gui/WorkSheet.h14
-rw-r--r--ksysguard/gui/WorkSheetSettings.cc18
-rw-r--r--ksysguard/gui/Workspace.cc4
-rw-r--r--ksysguard/gui/ksgrd/HostConnector.cc16
-rw-r--r--ksysguard/gui/ksgrd/SensorClient.h4
-rw-r--r--ksysguard/gui/ksgrd/StyleSettings.cc30
-rw-r--r--ksysguard/gui/ksgrd/TimerSettings.cc8
-rw-r--r--ksysguard/gui/ksysguard.cc2
-rw-r--r--ksysguard/gui/ksysguard.h2
-rw-r--r--ksysguard/ksysguardd/FreeBSD/ProcessList.c2
-rw-r--r--ksysguard/ksysguardd/Irix/ProcessList.c2
-rw-r--r--ksysguard/ksysguardd/Linux/Memory.c2
-rw-r--r--ksysguard/ksysguardd/Linux/ProcessList.c4
-rw-r--r--ksysguard/ksysguardd/Linux/lmsensors.c2
-rw-r--r--ksysguard/ksysguardd/Linux/stat.c2
-rw-r--r--ksysguard/ksysguardd/NetBSD/ProcessList.c2
-rw-r--r--ksysguard/ksysguardd/Porting-HOWTO4
-rw-r--r--ksysguard/ksysguardd/Solaris/ProcessList.c2
-rw-r--r--ksysguard/ksysguardd/ksysguardd.c2
-rw-r--r--ksystraycmd/ksystraycmd.cpp10
-rw-r--r--ktip/ktipwindow.cpp2
-rw-r--r--kwin/COMPLIANCE10
-rw-r--r--kwin/HACKING10
-rw-r--r--kwin/activation.cpp18
-rw-r--r--kwin/bridge.cpp6
-rw-r--r--kwin/bridge.h2
-rw-r--r--kwin/client.cpp162
-rw-r--r--kwin/client.h58
-rw-r--r--kwin/clients/PORTING22
-rw-r--r--kwin/clients/b2/b2client.cpp128
-rw-r--r--kwin/clients/b2/b2client.h6
-rw-r--r--kwin/clients/b2/bitmaps.h8
-rw-r--r--kwin/clients/b2/config/config.cpp2
-rw-r--r--kwin/clients/b2/config/config.h2
-rw-r--r--kwin/clients/default/kdedefault.cpp60
-rw-r--r--kwin/clients/default/kdedefault.h2
-rw-r--r--kwin/clients/keramik/config/keramikconfig.ui6
-rw-r--r--kwin/clients/keramik/embedtool.cpp8
-rw-r--r--kwin/clients/keramik/keramik.cpp152
-rw-r--r--kwin/clients/keramik/keramik.h4
-rw-r--r--kwin/clients/kwmtheme/cli_installer/main.cpp16
-rw-r--r--kwin/clients/kwmtheme/kwmthemeclient.cpp100
-rw-r--r--kwin/clients/kwmtheme/kwmthemeclient.h6
-rw-r--r--kwin/clients/laptop/laptopclient.cpp56
-rw-r--r--kwin/clients/laptop/laptopclient.h2
-rw-r--r--kwin/clients/modernsystem/buttondata.h6
-rw-r--r--kwin/clients/modernsystem/config/config.cpp18
-rw-r--r--kwin/clients/modernsystem/modernsys.cpp64
-rw-r--r--kwin/clients/modernsystem/modernsys.h2
-rw-r--r--kwin/clients/plastik/config/configdialog.ui4
-rw-r--r--kwin/clients/plastik/misc.cpp10
-rw-r--r--kwin/clients/plastik/plastik.cpp6
-rw-r--r--kwin/clients/plastik/plastikbutton.cpp4
-rw-r--r--kwin/clients/plastik/plastikclient.cpp72
-rw-r--r--kwin/clients/plastik/plastikclient.h2
-rw-r--r--kwin/clients/quartz/config/config.cpp2
-rw-r--r--kwin/clients/quartz/config/config.h2
-rw-r--r--kwin/clients/quartz/quartz.cpp42
-rw-r--r--kwin/clients/quartz/quartz.h2
-rw-r--r--kwin/clients/redmond/redmond.cpp20
-rw-r--r--kwin/clients/redmond/redmond.h2
-rw-r--r--kwin/clients/test/test.cpp20
-rw-r--r--kwin/clients/test/test.h2
-rw-r--r--kwin/clients/web/Web.cpp92
-rw-r--r--kwin/clients/web/Web.h6
-rw-r--r--kwin/clients/web/WebButton.cpp28
-rw-r--r--kwin/clients/web/WebButton.h6
-rw-r--r--kwin/data/update_window_settings.cpp8
-rw-r--r--kwin/events.cpp66
-rw-r--r--kwin/geometry.cpp274
-rw-r--r--kwin/geometrytip.cpp14
-rw-r--r--kwin/geometrytip.h2
-rw-r--r--kwin/group.cpp34
-rw-r--r--kwin/kcmkwin/kwindecoration/buttons.cpp78
-rw-r--r--kwin/kcmkwin/kwindecoration/buttons.h2
-rw-r--r--kwin/kcmkwin/kwindecoration/kwindecoration.cpp18
-rw-r--r--kwin/kcmkwin/kwindecoration/kwindecoration.desktop38
-rw-r--r--kwin/kcmkwin/kwindecoration/preview.cpp24
-rw-r--r--kwin/kcmkwin/kwindecoration/preview.h4
-rw-r--r--kwin/kcmkwin/kwinoptions/ChangeLog6
-rw-r--r--kwin/kcmkwin/kwinoptions/main.cpp24
-rw-r--r--kwin/kcmkwin/kwinoptions/mouse.cpp78
-rw-r--r--kwin/kcmkwin/kwinoptions/windows.cpp32
-rw-r--r--kwin/kcmkwin/kwinoptions/windows.h2
-rw-r--r--kwin/kcmkwin/kwinrules/detectwidget.cpp4
-rw-r--r--kwin/kcmkwin/kwinrules/detectwidgetbase.ui8
-rw-r--r--kwin/kcmkwin/kwinrules/editshortcutbase.ui14
-rw-r--r--kwin/kcmkwin/kwinrules/kcm.cpp4
-rw-r--r--kwin/kcmkwin/kwinrules/kwinrules.desktop4
-rw-r--r--kwin/kcmkwin/kwinrules/main.cpp2
-rw-r--r--kwin/kcmkwin/kwinrules/ruleslistbase.ui8
-rw-r--r--kwin/kcmkwin/kwinrules/ruleswidget.cpp24
-rw-r--r--kwin/kcmkwin/kwinrules/ruleswidget.h4
-rw-r--r--kwin/kcmkwin/kwinrules/ruleswidgetbase.ui72
-rw-r--r--kwin/killer/killer.cpp2
-rw-r--r--kwin/kompmgr/kompmgr.c16
-rw-r--r--kwin/layers.cpp16
-rw-r--r--kwin/lib/kcommondecoration.cpp132
-rw-r--r--kwin/lib/kcommondecoration.h30
-rw-r--r--kwin/lib/kdecoration.cpp8
-rw-r--r--kwin/lib/kdecoration.h42
-rw-r--r--kwin/lib/kdecoration_p.h2
-rw-r--r--kwin/lib/kdecoration_plugins_p.cpp2
-rw-r--r--kwin/lib/kdecorationfactory.cpp2
-rw-r--r--kwin/lib/kdecorationfactory.h4
-rw-r--r--kwin/main.cpp8
-rw-r--r--kwin/manage.cpp22
-rw-r--r--kwin/options.cpp8
-rw-r--r--kwin/options.h2
-rw-r--r--kwin/placement.cpp68
-rw-r--r--kwin/popupinfo.cpp4
-rw-r--r--kwin/rules.cpp22
-rw-r--r--kwin/rules.h12
-rw-r--r--kwin/sm.cpp12
-rw-r--r--kwin/sm.h2
-rw-r--r--kwin/tabbox.cpp46
-rw-r--r--kwin/tools/decobenchmark/main.cpp4
-rw-r--r--kwin/tools/decobenchmark/preview.cpp16
-rw-r--r--kwin/tools/decobenchmark/preview.h2
-rw-r--r--kwin/tools/xreply/xreply.c4
-rw-r--r--kwin/useractions.cpp16
-rw-r--r--kwin/utils.cpp18
-rw-r--r--kwin/utils.h14
-rw-r--r--kwin/wm-spec/index.html2
-rw-r--r--kwin/wm-spec/x107.html20
-rw-r--r--kwin/wm-spec/x225.html6
-rw-r--r--kwin/wm-spec/x24.html6
-rw-r--r--kwin/wm-spec/x351.html4
-rw-r--r--kwin/wm-spec/x512.html2
-rw-r--r--kwin/workspace.cpp152
-rw-r--r--kwin/workspace.h6
-rw-r--r--kxkb/TODO10
-rw-r--r--kxkb/extension.cpp82
-rw-r--r--kxkb/extension.h10
-rw-r--r--kxkb/kcmlayout.cpp122
-rw-r--r--kxkb/kcmlayout.h2
-rw-r--r--kxkb/kcmlayoutwidget.ui52
-rw-r--r--kxkb/kcmmisc.cpp42
-rw-r--r--kxkb/kcmmiscwidget.ui6
-rw-r--r--kxkb/keyboard.desktop2
-rw-r--r--kxkb/keyboard_layout.desktop20
-rw-r--r--kxkb/kxkb.cpp120
-rw-r--r--kxkb/kxkb.desktop4
-rw-r--r--kxkb/kxkb.h10
-rw-r--r--kxkb/kxkbconfig.cpp130
-rw-r--r--kxkb/kxkbconfig.h26
-rw-r--r--kxkb/kxkbtraywindow.cpp22
-rw-r--r--kxkb/kxkbtraywindow.h10
-rw-r--r--kxkb/layoutmap.cpp54
-rw-r--r--kxkb/layoutmap.h16
-rw-r--r--kxkb/pixmap.cpp68
-rw-r--r--kxkb/pixmap.h2
-rw-r--r--kxkb/rules.cpp54
-rw-r--r--kxkb/rules.h14
-rw-r--r--kxkb/x11helper.cpp44
-rw-r--r--kxkb/x11helper.h10
-rw-r--r--l10n/README4
-rw-r--r--l10n/cd/entry.desktop26
-rw-r--r--libkonq/favicons/favicons.cpp4
-rw-r--r--libkonq/kfileivi.cc2
-rw-r--r--libkonq/kfileivi.h8
-rw-r--r--libkonq/kivdirectoryoverlay.cc6
-rw-r--r--libkonq/kivdirectoryoverlay.h2
-rw-r--r--libkonq/knewmenu.cc26
-rw-r--r--libkonq/knewmenu.h2
-rw-r--r--libkonq/konq_bgnddlg.cc14
-rw-r--r--libkonq/konq_dirpart.cc6
-rw-r--r--libkonq/konq_drag.cc16
-rw-r--r--libkonq/konq_drag.h6
-rw-r--r--libkonq/konq_filetip.cc12
-rw-r--r--libkonq/konq_historycomm.h6
-rw-r--r--libkonq/konq_historymgr.cc36
-rw-r--r--libkonq/konq_historymgr.h22
-rw-r--r--libkonq/konq_iconviewwidget.cc64
-rw-r--r--libkonq/konq_iconviewwidget.h4
-rw-r--r--libkonq/konq_operations.cc8
-rw-r--r--libkonq/konq_operations.h2
-rw-r--r--libkonq/konq_pixmapprovider.cc12
-rw-r--r--libkonq/konq_popupmenu.cc48
-rw-r--r--libkonq/konq_popupmenu.h10
-rw-r--r--libkonq/konq_propsview.cc20
-rw-r--r--libkonq/konq_propsview.h4
-rw-r--r--libkonq/konq_settings.cc4
-rw-r--r--libkonq/konq_undo.cc8
-rw-r--r--libkonq/konqbookmarkmanager.h2
-rw-r--r--nsplugins/NSPluginCallbackIface.h2
-rw-r--r--nsplugins/README2
-rw-r--r--nsplugins/nspluginloader.cpp10
-rw-r--r--nsplugins/nspluginloader.h2
-rw-r--r--nsplugins/plugin_part.cpp12
-rw-r--r--nsplugins/plugin_part.h4
-rw-r--r--nsplugins/pluginscan.cpp16
-rw-r--r--nsplugins/sdk/jni.h10
-rw-r--r--nsplugins/sdk/jni_md.h2
-rw-r--r--nsplugins/sdk/jri.h6
-rw-r--r--nsplugins/sdk/jri_md.h4
-rw-r--r--nsplugins/sdk/jritypes.h2
-rw-r--r--nsplugins/sdk/npapi.h10
-rw-r--r--nsplugins/sdk/npruntime.h6
-rw-r--r--nsplugins/sdk/npupp.h30
-rw-r--r--nsplugins/sdk/obsolete/protypes.h2
-rw-r--r--nsplugins/sdk/prcpucfg.h2
-rw-r--r--nsplugins/sdk/prtypes.h8
-rw-r--r--nsplugins/test/testnsplugin.cpp4
-rw-r--r--nsplugins/test/testnsplugin.h2
-rw-r--r--nsplugins/viewer/NSPluginClassIface.h12
-rw-r--r--nsplugins/viewer/kxt.cpp14
-rw-r--r--nsplugins/viewer/kxt.h2
-rw-r--r--nsplugins/viewer/nsplugin.cpp62
-rw-r--r--nsplugins/viewer/nsplugin.h14
-rw-r--r--nsplugins/viewer/qxteventloop.cpp40
-rw-r--r--nsplugins/wrapper/wrapper.c24
1248 files changed, 8583 insertions, 8583 deletions
diff --git a/applnk/kde-utilities-xutils.directory b/applnk/kde-utilities-xutils.directory
index 807cbafa..ca0e44ee 100644
--- a/applnk/kde-utilities-xutils.directory
+++ b/applnk/kde-utilities-xutils.directory
@@ -29,7 +29,7 @@ Name[gl]=Utilidades das X
Name[he]=כלי X
Name[hi]=एक्स-यूटिलिटीज़
Name[hr]=X-alati
-Name[hsb]=Potqmocniki za X
+Name[hsb]=Pomocniki za X
Name[hu]=X segédprogramok
Name[is]=X Tól
Name[it]=Programmi di X
@@ -112,7 +112,7 @@ Comment[gl]=Utilidades das X Window
Comment[he]=כלים של X Window
Comment[hi]=एक्स विंडो यूटिलिटीज़
Comment[hr]=Alati X prozora
-Comment[hsb]=Potqmocne programy za X11
+Comment[hsb]=Pomocne programy za X11
Comment[hu]=X Window segédprogramok
Comment[is]=X gluggatól
Comment[it]=Programmi di X Window
diff --git a/applnk/kde-utilities.directory b/applnk/kde-utilities.directory
index ce2821ec..edb9d875 100644
--- a/applnk/kde-utilities.directory
+++ b/applnk/kde-utilities.directory
@@ -31,7 +31,7 @@ Name[gl]=Utilidades
Name[he]=כלים
Name[hi]=यूटिलिटीज़
Name[hr]=Alati
-Name[hsb]=Potqmocniki
+Name[hsb]=Pomocniki
Name[hu]=Segédprogramok
Name[is]=Nytjatól
Name[it]=Accessori
@@ -115,7 +115,7 @@ Comment[gl]=Utilidades
Comment[he]=כלים
Comment[hi]=यूटिलिटीज़
Comment[hr]=Alati
-Comment[hsb]=Potqmocne programy
+Comment[hsb]=Pomocne programy
Comment[hu]=Segédprogramok
Comment[is]=Ýmis nytsamleg áhöld
Comment[it]=Accessori
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index f2f4688f..c60d6a41 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -137,7 +137,7 @@ bool BackTrace::usefulBacktrace()
{
// remove crap
if( !m_krashconf->removeFromBacktraceRegExp().isEmpty())
- m_strBt.tqreplace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);
+ m_strBt.replace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);
if( m_krashconf->disableChecks())
return true;
@@ -146,13 +146,13 @@ bool BackTrace::usefulBacktrace()
// how many " ?? " in the bt ?
int unknown = 0;
if( !m_krashconf->invalidStackFrameRegExp().isEmpty())
- unknown = strBt.tqcontains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
+ unknown = strBt.contains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
// how many stack frames in the bt ?
int frames = 0;
if( !m_krashconf->frameRegExp().isEmpty())
- frames = strBt.tqcontains( TQRegExp( m_krashconf->frameRegExp()));
+ frames = strBt.contains( TQRegExp( m_krashconf->frameRegExp()));
else
- frames = strBt.tqcontains('\n');
+ frames = strBt.contains('\n');
bool tooShort = false;
if( !m_krashconf->neededInValidBacktraceRegExp().isEmpty())
tooShort = ( strBt.find( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 );
@@ -175,7 +175,7 @@ void BackTrace::processBacktrace()
--len;
}
m_strBt.remove( pos, len );
- m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" ));
+ m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" ));
}
}
}
diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h
index 70c3a099..b6779f3e 100644
--- a/drkonqi/backtrace.h
+++ b/drkonqi/backtrace.h
@@ -49,7 +49,7 @@ signals:
void append(const TQString &str); // Just the new text
void someError();
- void done(const TQString &); // tqreplaces whole text
+ void done(const TQString &); // replaces whole text
protected slots:
void slotProcessExited(KProcess * proc);
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index b54a0f9b..c6b073e4 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -60,9 +60,9 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
TQWidget *w = new TQWidget( this );
( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true );
m_status = new TQLabel( w );
- m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+ m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
//m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
- KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) );
+ KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) );
m_copyButton = new KPushButton( item, w );
connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
m_copyButton->setEnabled( false );
@@ -82,7 +82,7 @@ void KrashDebugger :: slotDone(const TQString& str)
m_status->setText(i18n("Done."));
m_copyButton->setEnabled( true );
m_saveButton->setEnabled( true );
- m_backtrace->setText( m_prependText + str ); // tqreplace with possibly post-processed backtrace
+ m_backtrace->setText( m_prependText + str ); // replace with possibly post-processed backtrace
}
void KrashDebugger :: slotCopy()
@@ -109,8 +109,8 @@ void KrashDebugger :: slotSave()
}
else
{
- TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" );
- if( defname.tqcontains( '/' ))
+ TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
+ if( defname.contains( '/' ))
defname = defname.mid( defname.findRev( '/' ) + 1 );
TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
if (!filename.isEmpty())
@@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger()
bool KrashDebugger::performChecks( TQString* msg )
{
bool ret = true;
- KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true );
+ KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
kdedcfg.setGroup( "General" );
if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
{
diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp
index ae22606f..4faccc95 100644
--- a/drkonqi/krashconf.cpp
+++ b/drkonqi/krashconf.cpp
@@ -93,12 +93,12 @@ void KrashConfig :: readConfig()
// maybe we should check if it's relative?
TQString configname = config->readEntry("ConfigName",
- TQString::tqfromLatin1("enduser"));
+ TQString::fromLatin1("enduser"));
TQString debuggername = config->readEntry("Debugger",
- TQString::tqfromLatin1("gdb"));
+ TQString::fromLatin1("gdb"));
- KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername),
+ KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
true, false, "appdata");
debuggers.setGroup("General");
@@ -112,7 +112,7 @@ void KrashConfig :: readConfig()
m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");
- KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname),
+ KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
true, false, "appdata");
preset.setGroup("ErrorDescription");
@@ -138,24 +138,24 @@ void KrashConfig :: readConfig()
TQString str = TQString::number(m_signalnum);
// use group unknown if signal not found
if (!preset.hasGroup(str))
- str = TQString::tqfromLatin1("unknown");
+ str = TQString::fromLatin1("unknown");
preset.setGroup(str);
m_signalName = preset.readEntry("Name");
if (b)
m_signalText = preset.readEntry("Comment");
}
-// tqreplace some of the strings
+// replace some of the strings
void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const
{
TQMap<TQString,TQString> map;
- map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName());
- map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("kdeinit") : m_execname;
- map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber());
- map[TQString::tqfromLatin1("signame")] = signalName();
- map[TQString::tqfromLatin1("progname")] = programName();
- map[TQString::tqfromLatin1("pid")] = TQString::number(pid());
- map[TQString::tqfromLatin1("tempfile")] = tempFile;
+ map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName());
+ map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("kdeinit") : m_execname;
+ map[TQString::fromLatin1("signum")] = TQString::number(signalNumber());
+ map[TQString::fromLatin1("signame")] = signalName();
+ map[TQString::fromLatin1("progname")] = programName();
+ map[TQString::fromLatin1("pid")] = TQString::number(pid());
+ map[TQString::fromLatin1("tempfile")] = tempFile;
if (shell)
str = KMacroExpander::expandMacrosShellQuote( str, map );
else
diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp
index ff18d248..488edaeb 100644
--- a/drkonqi/toplevel.cpp
+++ b/drkonqi/toplevel.cpp
@@ -67,12 +67,12 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name)
// picture of konqi
TQLabel *lab = new TQLabel(page);
lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
- TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png")));
+ TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png")));
lab->setPixmap(pix);
- lab->setFixedSize( lab->tqsizeHint() );
+ lab->setFixedSize( lab->sizeHint() );
TQLabel * info = new TQLabel(generateText(), page);
- info->setMinimumSize(info->tqsizeHint());
+ info->setMinimumSize(info->sizeHint());
if (m_krashconf->showBacktrace())
{
@@ -196,7 +196,7 @@ void Toplevel :: slotUser3()
void Toplevel :: slotBacktraceDone(const TQString &str)
{
// Do not translate.. This will be included in the _MAIL_.
- TQString buf = TQString::tqfromLatin1
+ TQString buf = TQString::fromLatin1
("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str;
m_bugreport->setText(buf);
diff --git a/kappfinder/README.apps b/kappfinder/README.apps
index f293582c..b0010b47 100644
--- a/kappfinder/README.apps
+++ b/kappfinder/README.apps
@@ -1,4 +1,4 @@
-The apps directory tqcontains .desktop files for commonly used non-KDE
+The apps directory contains .desktop files for commonly used non-KDE
programs which kappfinder installs into the applnk directory of KDE.
kappfinder used to install .directory files as well because in the past the
diff --git a/kappfinder/apps/Games/Toys/xpinguin.desktop b/kappfinder/apps/Games/Toys/xpinguin.desktop
index 175a4733..057b3a37 100644
--- a/kappfinder/apps/Games/Toys/xpinguin.desktop
+++ b/kappfinder/apps/Games/Toys/xpinguin.desktop
@@ -18,26 +18,26 @@ GenericName[az]=Linuks Maskotu
GenericName[be]=Талісман Linux
GenericName[bg]=Талисманът на Linux
GenericName[bn]=লিনাক্স ম্যাস্কট
-GenericName[bs]=Linux tqmaskota
+GenericName[bs]=Linux maskota
GenericName[ca]=Mascota de Linux
GenericName[cs]=Maskot Linuxu
GenericName[csb]=Glingòtka Linuksa
GenericName[cy]=Masgot Linux
-GenericName[da]=Linux-tqmaskot
+GenericName[da]=Linux-maskot
GenericName[de]=Linux-Maskottchen
GenericName[el]=Η μασκότ του Linux
GenericName[eo]=La linuksa simbolbesto
GenericName[es]=Mascota de Linux
-GenericName[et]=Linuxi tqmaskott
-GenericName[eu]=Linuxen tqmaskota
-GenericName[fi]=Linux-tqmaskotti
+GenericName[et]=Linuxi maskott
+GenericName[eu]=Linuxen maskota
+GenericName[fi]=Linux-maskotti
GenericName[fr]=La mascotte de Linux
-GenericName[fy]=Linux-tqmaskotte
+GenericName[fy]=Linux-maskotte
GenericName[ga]=Sonóg Linux
GenericName[gl]=Mascota Linux
GenericName[he]=הקמע של לינוקס
GenericName[hi]=लिनक्स शुभंकर
-GenericName[hr]=Linux tqmaskota
+GenericName[hr]=Linux maskota
GenericName[hu]=Linux-kabalaállatka
GenericName[is]=Linux lukkudýrið
GenericName[it]=Mascotte di Linux
@@ -51,11 +51,11 @@ GenericName[mk]=Маскотата на Линукс
GenericName[mn]=Линукс-азын тэнгэр
GenericName[ms]=Maskot Linux
GenericName[mt]=Maskott tal-Linux
-GenericName[nb]=Linux-tqmaskot
+GenericName[nb]=Linux-maskot
GenericName[nds]=Dat Maskottje vun Linux
GenericName[ne]=लिनक्स मासकोट
GenericName[nl]=Linux-mascotte
-GenericName[nn]=Linux-tqmaskot
+GenericName[nn]=Linux-maskot
GenericName[nso]=Mascot wa Linux
GenericName[pa]=ਲੀਨਕਸ ਮਾਸਕੋਟ
GenericName[pl]=Maskotka Linuksa
@@ -66,8 +66,8 @@ GenericName[ru]=Эмблема Linux
GenericName[sk]=Maskot Linuxu
GenericName[sl]=Maskota Linuxa
GenericName[sr]=Linux-ова маскота
-GenericName[sr@Latn]=Linux-ova tqmaskota
-GenericName[sv]=Linux-tqmaskot
+GenericName[sr@Latn]=Linux-ova maskota
+GenericName[sv]=Linux-maskot
GenericName[ta]=Linux சின்னம்
GenericName[te]=లినక్స్ మాస్కాట్
GenericName[tg]=Таъвизи Linux
diff --git a/kappfinder/apps/Utilities/Editors/emacs.desktop b/kappfinder/apps/Utilities/Editors/emacs.desktop
index b84918ae..6b8d315f 100644
--- a/kappfinder/apps/Utilities/Editors/emacs.desktop
+++ b/kappfinder/apps/Utilities/Editors/emacs.desktop
@@ -86,7 +86,7 @@ GenericName[xh]=Umhleli Wombhalo
GenericName[zh_CN]=文本编辑器
GenericName[zh_TW]=文字編輯器
GenericName[zu]=Umlungisi wombhalo
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
Exec=emacs %f
Icon=emacs
Path=
diff --git a/kappfinder/apps/Utilities/Editors/gvim.desktop b/kappfinder/apps/Utilities/Editors/gvim.desktop
index d23f4053..f2b69434 100644
--- a/kappfinder/apps/Utilities/Editors/gvim.desktop
+++ b/kappfinder/apps/Utilities/Editors/gvim.desktop
@@ -115,7 +115,7 @@ GenericName[xh]=Umhleli Wombhalo
GenericName[zh_CN]=文本编辑器
GenericName[zh_TW]=文字編輯器
GenericName[zu]=Umlungisi wombhalo
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
Exec=gvim -f %f
Icon=gvim
Type=Application
diff --git a/kappfinder/apps/Utilities/Editors/lemacs.desktop b/kappfinder/apps/Utilities/Editors/lemacs.desktop
index 203c056a..fb8f0b62 100644
--- a/kappfinder/apps/Utilities/Editors/lemacs.desktop
+++ b/kappfinder/apps/Utilities/Editors/lemacs.desktop
@@ -90,7 +90,7 @@ GenericName[xh]=Umhleli Wombhalo
GenericName[zh_CN]=文本编辑器
GenericName[zh_TW]=文字編輯器
GenericName[zu]=Umlungisi wombhalo
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
Exec=lemacs %f
Icon=emacs
Path=
diff --git a/kappfinder/apps/Utilities/Editors/nedit.desktop b/kappfinder/apps/Utilities/Editors/nedit.desktop
index 99364eb5..998d3d11 100644
--- a/kappfinder/apps/Utilities/Editors/nedit.desktop
+++ b/kappfinder/apps/Utilities/Editors/nedit.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
Name=Nedit
Name[hi]=नेडिट
Name[ka]=NEdit
diff --git a/kappfinder/apps/Utilities/Editors/xemacs.desktop b/kappfinder/apps/Utilities/Editors/xemacs.desktop
index 7c1b5772..46b773bd 100644
--- a/kappfinder/apps/Utilities/Editors/xemacs.desktop
+++ b/kappfinder/apps/Utilities/Editors/xemacs.desktop
@@ -95,7 +95,7 @@ GenericName[xh]=Umhleli Wombhalo
GenericName[zh_CN]=文本编辑器
GenericName[zh_TW]=文字編輯器
GenericName[zu]=Umlungisi wombhalo
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
Exec=xemacs %f
Icon=emacs
Type=Application
diff --git a/kappfinder/apps/Utilities/calctool.desktop b/kappfinder/apps/Utilities/calctool.desktop
index 2a03a086..af82e0e2 100644
--- a/kappfinder/apps/Utilities/calctool.desktop
+++ b/kappfinder/apps/Utilities/calctool.desktop
@@ -37,7 +37,7 @@ GenericName[ca]=Calculadora
GenericName[cs]=Kalkulátor
GenericName[csb]=Kalkùlator
GenericName[cy]=Cyfrifiannell
-GenericName[da]=Regnetqmaskine
+GenericName[da]=Regnemaskine
GenericName[de]=Rechner
GenericName[el]=Αριθμομηχανή
GenericName[eo]=Kalkulilo
@@ -46,7 +46,7 @@ GenericName[et]=Kalkulaator
GenericName[eu]=Kalkulagailua
GenericName[fa]=ماشین حساب
GenericName[fi]=Laskin
-GenericName[fo]=Roknitqmaskina
+GenericName[fo]=Roknimaskina
GenericName[fr]=Calculatrice
GenericName[fy]=Rekkenmasine
GenericName[ga]=Áireamhán
diff --git a/kappfinder/apps/Utilities/xutils/xcalc.desktop b/kappfinder/apps/Utilities/xutils/xcalc.desktop
index fddb8f86..6dc3c495 100644
--- a/kappfinder/apps/Utilities/xutils/xcalc.desktop
+++ b/kappfinder/apps/Utilities/xutils/xcalc.desktop
@@ -50,7 +50,7 @@ GenericName[ca]=Calculadora
GenericName[cs]=Kalkulátor
GenericName[csb]=Kalkùlator
GenericName[cy]=Cyfrifiannell
-GenericName[da]=Regnetqmaskine
+GenericName[da]=Regnemaskine
GenericName[de]=Rechner
GenericName[el]=Αριθμομηχανή
GenericName[eo]=Kalkulilo
@@ -59,7 +59,7 @@ GenericName[et]=Kalkulaator
GenericName[eu]=Kalkulagailua
GenericName[fa]=ماشین حساب
GenericName[fi]=Laskin
-GenericName[fo]=Roknitqmaskina
+GenericName[fo]=Roknimaskina
GenericName[fr]=Calculatrice
GenericName[fy]=Rekkenmasine
GenericName[ga]=Áireamhán
diff --git a/kappfinder/apps/Utilities/xutils/xload.desktop b/kappfinder/apps/Utilities/xutils/xload.desktop
index be21fdcc..a6dd72a0 100644
--- a/kappfinder/apps/Utilities/xutils/xload.desktop
+++ b/kappfinder/apps/Utilities/xutils/xload.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=xload
-SwallowExec=xload -nolabel -fg green -bg Black -hl red -update 3 -tqgeometry 25x25
+SwallowExec=xload -nolabel -fg green -bg Black -hl red -update 3 -geometry 25x25
SwallowTitle=xload
SwallowTitle[no]=xload
SwallowTitle[es]=xload
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index 121b05c4..660c5b49 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -48,16 +48,16 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
: KDialog( parent, name, true )
{
setCaption( i18n( "KAppfinder" ) );
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this, marginHint() );
+ TQVBoxLayout *layout = new TQVBoxLayout( this, marginHint() );
TQLabel *label = new TQLabel( i18n( "The application finder looks for non-KDE "
"applications on your system and adds "
"them to the KDE menu system. "
"Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this);
- label->tqsetAlignment( AlignAuto | WordBreak );
- tqlayout->addWidget( label );
+ label->setAlignment( AlignAuto | WordBreak );
+ layout->addWidget( label );
- tqlayout->addSpacing( 5 );
+ layout->addSpacing( 5 );
mListView = new TQListView( this );
mListView->addColumn( i18n( "Application" ) );
@@ -67,14 +67,14 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
mListView->setRootIsDecorated( true );
mListView->setAllColumnsShowFocus( true );
mListView->setSelectionMode(TQListView::NoSelection);
- tqlayout->addWidget( mListView );
+ layout->addWidget( mListView );
mProgress = new KProgress( this );
mProgress->setPercentageVisible( false );
- tqlayout->addWidget( mProgress );
+ layout->addWidget( mProgress );
mSummary = new TQLabel( i18n( "Summary:" ), this );
- tqlayout->addWidget( mSummary );
+ layout->addWidget( mSummary );
KButtonBox* bbox = new KButtonBox( this );
mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), this, TQT_SLOT( slotScan() ) );
@@ -89,9 +89,9 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) );
mApplyButton->setEnabled( false );
bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) );
- bbox->tqlayout();
+ bbox->layout();
- tqlayout->addWidget( bbox );
+ layout->addWidget( bbox );
connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) );
@@ -100,7 +100,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
adjustSize();
mDestDir = destDir;
- mDestDir = mDestDir.tqreplace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
+ mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
KStartupInfo::appStarted();
diff --git a/kate/COPYING.LIB b/kate/COPYING.LIB
index 61359d11..789c31ee 100644
--- a/kate/COPYING.LIB
+++ b/kate/COPYING.LIB
@@ -94,7 +94,7 @@ will lead to faster development of free libraries.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
-former tqcontains code derived from the library, while the latter only
+former contains code derived from the library, while the latter only
works together with the library.
Note that it is possible for a library to be covered by the ordinary
@@ -104,7 +104,7 @@ General Public License rather than by this special one.
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library which
-tqcontains a notice placed by the copyright holder or other authorized
+contains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License"). Each licensee is
addressed as "you".
@@ -123,7 +123,7 @@ included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
-all the source code for all modules it tqcontains, plus any associated
+all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
@@ -225,7 +225,7 @@ source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
- 5. A program that tqcontains no derivative of any portion of the
+ 5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
@@ -233,7 +233,7 @@ therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
-tqcontains portions of the Library), rather than a "work that uses the
+contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
@@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
-structure tqlayouts and accessors, and small macros and small inline
+structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
diff --git a/kate/ChangeLog b/kate/ChangeLog
index d3ca5da3..68dc0da0 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -1,5 +1,5 @@
2004-04-22 Christoph Cullmann <cullmann@kde.org>
- * kate switched over to katemdi, even smaller tqreplacement for kmdi2 :)
+ * kate switched over to katemdi, even smaller replacement for kmdi2 :)
2004-10-06 Christoph Cullmann <cullmann@kde.org>
* kate switched over to kmdi2, a slim version of old kmdi
@@ -133,7 +133,7 @@
* now the pluginconfig pages work ;)
2001-04-24 Joseph Wenninger <jowenn@kde.org>
- * now <keywords> and <types> is tqreplaced by <list name="XXXX">
+ * now <keywords> and <types> is replaced by <list name="XXXX">
2001-04-20 Christoph Cullmann <cullmann@kde.org>
* new configdialog
@@ -268,7 +268,7 @@
* Filter - select text, hit <Ctrl+Backslash>, and enter an OS command.
we pipe the selected text thru that command, such as "sort", and then
- tqreplace the selection with the result. Impress your friends.
+ replace the selection with the result. Impress your friends.
2001-02-21 Joseph Wenninger <jowenn@kde.org>
* Makefile.am's : correction for linking
diff --git a/kate/README b/kate/README
index f1a42b24..67eb04be 100644
--- a/kate/README
+++ b/kate/README
@@ -2,7 +2,7 @@
Kate is a fast texteditor for the KDE destop with an Emacs-style document interface.
I hope it works well and improves workspeed on many little textfiles. ;-)
Our new buffer managment will allow it to open 50MB files ++ in less than 5 seconds
-(at least on my 400Mhz P2 ;) It is thought as a more powerful tqreplacement for the old
+(at least on my 400Mhz P2 ;) It is thought as a more powerful replacement for the old
KWrite app, which will still keep alive for the existing userbase and because it is
just a lot smaller and therefor faster on launch than kate.
For Kate Plugins, Kate provides the Kate Interfaces, which allow deeper access
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 084b6f31..70c81d46 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -127,7 +127,7 @@ Kate::Application *KateApp::application ()
/**
* Has always been the Kate Versioning Scheme:
- * KDE X.Y.Z tqcontains Kate X-1.Y.Z
+ * KDE X.Y.Z contains Kate X-1.Y.Z
*/
TQString KateApp::kateVersion (bool fullVersion)
{
@@ -396,4 +396,4 @@ KateMainWindow *KateApp::mainWindow (uint n)
return 0;
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateappIface.cpp b/kate/app/kateappIface.cpp
index eb8b58a4..259e48b8 100644
--- a/kate/app/kateappIface.cpp
+++ b/kate/app/kateappIface.cpp
@@ -101,4 +101,4 @@ const TQString & KateAppDCOPIface::session() const
return m_app->sessionManager()->activeSession()->sessionName();
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 370abe97..47a7de19 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -334,7 +334,7 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin)
{
if ( pluginPages.at(i)->plugin == plugin )
{
- TQWidget *w = pluginPages.at(i)->page->tqparentWidget();
+ TQWidget *w = pluginPages.at(i)->page->parentWidget();
delete pluginPages.at(i)->page;
delete w;
pluginPages.remove(pluginPages.at(i));
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index b599ab20..a160162d 100644
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@@ -57,8 +57,8 @@ void KateConsole::loadConsoleIfNeeded()
{
if (m_part) return;
- if (!tqtopLevelWidget() || !tqparentWidget()) return;
- if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;
+ if (!topLevelWidget() || !parentWidget()) return;
+ if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return;
KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
@@ -86,7 +86,7 @@ void KateConsole::slotDestroyed ()
m_part = 0;
// hide the dockwidget
- if (tqparentWidget())
+ if (parentWidget())
{
m_mw->hideToolView (m_toolView);
m_mw->centralWidget()->setFocus ();
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index a8a13ab9..f60c0978 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -86,7 +86,7 @@ KateDocManager::~KateDocManager ()
{
m_metaInfos->setGroup(*it);
TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def);
- if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos)
+ if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos)
m_metaInfos->deleteGroup(*it);
}
delete def;
@@ -306,7 +306,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL)
KateApp::self()->mainWindow(i)->viewManager()->closeViews(documentNumber);
}
- if ( closeURL && m_tempFiles.tqcontains( documentNumber ) )
+ if ( closeURL && m_tempFiles.contains( documentNumber ) )
{
TQFileInfo fi( m_tempFiles[ documentNumber ].first.path() );
if ( fi.lastModified() <= m_tempFiles[ documentNumber ].second /*||
@@ -583,7 +583,7 @@ void KateDocManager::saveMetaInfos(Kate::Document *doc)
m_metaInfos->setGroup(doc->url().prettyURL());
doc->writeSessionConfig(m_metaInfos);
m_metaInfos->writeEntry("MD5", (const char *)md5);
- m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime());
+ m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime());
m_metaInfos->sync();
}
}
@@ -608,4 +608,4 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result)
return true;
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h
index 56f006ea..b35d0a65 100644
--- a/kate/app/katedocmanager.h
+++ b/kate/app/katedocmanager.h
@@ -154,4 +154,4 @@ class KateDocManager : public QObject
};
#endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index a3482f2b..6680e26a 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -127,7 +127,7 @@ bool KateExternalTool::checkExec()
bool KateExternalTool::valid( const TQString &mt ) const
{
- return mimetypes.isEmpty() || mimetypes.tqcontains( mt );
+ return mimetypes.isEmpty() || mimetypes.contains( mt );
}
//END KateExternalTool
@@ -191,7 +191,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
return false;
}
- KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
+ KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
if (!dmw) {
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
return false;
@@ -330,8 +330,8 @@ void KateExternalToolsMenuAction::reload()
bool sepadded = false;
for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg )
{
- if ( ! tools.tqcontains( *itg ) &&
- ! removed.tqcontains( *itg ) )
+ if ( ! tools.contains( *itg ) &&
+ ! removed.contains( *itg ) )
{
if ( ! sepadded )
{
@@ -394,7 +394,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
if ( action )
{
l = action->tool->mimetypes;
- b = ( ! l.count() || l.tqcontains( mt ) );
+ b = ( ! l.count() || l.contains( mt ) );
action->setEnabled( b );
}
}
@@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leName = new TQLineEdit( w );
lo->addWidget( leName, 1, 2 );
l = new TQLabel( leName, i18n("&Label:"), w );
- l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+ l->setAlignment( l->alignment()|Qt::AlignRight );
lo->addWidget( l, 1, 1 );
if ( tool ) leName->setText( tool->name );
TQWhatsThis::add( leName, i18n(
@@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
teCommand = new TQTextEdit( w );
lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
l = new TQLabel( teCommand, i18n("S&cript:"), w );
- l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight );
+ l->setAlignment( Qt::AlignTop|Qt::AlignRight );
lo->addWidget( l, 2, 1 );
if ( tool ) teCommand->setText( tool->command );
TQWhatsThis::add( teCommand, i18n(
@@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leExecutable = new TQLineEdit( w );
lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
l = new TQLabel( leExecutable, i18n("&Executable:"), w );
- l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+ l->setAlignment( l->alignment()|Qt::AlignRight );
lo->addWidget( l, 3, 1 );
if ( tool ) leExecutable->setText( tool->tryexec );
TQWhatsThis::add( leExecutable, i18n(
@@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leMimetypes = new TQLineEdit( w );
lo->addWidget( leMimetypes, 4, 2 );
l = new TQLabel( leMimetypes, i18n("&Mime types:"), w );
- l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+ l->setAlignment( l->alignment()|Qt::AlignRight );
lo->addWidget( l, 4, 1 );
if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
TQWhatsThis::add( leMimetypes, i18n(
@@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
cmbSave = new TQComboBox(w);
lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
l = new TQLabel( cmbSave, i18n("&Save:"), w );
- l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+ l->setAlignment( l->alignment()|Qt::AlignRight );
lo->addWidget( l, 5, 1 );
TQStringList sl;
sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
@@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leCmdLine = new TQLineEdit( w );
lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
l = new TQLabel( leCmdLine, i18n("&Command line name:"), w );
- l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+ l->setAlignment( l->alignment()|Qt::AlignRight );
lo->addWidget( l, 6, 1 );
if ( tool ) leCmdLine->setText( tool->cmdname );
TQWhatsThis::add( leCmdLine, i18n(
@@ -745,7 +745,7 @@ void KateExternalToolsConfigWidget::slotNew()
// This is sticky, it does not change again, so that shortcuts sticks
// TODO check for dups
- t->acname = "externaltool_" + TQString(t->name).tqreplace( TQRegExp("\\W+"), "" );
+ t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" );
new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t );
@@ -870,4 +870,4 @@ void KateExternalToolsConfigWidget::slotMoveDown()
m_changed = true;
}
//END KateExternalToolsConfigWidget
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h
index 71cc5eaf..507e1cfc 100644
--- a/kate/app/kateexternaltools.h
+++ b/kate/app/kateexternaltools.h
@@ -76,7 +76,7 @@ class KateExternalToolsMenuAction : public KActionMenu
};
/**
- * This Action tqcontains a KateExternalTool
+ * This Action contains a KateExternalTool
*/
class KateExternalToolAction : public KAction, public KWordMacroExpander
{
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index 343f66a9..47c8aa75 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -69,7 +69,7 @@ class ToolTip : public QToolTip
KateFileListItem *item = ((KateFileListItem*)i);
if ( ! item ) return;
- tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) );
+ tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) );
}
@@ -273,11 +273,11 @@ void KateFileList::slotModChanged (Kate::Document *doc)
for ( uint i=0; i < m_editHistory.count(); i++ )
{
m_editHistory.at( i )->setEditHistPos( i+1 );
- tqrepaintItem( m_editHistory.at( i ) );
+ repaintItem( m_editHistory.at( i ) );
}
}
else
- tqrepaintItem( item );
+ repaintItem( item );
}
void KateFileList::slotModifiedOnDisc (Kate::Document *doc, bool, unsigned char)
@@ -296,7 +296,7 @@ void KateFileList::slotNameChanged (Kate::Document *doc)
if ( ((KateFileListItem*)item)->document() == doc )
{
item->setText( 0, doc->docName() );
- tqrepaintItem( item );
+ repaintItem( item );
break;
}
item = item->nextSibling();
@@ -334,7 +334,7 @@ void KateFileList::slotViewChanged ()
// int p = 0;
// if ( m_viewHistory.count() )
// {
-// int p = m_viewHistory.findRef( item ); // only tqrepaint items that needs it
+// int p = m_viewHistory.findRef( item ); // only repaint items that needs it
// }
m_viewHistory.removeRef( item );
@@ -343,7 +343,7 @@ void KateFileList::slotViewChanged ()
for ( uint i=0; i < m_viewHistory.count(); i++ )
{
m_viewHistory.at( i )->setViewHistPos( i+1 );
- tqrepaintItem( m_viewHistory.at( i ) );
+ repaintItem( m_viewHistory.at( i ) );
}
}
@@ -475,7 +475,7 @@ void KateFileListItem::paintCell( TQPainter *painter, const TQColorGroup & cg, i
{
TQColorGroup cgNew = cg;
- // tqreplace the base color with a different shading if necessary...
+ // replace the base color with a different shading if necessary...
if ( fl->shadingEnabled() && m_viewhistpos > 1 )
{
TQColor b( cg.base() );
@@ -616,7 +616,7 @@ void KFLConfigPage::apply()
m_filelist->m_editShade = kcbEditShade->color();
m_filelist->m_enableBgShading = cbEnableShading->isChecked();
m_filelist->setSortType( cmbSort->currentItem() );
- // tqrepaint the affected items
+ // repaint the affected items
m_filelist->triggerUpdate();
}
@@ -649,4 +649,4 @@ void KFLConfigPage::slotMyChanged()
//END KFLConfigPage
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
index 83776178..e9028155 100644
--- a/kate/app/katefilelist.h
+++ b/kate/app/katefilelist.h
@@ -188,4 +188,4 @@ class KFLConfigPage : public Kate::ConfigPage {
#endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 789b6f73..5ab42a28 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
{
if (m_tb)
{
- setMinimumHeight(m_tb->tqsizeHint().height());
+ setMinimumHeight(m_tb->sizeHint().height());
m_tb->resize(width(),height());
}
}
@@ -113,17 +113,17 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
{
mActionCollection = new KActionCollection( this );
- QtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
+ QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
KateFileSelectorToolBarParent *tbp=new KateFileSelectorToolBarParent(this);
toolbar = new KateFileSelectorToolBar(tbp);
tbp->setToolBar(toolbar);
toolbar->setMovingEnabled(false);
toolbar->setFlat(true);
- tqInstallMsgHandler( oldHandler );
+ qInstallMsgHandler( oldHandler );
cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
- cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
cmbPath->setCompletionObject( cmpl );
cmbPath->setAutoDeleteCompletionObject( true );
@@ -157,7 +157,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
btnFilter->setIconSet( SmallIconSet("filter" ) );
btnFilter->setToggleButton( true );
filter = new KHistoryCombo( true, filterBox, "filter");
- filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(filter, 2);
connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
@@ -354,7 +354,7 @@ void KateFileSelector::setDir( KURL u )
newurl.setPath(pathstr);
if ( !kateFileSelectorIsReadable ( newurl ) )
- newurl.cd(TQString::tqfromLatin1(".."));
+ newurl.cd(TQString::fromLatin1(".."));
if ( !kateFileSelectorIsReadable (newurl) )
newurl.setPath( TQDir::homeDirPath() );
@@ -692,13 +692,13 @@ void KFSConfigPage::init()
KAction *ac;
TQListBox *lb;
for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) {
- lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
+ lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
if ( *it == "bookmarks" || *it == "sync_dir" )
ac = fileSelector->actionCollection()->action( (*it).latin1() );
else
ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() );
if ( ac )
- new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it );
+ new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it );
}
// sync
@@ -719,4 +719,4 @@ void KFSConfigPage::slotMyChanged()
slotChanged();
}
//END KFSConfigPage
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index 4a52a6ea..442d3101 100644
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@@ -169,4 +169,4 @@ class KFSConfigPage : public Kate::ConfigPage {
#endif //__KATE_FILESELECTOR_H__
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 99d0b750..409bfd0a 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -85,22 +85,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
<< "*";
}
- TQGridLayout *tqlayout = new TQGridLayout(this, 6, 3, 4, 4);
- tqlayout->setColStretch(0, 10);
- tqlayout->addColSpacing(1, 10);
- tqlayout->setColStretch(1, 0);
- tqlayout->setColStretch(2, 1);
- tqlayout->setRowStretch(1, 0);
- tqlayout->setRowStretch(2, 10);
- tqlayout->setRowStretch(4, 0);
+ TQGridLayout *layout = new TQGridLayout(this, 6, 3, 4, 4);
+ layout->setColStretch(0, 10);
+ layout->addColSpacing(1, 10);
+ layout->setColStretch(1, 0);
+ layout->setColStretch(2, 1);
+ layout->setRowStretch(1, 0);
+ layout->setRowStretch(2, 10);
+ layout->setRowStretch(4, 0);
TQGridLayout *loInput = new TQGridLayout(4, 2, 4);
- tqlayout->addLayout(loInput, 0, 0);
+ layout->addLayout(loInput, 0, 0);
loInput->setColStretch(0, 0);
loInput->setColStretch(1, 20);
TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
- lPattern->setFixedSize(lPattern->tqsizeHint());
+ lPattern->setFixedSize(lPattern->sizeHint());
loInput->addWidget(lPattern, 0, 0, AlignRight | AlignVCenter);
TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
@@ -112,22 +112,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion);
lPattern->setBuddy(cmbPattern);
cmbPattern->setFocus();
- cmbPattern->setMinimumSize(cmbPattern->tqsizeHint());
+ cmbPattern->setMinimumSize(cmbPattern->sizeHint());
loPattern->addWidget( cmbPattern );
cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this);
- cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width());
+ cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width());
cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true));
loPattern->addWidget(cbCasesensitive);
cbRegex = new TQCheckBox( i18n("Regular expression"), this );
- cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() );
+ cbRegex->setMinimumWidth( cbRegex->sizeHint().width() );
cbRegex->setChecked( config->readBoolEntry( "Regex", true ) );
loPattern->addWidget( cbRegex );
loPattern->setStretchFactor( cmbPattern, 100 );
TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
- lTemplate->setFixedSize(lTemplate->tqsizeHint());
+ lTemplate->setFixedSize(lTemplate->sizeHint());
loInput->addWidget(lTemplate, 1, 0, AlignRight | AlignVCenter);
TQBoxLayout *loTemplate = new TQHBoxLayout(4);
@@ -136,7 +136,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
leTemplate = new KLineEdit(this);
lTemplate->setBuddy(leTemplate);
leTemplate->setText(strTemplate[0]);
- leTemplate->setMinimumSize(leTemplate->tqsizeHint());
+ leTemplate->setMinimumSize(leTemplate->sizeHint());
loTemplate->addWidget(leTemplate);
KComboBox *cmbTemplate = new KComboBox(false, this);
@@ -146,19 +146,19 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
loTemplate->addWidget(cmbTemplate);
TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
- lFiles->setFixedSize(lFiles->tqsizeHint());
+ lFiles->setFixedSize(lFiles->sizeHint());
loInput->addWidget(lFiles, 2, 0, AlignRight | AlignVCenter);
cmbFiles = new KComboBox(true, this);
lFiles->setBuddy(cmbFiles->focusProxy());
- cmbFiles->setMinimumSize(cmbFiles->tqsizeHint());
+ cmbFiles->setMinimumSize(cmbFiles->sizeHint());
cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion);
cmbFiles->setDuplicatesEnabled(false);
cmbFiles->insertStringList(lastSearchFiles);
loInput->addWidget(cmbFiles, 2, 1);
TQLabel *lDir = new TQLabel(i18n("Folder:"), this);
- lDir->setFixedSize(lDir->tqsizeHint());
+ lDir->setFixedSize(lDir->sizeHint());
loInput->addWidget(lDir, 3, 0, AlignRight | AlignVCenter);
TQBoxLayout *loDir = new TQHBoxLayout(3);
@@ -176,24 +176,24 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
lDir->setBuddy(cmbDir);
cbRecursive = new TQCheckBox(i18n("Recursive"), this);
- cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width());
+ cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width());
cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
loDir->addWidget(cbRecursive);
KButtonBox *actionbox = new KButtonBox(this, Qt::Vertical);
- tqlayout->addWidget(actionbox, 0, 2);
+ layout->addWidget(actionbox, 0, 2);
actionbox->addStretch();
btnSearch = static_cast<KPushButton*>(actionbox->addButton(KGuiItem(i18n("Find"),"find")));
btnSearch->setDefault(true);
btnClear = static_cast<KPushButton*>(actionbox->addButton( KStdGuiItem::clear() ));
actionbox->addStretch();
- actionbox->tqlayout();
+ actionbox->layout();
lbResult = new TQListBox(this);
TQFontMetrics rb_fm(lbResult->fontMetrics());
- tqlayout->addMultiCellWidget(lbResult, 2, 2, 0, 2);
+ layout->addMultiCellWidget(lbResult, 2, 2, 0, 2);
- tqlayout->activate();
+ layout->activate();
KAcceleratorManager::manage( this );
@@ -225,11 +225,11 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
"You may give several patterns separated by commas."));
TQWhatsThis::add(lTemplate,
i18n("You can choose a template for the pattern from the combo box\n"
- "and edit it here. The string %s in the template is tqreplaced\n"
+ "and edit it here. The string %s in the template is replaced\n"
"by the pattern input field, resulting in the regular expression\n"
"to search for."));
TQWhatsThis::add(lDir,
- i18n("Enter the folder which tqcontains the files in which you want to search."));
+ i18n("Enter the folder which contains the files in which you want to search."));
TQWhatsThis::add(cbRecursive,
i18n("Check this box to search in all subfolders."));
TQWhatsThis::add(cbCasesensitive,
@@ -329,7 +329,7 @@ void GrepTool::slotSearch()
return;
}
- if ( ! leTemplate->text().tqcontains("%s") )
+ if ( ! leTemplate->text().contains("%s") )
{
leTemplate->setFocus();
return;
@@ -347,9 +347,9 @@ void GrepTool::slotSearch()
TQString s = cmbPattern->currentText();
if ( ! cbRegex->isChecked() )
- s.tqreplace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
+ s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
TQString pattern = leTemplate->text();
- pattern.tqreplace( "%s", s );
+ pattern.replace( "%s", s );
childproc = new KProcess();
childproc->setWorkingDirectory( m_workingDir );
@@ -476,7 +476,7 @@ void GrepTool::childExited()
if ( ! errbuf.isEmpty() )
{
- KMessageBox::information( tqparentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
+ KMessageBox::information( parentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
errbuf.truncate(0);
}
else
diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp
index 52bf1f24..79a1e19c 100644
--- a/kate/app/katemailfilesdialog.cpp
+++ b/kate/app/katemailfilesdialog.cpp
@@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin )
}
list->hide();
connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) );
- mw->setMinimumSize( lInfo->tqsizeHint() );
+ mw->setMinimumSize( lInfo->sizeHint() );
}
TQPtrList<Kate::Document> KateMailDialog::selectedDocs()
@@ -105,8 +105,8 @@ void KateMailDialog::slotShowButton()
lInfo->setText( i18n("Press <strong>Mail...</strong> to send selected documents") );
}
- mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) );
- setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) );
+ mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) );
+ setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) );
resize( width(), minimumHeight() );
}
#include "katemailfilesdialog.moc"
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index 9ba62782..371161de 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -253,4 +253,4 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
return app.exec();
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 33119415..dea2b0fa 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -101,7 +101,7 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
// here we go, set some usable default sizes
if (!initialGeometrySet())
{
- int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+ int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
TQSize size;
@@ -110,8 +110,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
if (sconfig)
{
sconfig->setGroup (sgroup);
- size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
- size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
+ size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
+ size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
}
// if thats fails, try to reuse size
@@ -131,8 +131,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
{
// first try global app config
KateApp::self()->config()->setGroup ("MainWindow");
- size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
- size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
+ size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
+ size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
if (size.isEmpty())
size = TQSize (kMin (700, desk.width()), kMin(480, desk.height()));
@@ -851,4 +851,4 @@ void KateMainWindow::saveGlobalProperties( KConfig* sessionConfig )
sessionConfig->writeEntry ("Last Session", KateApp::self()->sessionManager()->activeSession()->sessionFileRelative());
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index e0859bcb..77db9999 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -213,4 +213,4 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
#endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 64aef77b..9d73e762 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -128,7 +128,7 @@ GUIClient::GUIClient ( MainWindow *mw )
if ( domDocument().documentElement().isNull() )
{
- TQString completeDescription = TQString::tqfromLatin1( guiDescription )
+ TQString completeDescription = TQString::fromLatin1( guiDescription )
.arg( actionListName );
setXML( completeDescription, false /*merge*/ );
@@ -339,7 +339,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi
bool Sidebar::removeWidget (ToolView *widget)
{
- if (!m_widgetToId.tqcontains(widget))
+ if (!m_widgetToId.contains(widget))
return false;
removeTab(m_widgetToId[widget]);
@@ -369,7 +369,7 @@ bool Sidebar::removeWidget (ToolView *widget)
bool Sidebar::showWidget (ToolView *widget)
{
- if (!m_widgetToId.tqcontains(widget))
+ if (!m_widgetToId.contains(widget))
return false;
// hide other non-persistent views
@@ -394,7 +394,7 @@ bool Sidebar::showWidget (ToolView *widget)
bool Sidebar::hideWidget (ToolView *widget)
{
- if (!m_widgetToId.tqcontains(widget))
+ if (!m_widgetToId.contains(widget))
return false;
bool anyVis = false;
@@ -579,7 +579,7 @@ void Sidebar::restoreSession (KConfig *config)
}
// then: remove this items from the button bar
- // do this backwards, to minimize the retqlayout efforts
+ // do this backwards, to minimize the relayout efforts
for (int i=m_toolviews.size()-1; i >= (int)firstWrong; --i)
{
removeTab (m_widgetToId[m_toolviews[i]]);
@@ -659,8 +659,8 @@ void Sidebar::saveSession (KConfig *config)
//BEGIN MAIN WINDOW
-MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name)
- : KParts::MainWindow( tqparentWidget, name)
+MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
+ : KParts::MainWindow( parentWidget, name)
, m_sidebarsVisible(true)
, m_restoreConfig (0)
, m_guiClient (new GUIClient (this))
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index 915589d7..1b13c30a 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -258,7 +258,7 @@ class MainWindow : public KParts::MainWindow
/**
* Constructor
*/
- MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0);
+ MainWindow (TQWidget* parentWidget = 0, const char* name = 0);
/**
* Destructor
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index 263d06c7..5199a692 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -91,7 +91,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons
// document list
lvDocuments = new KListView( w );
lvDocuments->addColumn( i18n("Filename") );
- lvDocuments->addColumn( i18n("tqStatus on Disk") );
+ lvDocuments->addColumn( i18n("Status on Disk") );
lvDocuments->setSelectionMode( TQListView::Single );
TQStringList l;
@@ -278,4 +278,4 @@ void KateMwModOnHdDialog::slotPDone( KProcess *p )
m_tmpfile = 0;
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h
index 121761f3..7a5d8f7c 100644
--- a/kate/app/katemwmodonhddialog.h
+++ b/kate/app/katemwmodonhddialog.h
@@ -58,4 +58,4 @@ class KateMwModOnHdDialog : public KDialogBase
};
#endif // _KATE_MW_MODONHD_DIALOG_H_
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index 70c84480..fd0e059f 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -917,4 +917,4 @@ void KateSessionsAction::openSession (int i)
KateSessionManager::self()->activateSession(slist[(uint)i]);
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp
index cd9df55d..4b278e32 100644
--- a/kate/app/katetabwidget.cpp
+++ b/kate/app/katetabwidget.cpp
@@ -70,7 +70,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQString & label, int in
KTabWidget::insertTab(child,label,index);
showPage(child);
maybeShow();
- tabBar()->tqrepaint();
+ tabBar()->repaint();
}
void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -78,7 +78,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, con
KTabWidget::insertTab(child,iconset,label,index);
showPage(child);
maybeShow();
- tabBar()->tqrepaint();
+ tabBar()->repaint();
}
void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
@@ -86,7 +86,7 @@ void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
KTabWidget::insertTab(child,tab,index);
showPage(child);
maybeShow();
- tabBar()->tqrepaint();
+ tabBar()->repaint();
}
void KateTabWidget::removePage ( TQWidget * w )
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 08f080fe..c62e6e08 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -511,4 +511,4 @@ KateMainWindow *KateViewManager::mainWindow() {
return m_mainWindow;
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index de709021..43a73a2b 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -67,9 +67,9 @@ protected:
void paintEvent( TQPaintEvent *e )
{
TQPainter p( this );
- p.setPen( tqcolorGroup().shadow() );
+ p.setPen( colorGroup().shadow() );
p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
- p.setPen( ((KateViewSpace*)tqparentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
+ p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() );
p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
}
};
@@ -226,9 +226,9 @@ bool KateViewSpace::event( TQEvent *e )
return TQVBox::event( e );
}
-void KateViewSpace::slottqStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg)
+void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg)
{
- if ((TQWidgetStack *)view->tqparentWidget() != stack)
+ if ((TQWidgetStack *)view->parentWidget() != stack)
return;
mStatusBar->setStatus( r, c, ovr, block, mod, msg );
}
@@ -309,29 +309,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
{
m_lineColLabel = new TQLabel( this );
addWidget( m_lineColLabel, 0, false );
- m_lineColLabel->tqsetAlignment( Qt::AlignCenter );
+ m_lineColLabel->setAlignment( Qt::AlignCenter );
m_lineColLabel->installEventFilter( this );
m_modifiedLabel = new TQLabel( TQString(" "), this );
addWidget( m_modifiedLabel, 0, false );
- m_modifiedLabel->tqsetAlignment( Qt::AlignCenter );
+ m_modifiedLabel->setAlignment( Qt::AlignCenter );
m_modifiedLabel->installEventFilter( this );
m_insertModeLabel = new TQLabel( i18n(" INS "), this );
addWidget( m_insertModeLabel, 0, false );
- m_insertModeLabel->tqsetAlignment( Qt::AlignCenter );
+ m_insertModeLabel->setAlignment( Qt::AlignCenter );
m_insertModeLabel->installEventFilter( this );
m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
addWidget( m_selectModeLabel, 0, false );
- m_selectModeLabel->tqsetAlignment( Qt::AlignCenter );
+ m_selectModeLabel->setAlignment( Qt::AlignCenter );
m_selectModeLabel->installEventFilter( this );
m_fileNameLabel=new KSqueezedTextLabel( this );
addWidget( m_fileNameLabel, 1, true );
m_fileNameLabel->setMinimumSize( 0, 0 );
- m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
- m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
+ m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+ m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
m_fileNameLabel->installEventFilter( this );
installEventFilter( this );
@@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged()
void KateVSStatusBar::showMenu()
{
- KMainWindow* mainWindow = static_cast<KMainWindow*>( tqtopLevelWidget() );
+ KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() );
TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );
if (menu)
@@ -419,4 +419,4 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
return false;
}
//END KateVSStatusBar
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h
index 9f1106aa..b6a5a185 100644
--- a/kate/app/kateviewspace.h
+++ b/kate/app/kateviewspace.h
@@ -110,7 +110,7 @@ class KateViewSpace : public QVBox
TQString m_group;
private slots:
- void slottqStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg);
+ void slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg);
public slots:
void polish();
@@ -118,4 +118,4 @@ class KateViewSpace : public QVBox
};
#endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index a441e3ad..1e05e8b5 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -69,7 +69,7 @@ KateViewSpaceContainer::KateViewSpaceContainer (TQWidget *parent, KateViewManage
m_viewSpaceList.setAutoDelete(true);
KateViewSpace* vs = new KateViewSpace( this, this );
- connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&)));
+ connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&)));
vs->setActive( true );
m_viewSpaceList.append(vs);
connect( this, TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotViewChanged()) );
@@ -124,7 +124,7 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc )
connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg()));
connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg()));
- connect(view,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(statusMsg()));
+ connect(view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(statusMsg()));
connect(view->getDoc(), TQT_SIGNAL(undoChanged()), this, TQT_SLOT(statusMsg()));
connect(view,TQT_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQT_SLOT(slotDropEvent(TQDropEvent *)));
connect(view,TQT_SIGNAL(gotFocus(Kate::View *)),this,TQT_SLOT(activateSpace(Kate::View *)));
@@ -141,7 +141,7 @@ bool KateViewSpaceContainer::deleteView (Kate::View *view, bool delViewSpace)
{
if (!view) return true;
- KateViewSpace *viewspace = (KateViewSpace *)view->tqparentWidget()->tqparentWidget();
+ KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget();
viewspace->removeView (view);
@@ -241,7 +241,7 @@ void KateViewSpaceContainer::activateSpace (Kate::View* v)
{
if (!v) return;
- KateViewSpace* vs = (KateViewSpace*)v->tqparentWidget()->tqparentWidget();
+ KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget();
if (!vs->isActiveSpace()) {
setActiveSpace (vs);
@@ -446,23 +446,23 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
if (!activeView()) return;
if (!vs) vs = activeViewSpace();
- bool isFirstTime = vs->tqparentWidget() == this;
+ bool isFirstTime = vs->parentWidget() == this;
TQValueList<int> psizes;
if ( ! isFirstTime )
- if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->qt_cast("TQSplitter")) )
+ if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->qt_cast("TQSplitter")) )
psizes = ps->sizes();
Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
- KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->tqparentWidget());
+ KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
s->setOpaqueResize( KGlobalSettings::opaqueResize() );
if (! isFirstTime) {
// anders: make sure the split' viewspace is always
// correctly positioned.
// If viewSpace is the first child, the new splitter must be moveToFirst'd
- if ( !((KateMDI::Splitter*)vs->tqparentWidget())->isLastChild( vs ) )
- ((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s );
+ if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) )
+ ((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s );
}
vs->reparent( s, 0, TQPoint(), true );
KateViewSpace* vsNew = new KateViewSpace( this, s );
@@ -471,17 +471,17 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
s->moveToFirst( vsNew );
if (!isFirstTime)
- if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->qt_cast("TQSplitter")) )
+ if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->qt_cast("TQSplitter")) )
ps->setSizes( psizes );
s->show();
TQValueList<int> sizes;
- int space = 50;//isHoriz ? s->tqparentWidget()->height()/2 : s->tqparentWidget()->width()/2;
+ int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2;
sizes << space << space;
s->setSizes( sizes );
- connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &)));
+ connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &)));
m_viewSpaceList.append( vsNew );
activeViewSpace()->setActive( false );
vsNew->setActive( true, true );
@@ -503,7 +503,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// abort if this is the last viewspace
if (m_viewSpaceList.count() < 2) return;
- KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->tqparentWidget();
+ KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->parentWidget();
// find out if it is the first child for repositioning
// see below
@@ -512,9 +512,9 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// save some size information
KateMDI::Splitter* pp=0L;
TQValueList<int> ppsizes;
- if (m_viewSpaceList.count() > 2 && p->tqparentWidget() != this)
+ if (m_viewSpaceList.count() > 2 && p->parentWidget() != this)
{
- pp = (KateMDI::Splitter*)p->tqparentWidget();
+ pp = (KateMDI::Splitter*)p->parentWidget();
ppsizes = pp->sizes();
pIsFirst = !pp->isLastChild( p ); // simple logic, right-
}
@@ -554,10 +554,10 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
{
TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>*)p->children())->first());
- other->reparent( p->tqparentWidget(), 0, TQPoint(), true );
+ other->reparent( p->parentWidget(), 0, TQPoint(), true );
// We also need to find the right viewspace to become active
if (pIsFirst)
- ((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other );
+ ((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other );
if ( other->isA("KateViewSpace") ) {
setActiveSpace( (KateViewSpace*)other );
}
@@ -726,7 +726,7 @@ void KateViewSpaceContainer::restoreSplitter( KConfig* config, const TQString &g
{
KateViewSpace* vs = new KateViewSpace( this, s );
- connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &)));
+ connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &)));
if (m_viewSpaceList.isEmpty())
vs->setActive (true);
@@ -755,4 +755,4 @@ KateMainWindow *KateViewSpaceContainer::mainWindow() {
return m_viewManager->mainWindow();
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 2ac1e5d9..efb71b76 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -96,8 +96,8 @@ KWrite::KWrite (KTextEditor::Document *doc)
setAcceptDrops(true);
- connect(m_view,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(newCaption()));
- connect(m_view,TQT_SIGNAL(viewtqStatusMsg(const TQString &)),this,TQT_SLOT(newtqStatus(const TQString &)));
+ connect(m_view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(newCaption()));
+ connect(m_view,TQT_SIGNAL(viewStatusMsg(const TQString &)),this,TQT_SLOT(newStatus(const TQString &)));
connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(newCaption()));
connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(slotFileNameChanged()));
connect(m_view,TQT_SIGNAL(dropEventPass(TQDropEvent *)),this,TQT_SLOT(slotDropEvent(TQDropEvent *)));
@@ -112,7 +112,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
// init with more usefull size, stolen from konq :)
if (!initialGeometrySet())
- resize( TQSize(700, 480).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(700, 480).expandedTo(minimumSizeHint()));
// call it as last thing, must be sure everything is already set up ;)
setAutoSaveSettings ();
@@ -163,7 +163,7 @@ void KWrite::setupActions()
// setup Settings menu
setStandardToolBarMenuEnabled(true);
- m_paShowStatusBar = KStdAction::showtqStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
+ m_paShowStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar"));
m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, this, TQT_SLOT(newCaption()),
@@ -320,7 +320,7 @@ void KWrite::printDlg()
KTextEditor::printInterface(m_view->document())->printDialog ();
}
-void KWrite::newtqStatus(const TQString &msg)
+void KWrite::newStatus(const TQString &msg)
{
newCaption();
@@ -709,4 +709,4 @@ void KWriteEditorChooser::slotOk() {
m_chooser->writeAppSetting();
KDialogBase::slotOk();
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h
index 91c4240f..6a3565a6 100644
--- a/kate/app/kwritemain.h
+++ b/kate/app/kwritemain.h
@@ -76,7 +76,7 @@ class KWrite : public KParts::MainWindow
void printNow();
void printDlg();
- void newtqStatus(const TQString &msg);
+ void newStatus(const TQString &msg);
void newCaption();
void slotDropEvent(TQDropEvent *);
@@ -135,4 +135,4 @@ class KWriteEditorChooser: public KDialogBase
};
#endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/data/tips b/kate/data/tips
index 5d74a120..aaee3442 100644
--- a/kate/data/tips
+++ b/kate/data/tips
@@ -83,9 +83,9 @@ in the active frame.</p>
</tip>
<tip category="Kate|part">
<html>
-<p>You can do cool sed-like regular expression tqreplacements using <em>Command Line</em>.</p>
+<p>You can do cool sed-like regular expression replacements using <em>Command Line</em>.</p>
<p>For example, press <strong>F7</strong> and enter <code>s /oldtext/newtext/g</code>
-to tqreplace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current
+to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current
line.</p>
</html>
</tip>
diff --git a/kate/interfaces/mainwindow.cpp b/kate/interfaces/mainwindow.cpp
index 26dbe913..4596cacb 100644
--- a/kate/interfaces/mainwindow.cpp
+++ b/kate/interfaces/mainwindow.cpp
@@ -79,4 +79,4 @@ ToolViewManager *MainWindow::toolViewManager () const
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h
index b0874458..5c8449b6 100644
--- a/kate/interfaces/mainwindow.h
+++ b/kate/interfaces/mainwindow.h
@@ -62,4 +62,4 @@ class KDE_EXPORT MainWindow : public QObject
#endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/utils/dockviewbase.cpp b/kate/utils/dockviewbase.cpp
index 6048f9b7..76e5844e 100644
--- a/kate/utils/dockviewbase.cpp
+++ b/kate/utils/dockviewbase.cpp
@@ -87,7 +87,7 @@ void Kate::DockViewBase::init( const TQString &prefix, const TQString &title )
{
setSpacing( 4 );
d->header = new TQWidget( this );
- d->header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
+ d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
TQHBoxLayout *lo = new TQHBoxLayout( d->header );
lo->setSpacing( 6 );
lo->insertSpacing( 0, 6 );
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index 757c751d..507d648c 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -113,10 +113,10 @@ void KCMInit::runModules( int phase )
TQString libName = TQString("kcm_%1").arg(library);
// try to load the library
- if (! alreadyInitialized.tqcontains( libName.ascii() )) {
+ if (! alreadyInitialized.contains( libName.ascii() )) {
if (!runModule(libName, service)) {
libName = TQString("libkcm_%1").arg(library);
- if (! alreadyInitialized.tqcontains( libName.ascii() )) {
+ if (! alreadyInitialized.contains( libName.ascii() )) {
runModule(libName, service);
alreadyInitialized.append( libName.ascii() );
}
@@ -193,8 +193,8 @@ KCMInit::KCMInit( KCmdLineArgs* args )
runModules( 0 );
kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit"));
sendReady();
- TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case
- tqApp->exec(); // wait for runPhase1() and runPhase2()
+ TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case
+ qApp->exec(); // wait for runPhase1() and runPhase2()
}
else
runModules( -1 ); // all phases
@@ -215,7 +215,7 @@ void KCMInit::runPhase2()
{
runModules( 2 );
emitDCOPSignal( "phase2Done()", TQByteArray());
- tqApp->exit( 0 );
+ qApp->exit( 0 );
}
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
diff --git a/kcontrol/TODO b/kcontrol/TODO
index 48d8587b..b3b8d297 100644
--- a/kcontrol/TODO
+++ b/kcontrol/TODO
@@ -88,11 +88,11 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-KDE-s
// Not sure where these next three are is this OLD and from KDE2 and has already been done?
-* Remove "Internet & Network/Email". It is tqreplaced by the new kcm_useraccount
+* Remove "Internet & Network/Email". It is replaced by the new kcm_useraccount
-* Remove "System Administration/User Info". It is tqreplaced by the new kcm_useraccount
+* Remove "System Administration/User Info". It is replaced by the new kcm_useraccount
-* Remove "Privacy & Crypto/Passwords". It is tqreplaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron)
+* Remove "Privacy & Crypto/Passwords". It is replaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron)
* Tell Konqi to go burn the 11 tabs of keyboard options(5 KCMs). Because it is.. bizarre. Two KCMs with two tabs each is absolute maximum. One KCM with three tabs is quite ok too.
@@ -151,9 +151,9 @@ The current dialog should appear as an advanced tab behind the "Theme"-tab.
Network -> Talk Configuration
-----------------------------
Answering Machine: A groupbox around "Address:, Subject:, First Line:" would be nice. That way one wouldn't need to mention "Mail" each time. The Groupbox could be named something like "Anwering Mail".
-That way one would have a much cleaner tqlayout and it would be much easier to see at once what the dialog is about.
+That way one would have a much cleaner layout and it would be much easier to see at once what the dialog is about.
Forward: Way too much text here. I see the point of having a direct explanation in the dialog. But this could look much friendlier using the following solution:
-There should be a Textbox below the "Forward method"-Combobox. This Textbox only tqcontains the information for the Forward-method which is currently selected (So the text changes each time a different Forward-method is selected).
+There should be a Textbox below the "Forward method"-Combobox. This Textbox only contains the information for the Forward-method which is currently selected (So the text changes each time a different Forward-method is selected).
Sound -> Sound Server
---------------------
@@ -164,5 +164,5 @@ Web Browsing -> User Agent
The Dialog suffers from the cockpit-dilemma.
All the new "Add"-checkboxes are only there for finetuning. Most of the time the useragent-strings should work
w/o the need to tune them this way. Better Solution: Remove the Customize-Group-box and simply add a Button "Customize ..." below the Text: "Current User Agent String: Mozilla/5.0 (comp.; Konq.orwhateveritis)".
-After pressing the "Customize"-Button a dialog should pop up which tqcontains all the nice
+After pressing the "Customize"-Button a dialog should pop up which contains all the nice
"Add"-checkboxes which have been added recently.
diff --git a/kcontrol/access/eventsrc b/kcontrol/access/eventsrc
index f8ac0d20..185460ec 100644
--- a/kcontrol/access/eventsrc
+++ b/kcontrol/access/eventsrc
@@ -130,7 +130,7 @@ Comment[ca]=Una tecla modificadora (p.ex. Majús o Ctrl) ha canviat d'estat i ar
Comment[cs]=Modifikační kláves (např. Shift nebo Control) změnila svůj stav a je nyní aktivní.
Comment[csb]=Klawisza zjinaczi (n.p. Shift czë Control) zmieniła stón ë je terô aktiwnô
Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu aktiv
-Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus geändert und ist jetzt aktiv
+Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren Status geändert und ist jetzt aktiv
Comment[el]=Άλλαξε η κατάσταση ενός πλήκτρου τροποποιητή (π.χ. Shift ή Control) και τώρα είναι ενεργό
Comment[eo]=Modifa klavo (ekz. majuskliga klavo aŭ stirklavo) ŝanĝis sian staton kaj nun estas aktiva
Comment[es]=Una tecla modificadora (p.ej. Mayúsculas o Control) ha cambiado su estado y está activa ahora
@@ -242,7 +242,7 @@ Comment[ca]=Una tecla modificadora (p.ex. Majús o Ctrl) ha canviat d'estat i ar
Comment[cs]=Modifikační kláves (např. Shift nebo Control) změnila svůj stav a je nyní neaktivní.
Comment[csb]=Klawisza zjinaczi (n.p. Shift czë Control) zmieniła stón ë je terô aktiwnô
Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu inaktiv
-Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus geändert und ist jetzt inaktiv
+Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren Status geändert und ist jetzt inaktiv
Comment[el]=Άλλαξε η κατάσταση ενός πλήκτρου τροποποιητή (π.χ. Shift ή Control) και τώρα είναι ανενεργό
Comment[eo]=Modifa klavo (ekz. majuskliga klavo aŭ stirklavo) ŝanĝis sian staton kaj nun estas malaktiva
Comment[es]=Una tecla modificadora (p.ej. Mayúsculas o Control) ha cambiado su estado y ahora está inactiva
@@ -466,7 +466,7 @@ Comment[ca]=Una tecla de bloqueig (p.ex. BloqMajús o BloqNum) ha canviat d'esta
Comment[cs]=Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní aktivní
Comment[csb]=Klawisza blokadë (np. Caps Lock czë Num Lock) zmieniłą stón ë nie je terô aktiwnô
Comment[da]=En låsetast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu aktiv
-Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus geändert und ist nun aktiv
+Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun aktiv
Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ανενεργό
Comment[eo]=Ŝlosa klavo (ekz. majuskla baskulo aŭ Cifera baskulo) ŝanĝis sian staton kaj nun estas aktiva
Comment[es]=Una tecla de bloqueo (p. ej., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva
@@ -579,7 +579,7 @@ Comment[ca]=Una tecla de bloqueig (p.ex. BloqMajús o BloqNum) ha canviat d'esta
Comment[cs]=Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní aktivní
Comment[csb]=Klawisza blokadë (np. Caps Lock czë Num Lock) zmieniła stón ë nie je terô aktiwnô
Comment[da]=En låsetast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu inaktiv
-Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus geändert und ist nun inaktiv
+Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun inaktiv
Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ανενεργό
Comment[eo]=baskula klavo (ekz. majuskla baskulo aŭ nombra baskulo) ŝanĝis staton, kaj jam ne estas aktiva
Comment[es]=Una tecla de bloqueo (p. ej., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 5dca8969..10c593ed 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -31,7 +31,7 @@
#include "kaccess.moc"
struct ModifierKey {
- const unsigned int tqmask;
+ const unsigned int mask;
const KeySym keysym;
const char *name;
const char *lockedText;
@@ -303,9 +303,9 @@ void KAccessApp::readSettings()
overlay = 0;
}
-static int tqmaskToBit (int tqmask) {
+static int maskToBit (int mask) {
for (int i = 0; i < 8; i++)
- if (tqmask & (1 << i))
+ if (mask & (1 << i))
return i;
return -1;
}
@@ -316,19 +316,19 @@ void KAccessApp::initMasks() {
state = 0;
for (int i = 0; strcmp (modifierKeys[i].name, "") != 0; i++) {
- int tqmask = modifierKeys[i].tqmask;
- if (tqmask == 0)
+ int mask = modifierKeys[i].mask;
+ if (mask == 0)
if (modifierKeys[i].keysym != 0)
- tqmask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
+ mask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
else if (!strcmp(modifierKeys[i].name, "Win"))
- tqmask = KKeyNative::modX(KKey::WIN);
+ mask = KKeyNative::modX(KKey::WIN);
else
- tqmask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
+ mask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
| XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Shift)
| XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Latch)
| XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Lock);
- int bit = tqmaskToBit (tqmask);
+ int bit = maskToBit (mask);
if (bit != -1 && keys[bit] == -1)
keys[bit] = i;
}
@@ -496,7 +496,7 @@ TQString mouseKeysShortcut (Display *display) {
{
if (type->map[i].active && (type->map[i].level == level))
{
- modifiers = type->map[i].mods.tqmask;
+ modifiers = type->map[i].mods.mask;
found = true;
}
}
@@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() {
TQVBoxLayout * vlay = new TQVBoxLayout(lay);
featuresLabel = new TQLabel( "", contents );
- featuresLabel->tqsetAlignment( WordBreak|AlignVCenter );
+ featuresLabel->setAlignment( WordBreak|AlignVCenter );
vlay->addWidget( featuresLabel );
vlay->addStretch();
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index ecd55e02..d7e114c5 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -142,7 +142,7 @@ TQString mouseKeysShortcut (Display *display) {
{
if (type->map[i].active && (type->map[i].level == level))
{
- modifiers = type->map[i].mods.tqmask;
+ modifiers = type->map[i].mods.mask;
found = true;
}
}
@@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);
- TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(),
+ TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
KDialogBase::spacingHint());
systemBell = new TQCheckBox(i18n("Use &system bell"), grp);
@@ -291,7 +291,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);
- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp);
vvbox->addWidget(visibleBell);
@@ -311,7 +311,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
TQWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") );
hbox->addSpacing(12);
colorButton = new KColorButton(grp);
- colorButton->setFixedWidth(colorButton->tqsizeHint().height()*2);
+ colorButton->setFixedWidth(colorButton->sizeHint().height()*2);
hbox->addWidget(colorButton);
hbox->addStretch();
TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") );
@@ -353,7 +353,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);
- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp);
vvbox->addWidget(stickyKeys);
@@ -377,7 +377,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);
- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp);
vvbox->addWidget(toggleKeysBeep);
@@ -388,7 +388,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addStretch(1);
kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp);
- kNotifyModifiersButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+ kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
hbox->addWidget(kNotifyModifiersButton);
connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
@@ -415,7 +415,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);
- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp);
vvbox->addWidget(slowKeys);
@@ -447,7 +447,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);
- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp);
vvbox->addWidget(bounceKeys);
@@ -491,7 +491,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);
- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp);
vvbox->addWidget(gestures);
@@ -521,7 +521,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);
- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp);
vvbox->addWidget(accessxBeep);
@@ -536,7 +536,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addStretch(1);
kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp);
- kNotifyAccessXButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+ kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
hbox->addWidget(kNotifyAccessXButton);
connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui
index f18758ea..5d0069a0 100644
--- a/kcontrol/accessibility/accessibilityconfigwidget.ui
+++ b/kcontrol/accessibility/accessibilityconfigwidget.ui
@@ -5,7 +5,7 @@
<property name="name">
<cstring>AccessibilityConfigWidget</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -95,7 +95,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -152,7 +152,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<grid>
<property name="name">
@@ -244,7 +244,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -338,7 +338,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>15</height>
@@ -363,7 +363,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -420,7 +420,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -534,7 +534,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -625,7 +625,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -683,7 +683,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>61</height>
@@ -789,7 +789,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="text">
<string>Ma&amp;ximum speed:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -806,7 +806,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="text">
<string>Acceleration &amp;time:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -895,7 +895,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -944,7 +944,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="text">
<string>&amp;Repeat interval:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -992,7 +992,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="text">
<string>Acceleration &amp;profile:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -1087,7 +1087,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="text">
<string>&amp;Acceleration delay:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -1108,7 +1108,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>1</height>
@@ -1610,8 +1610,8 @@ Please note that on slow machines this may cause a "lag" between the event causi
<slots>
<slot access="private" specifier="non virtual">updateFlashScreenColor()</slot>
</slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcmodule.h</includehint>
<includehint>kurlrequester.h</includehint>
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 68ca8593..792951ae 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -116,7 +116,7 @@ void KArtsModule::initAudioIOList()
void KArtsModule::slotArtsdExited(KProcess* proc)
{
- latestProcesstqStatus = proc->exitStatus();
+ latestProcessStatus = proc->exitStatus();
delete proc;
}
@@ -151,17 +151,17 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
initAudioIOList();
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
TQTabWidget *tab = new TQTabWidget(this);
- tqlayout->addWidget(tab);
+ layout->addWidget(tab);
general = new generalTab(tab);
hardware = new hardwareTab(tab);
//mixer = KCModuleLoader::loadModule("kmixcfg", tab);
//midi = new KMidConfig(tab, "kmidconfig");
- general->tqlayout()->setMargin( KDialog::marginHint() );
- hardware->tqlayout()->setMargin( KDialog::marginHint() );
+ general->layout()->setMargin( KDialog::marginHint() );
+ hardware->layout()->setMargin( KDialog::marginHint() );
general->latencyLabel->setFixedHeight(general->latencyLabel->fontMetrics().lineSpacing());
tab->addTab(general, i18n("&General"));
@@ -499,7 +499,7 @@ void KArtsModule::updateWidgets()
if (item >= 0)
{
audioIO = audioIOList.at(item)->name;
- bool jack = (audioIO == TQString::tqfromLatin1("jack"));
+ bool jack = (audioIO == TQString::fromLatin1("jack"));
if(jack)
{
customRate->setChecked(false);
@@ -549,7 +549,7 @@ bool KArtsModule::realtimeIsPossible()
delete checkProcess;
realtimePossible = false;
}
- else if (latestProcesstqStatus == 0)
+ else if (latestProcessStatus == 0)
{
realtimePossible = true;
}
@@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans,
TQString args;
if(fragmentCount)
- args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount);
+ args += TQString::fromLatin1(" -F %1").arg(fragmentCount);
if(fragmentSize)
- args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize);
+ args += TQString::fromLatin1(" -S %1").arg(fragmentSize);
if (!audioIO.isEmpty())
- args += TQString::tqfromLatin1(" -a %1").arg(audioIO);
+ args += TQString::fromLatin1(" -a %1").arg(audioIO);
if (duplex)
- args += TQString::tqfromLatin1(" -d");
+ args += TQString::fromLatin1(" -d");
if (netTrans)
- args += TQString::tqfromLatin1(" -n");
+ args += TQString::fromLatin1(" -n");
if (!deviceName.isEmpty())
- args += TQString::tqfromLatin1(" -D ") + deviceName;
+ args += TQString::fromLatin1(" -D ") + deviceName;
if (rate)
- args += TQString::tqfromLatin1(" -r %1").arg(rate);
+ args += TQString::fromLatin1(" -r %1").arg(rate);
if (bits)
- args += TQString::tqfromLatin1(" -b %1").arg(bits);
+ args += TQString::fromLatin1(" -b %1").arg(bits);
if (autoSuspend && suspendTime)
- args += TQString::tqfromLatin1(" -s %1").arg(suspendTime);
+ args += TQString::fromLatin1(" -s %1").arg(suspendTime);
if (!addOptions.isEmpty())
args += TQChar(' ') + addOptions;
- args += TQString::tqfromLatin1(" -m artsmessage");
- args += TQString::tqfromLatin1(" -c drkonqi");
- args += TQString::tqfromLatin1(" -l 3");
- args += TQString::tqfromLatin1(" -f");
+ args += TQString::fromLatin1(" -m artsmessage");
+ args += TQString::fromLatin1(" -c drkonqi");
+ args += TQString::fromLatin1(" -l 3");
+ args += TQString::fromLatin1(" -f");
return args;
}
diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h
index 2e033286..80df5bd8 100644
--- a/kcontrol/arts/arts.h
+++ b/kcontrol/arts/arts.h
@@ -92,7 +92,7 @@ private:
hardwareTab *hardware;
KConfig *config;
DeviceManager *deviceManager;
- int latestProcesstqStatus;
+ int latestProcessStatus;
int fragmentCount;
int fragmentSize;
bool configChanged;
diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui
index 19aa6444..5b7ba7f7 100644
--- a/kcontrol/arts/generaltab.ui
+++ b/kcontrol/arts/generaltab.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>generalTab</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -12,7 +12,7 @@
<height>613</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>450</height>
@@ -186,7 +186,7 @@ Recommended if you want sound.</string>
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -227,7 +227,7 @@ Recommended if you want sound.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>173</width>
<height>20</height>
@@ -240,7 +240,7 @@ Recommended if you want sound.</string>
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -256,7 +256,7 @@ Recommended if you want sound.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -289,7 +289,7 @@ Recommended if you want sound.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -308,7 +308,7 @@ Recommended if you want sound.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -322,7 +322,7 @@ Recommended if you want sound.</string>
<includes>
<include location="local" impldecl="in implementation">krichtextlabel.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui
index 977cb644..c11f1996 100644
--- a/kcontrol/arts/hardwaretab.ui
+++ b/kcontrol/arts/hardwaretab.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>hardwareTab</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -35,7 +35,7 @@
</property>
<widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<hbox>
<property name="name">
@@ -77,7 +77,7 @@
</widget>
<widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout31</cstring>
+ <cstring>layout31</cstring>
</property>
<hbox>
<property name="name">
@@ -117,7 +117,7 @@
</widget>
<widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -189,7 +189,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -208,7 +208,7 @@
</widget>
<widget class="QLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -252,7 +252,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -345,7 +345,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -354,5 +354,5 @@
</spacer>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp
index 0d20965c..5c7618a1 100644
--- a/kcontrol/arts/krichtextlabel.cpp
+++ b/kcontrol/arts/krichtextlabel.cpp
@@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text )
KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
- tqsetAlignment( Qt::WordBreak );
+ setAlignment( Qt::WordBreak );
setText(text);
}
KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
- tqsetAlignment( Qt::WordBreak );
+ setAlignment( Qt::WordBreak );
}
void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
}
-TQSize KRichTextLabel::tqminimumSizeHint() const
+TQSize KRichTextLabel::minimumSizeHint() const
{
TQString qt_text = qrichtextify( text() );
int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const
return TQSize(pref_width, rt.height());
}
-TQSize KRichTextLabel::tqsizeHint() const
+TQSize KRichTextLabel::sizeHint() const
{
- return tqminimumSizeHint();
+ return minimumSizeHint();
}
void KRichTextLabel::setText( const TQString &text ) {
diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h
index 178630bc..40ead037 100644
--- a/kcontrol/arts/krichtextlabel.h
+++ b/kcontrol/arts/krichtextlabel.h
@@ -24,7 +24,7 @@
#include <kdelibs_export.h>
/**
- * @short A tqreplacement for TQLabel that supports richtext and proper tqlayout management
+ * @short A replacement for TQLabel that supports richtext and proper layout management
*
* @author Waldo Bastian <bastian@kde.org>
*/
@@ -45,8 +45,8 @@ public:
int defaultWidth() const { return m_defaultWidth; }
void setDefaultWidth(int defaultWidth);
- virtual TQSize tqminimumSizeHint() const;
- virtual TQSize tqsizeHint() const;
+ virtual TQSize minimumSizeHint() const;
+ virtual TQSize sizeHint() const;
TQSizePolicy sizePolicy() const;
public slots:
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index c6b21c38..e1f9ece9 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -432,7 +432,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent
m_RefreshEdit->setRange(5, 60);
m_RefreshEdit->setSteps(5, 10);
m_RefreshEdit->setSuffix(i18n(" min"));
- m_RefreshEdit->setFixedSize(m_RefreshEdit->tqsizeHint());
+ m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint());
lbl->setBuddy(m_RefreshEdit);
grid->addWidget(m_RefreshEdit, 5, 1, AlignLeft);
diff --git a/kcontrol/background/bgadvanced_ui.ui b/kcontrol/background/bgadvanced_ui.ui
index 4048c820..6aa3d436 100644
--- a/kcontrol/background/bgadvanced_ui.ui
+++ b/kcontrol/background/bgadvanced_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>BGAdvancedBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -91,7 +91,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -138,7 +138,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
@@ -223,7 +223,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>220</width>
<height>20</height>
@@ -376,7 +376,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -395,7 +395,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -453,8 +453,8 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 309d19d0..8294f53a 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -142,7 +142,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
}
// background image settings
- TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen"));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
m_urlWallpaperButton->setIconSet( iconSet );
m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@@ -257,7 +257,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
updateUI();
#if (QT_VERSION-0 >= 0x030200)
- connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
+ connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
#endif
}
@@ -395,7 +395,7 @@ TQString BGDialog::quickHelp() const
" wallpaper can be overlaid opaquely, or blended in different ways with"
" the background colors and patterns.<p>"
" KDE allows you to have the wallpaper change automatically at specified"
- " intervals of time. You can also tqreplace the background with a program"
+ " intervals of time. You can also replace the background with a program"
" that updates the desktop dynamically. For example, the \"kdeworld\""
" program shows a day/night map of the world which is updated periodically.");
}
@@ -414,14 +414,14 @@ void BGDialog::slotIdentifyScreens()
screenLabel->setFrameStyle(TQFrame::Panel);
screenLabel->setFrameShadow(TQFrame::Plain);
- screenLabel->tqsetAlignment(Qt::AlignCenter);
+ screenLabel->setAlignment(Qt::AlignCenter);
screenLabel->setNum(int(s + 1));
// BUGLET: we should not allow the identification to be entered again
// until the timer fires.
TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
- TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint());
+ TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
targetGeometry.moveCenter(screenCenter);
screenLabel->setGeometry(targetGeometry);
@@ -524,7 +524,7 @@ void BGDialog::loadWallpaperFilesList() {
if (imageCaption.isEmpty())
{
imageCaption = fileName;
- imageCaption.tqreplace('_', ' ');
+ imageCaption.replace('_', ' ');
imageCaption = KStringHandler::capwords(imageCaption);
}
@@ -571,7 +571,7 @@ void BGDialog::loadWallpaperFilesList() {
else
imageCaption = (*it).mid(slash);
- imageCaption.tqreplace('_', ' ');
+ imageCaption.replace('_', ' ');
imageCaption = KStringHandler::capwords(imageCaption);
}
@@ -943,7 +943,7 @@ void BGDialog::slotWallpaperTypeChanged(int i)
else
m_wallpaperPos = KBackgroundSettings::Tiled;
}
- else if (KMimeType::tqfindByPath(path)->is("image/svg+xml"))
+ else if (KMimeType::findByPath(path)->is("image/svg+xml"))
{
m_wallpaperPos = KBackgroundSettings::Scaled;
}
@@ -1004,7 +1004,7 @@ void BGDialog::slotSetupMulti()
{
KBackgroundRenderer *r = eRenderer();
- BGMultiWallpaperDialog dlg(r, tqtopLevelWidget());
+ BGMultiWallpaperDialog dlg(r, topLevelWidget());
if (dlg.exec() == TQDialog::Accepted) {
r->stop();
m_slideShowRandom = r->multiWallpaperMode();
@@ -1182,7 +1182,7 @@ void BGDialog::slotAdvanced()
KBackgroundRenderer *r = eRenderer();
m_previewUpdates = false;
- BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop);
+ BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);
if (!m_pMonitorArrangement->isEnabled()) {
dlg.makeReadOnly();
diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui
index 93df5142..7cc6571d 100644
--- a/kcontrol/background/bgdialog_ui.ui
+++ b/kcontrol/background/bgdialog_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>BGDialog_UI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>0</height>
@@ -114,7 +114,7 @@
</spacer>
<widget class="QLayoutWidget" row="1" column="4" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout36</cstring>
+ <cstring>layout36</cstring>
</property>
<vbox>
<property name="name">
@@ -132,7 +132,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -141,7 +141,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout35</cstring>
+ <cstring>layout35</cstring>
</property>
<vbox>
<property name="name">
@@ -161,7 +161,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>4</width>
<height>20</height>
@@ -197,7 +197,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>4</width>
<height>20</height>
@@ -219,7 +219,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>4</width>
<height>20</height>
@@ -255,7 +255,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>4</width>
<height>20</height>
@@ -277,7 +277,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>4</width>
<height>20</height>
@@ -313,7 +313,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>4</width>
<height>20</height>
@@ -333,7 +333,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -386,7 +386,7 @@
</widget>
<widget class="QLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>tqlayout31</cstring>
+ <cstring>layout31</cstring>
</property>
<hbox>
<property name="name">
@@ -440,7 +440,7 @@
</widget>
<widget class="QLayoutWidget" row="6" column="1">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<hbox>
<property name="name">
@@ -522,7 +522,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>120</width>
<height>10</height>
@@ -539,7 +539,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>130</width>
<height>10</height>
@@ -613,7 +613,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>260</width>
<height>20</height>
@@ -641,7 +641,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>16</height>
@@ -711,8 +711,8 @@
<include location="global" impldecl="in implementation">kurlrequester.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/background/bghash.h b/kcontrol/background/bghash.h
index b59a46f9..ab13daf9 100644
--- a/kcontrol/background/bghash.h
+++ b/kcontrol/background/bghash.h
@@ -8,7 +8,7 @@
static int QHash(TQString key)
{
int g, h = 0;
- const TQChar *p = key.tqunicode();
+ const TQChar *p = key.unicode();
for (unsigned i=0; i < key.length(); i++) {
h = (h << 4) + p[i].cell();
if ((g = (h & 0xf0000000)))
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index 3c227872..f78a7b61 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -91,7 +91,7 @@ void BGMonitorArrangement::updateArrangement()
{
// In this function, sizes, etc have a normal value, and their "expanded"
// value. The expanded value is used for setting the size of the monitor
- // image that tqcontains the preview of the background. The monitor image
+ // image that contains the preview of the background. The monitor image
// will set the background preview back to the normal value.
TQRect overallGeometry;
@@ -157,21 +157,21 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm )
BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name)
: TQLabel(parent, name)
{
- tqsetAlignment(AlignCenter);
+ setAlignment(AlignCenter);
setScaledContents(true);
setPixmap( TQPixmap( locate("data", "kcontrol/pics/monitor.png") ) );
m_pBGMonitor = new BGMonitor(this);
- TQWhatsThis::add( this, i18n("This picture of a monitor tqcontains a preview of what the current settings will look like on your desktop.") );
+ TQWhatsThis::add( this, i18n("This picture of a monitor contains a preview of what the current settings will look like on your desktop.") );
}
void BGMonitorLabel::updateMonitorGeometry()
{
- double scaleX = double(width()) / double(tqsizeHint().width());
- double scaleY = double(height()) / double(tqsizeHint().height());
+ double scaleX = double(width()) / double(sizeHint().width());
+ double scaleY = double(height()) / double(sizeHint().height());
- kdDebug() << k_funcinfo << " Setting tqgeometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl;
+ kdDebug() << k_funcinfo << " Setting geometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl;
m_pBGMonitor->setGeometry( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) );
}
@@ -189,7 +189,7 @@ void BGMonitorLabel::resizeEvent( TQResizeEvent * e )
BGMonitor::BGMonitor(TQWidget *parent, const char *name)
: TQLabel(parent, name)
{
- tqsetAlignment(AlignCenter);
+ setAlignment(AlignCenter);
setScaledContents(true);
setAcceptDrops(true);
}
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 288a06aa..f1136398 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -54,7 +54,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
m_isBusyCursor = false;
m_enableBusyCursor = false;
m_pDirs = KGlobal::dirs();
- m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->tqgeometry().size();
+ m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
m_pProc = 0L;
m_Tempfile = 0L;
m_bPreview = false;
@@ -85,7 +85,7 @@ void KBackgroundRenderer::setSize(const TQSize &size)
void KBackgroundRenderer::desktopResized()
{
m_State = 0;
- m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->tqgeometry().size();
+ m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->geometry().size();
if( !m_bPreview )
m_Size = m_rSize;
}
@@ -132,24 +132,24 @@ TQString KBackgroundRenderer::buildCommand()
switch (cmd.at(pos+1).latin1()) {
case 'f':
createTempFile();
- cmd.tqreplace(pos, 2, KShellProcess::quote(m_Tempfile->name()));
+ cmd.replace(pos, 2, KShellProcess::quote(m_Tempfile->name()));
pos += m_Tempfile->name().length() - 2;
break;
case 'x':
num.setNum(m_Size.width());
- cmd.tqreplace(pos, 2, num);
+ cmd.replace(pos, 2, num);
pos += num.length() - 2;
break;
case 'y':
num.setNum(m_Size.height());
- cmd.tqreplace(pos, 2, num);
+ cmd.replace(pos, 2, num);
pos += num.length() - 2;
break;
case '%':
- cmd.tqreplace(pos, 2, "%");
+ cmd.replace(pos, 2, "%");
pos--;
break;
default:
@@ -191,7 +191,7 @@ int KBackgroundRenderer::doBackground(bool quit)
int tile_val = TQPixmap::defaultDepth() >= 24 ? 1 : 2;
// some dithering may be needed even with bpb==15/16, so don't use tileWidth==1
// for them
- // with tileWidth>2, tqrepainting the desktop causes nasty effect (XFree86 4.1.0 )
+ // with tileWidth>2, repainting the desktop causes nasty effect (XFree86 4.1.0 )
if( XQueryBestTile( qt_xdisplay(), qt_xrootwin(), tile_val, tile_val,
&tileWidth, &tileHeight ) != Success )
tileWidth = tileHeight = tile_val; // some defaults
@@ -584,7 +584,7 @@ void KBackgroundRenderer::fastWallpaperBlend()
m_Pixmap.convertFromImage( m_Wallpaper );
return;
}
- else if( m_WallpaperRect.tqcontains( TQRect( TQPoint( 0, 0 ), m_Size ))
+ else if( m_WallpaperRect.contains( TQRect( TQPoint( 0, 0 ), m_Size ))
&& !m_Wallpaper.hasAlphaBuffer()) // wallpaper covers all and no blending
m_Pixmap = TQPixmap( m_Size );
else if (m_Background.size() == m_Size)
@@ -730,10 +730,10 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP
+ (dr.x() + x) * sizeof(QRgb));
d = reinterpret_cast<QRgb*>(src.scanLine(soffs.y() + y)
+ (soffs.x() + x) * sizeof(QRgb));
- a = (tqAlpha(*d) * blendFactor) / 100;
- *b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8),
- tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8),
- tqBlue(*b) - (((tqBlue(*b) - tqBlue(*d)) * a) >> 8));
+ a = (qAlpha(*d) * blendFactor) / 100;
+ *b = qRgb(qRed(*b) - (((qRed(*b) - qRed(*d)) * a) >> 8),
+ qGreen(*b) - (((qGreen(*b) - qGreen(*d)) * a) >> 8),
+ qBlue(*b) - (((qBlue(*b) - qBlue(*d)) * a) >> 8));
}
}
}
@@ -946,8 +946,8 @@ void KBackgroundRenderer::createTempFile()
TQString KBackgroundRenderer::cacheFileName()
{
TQString f = fingerprint();
- f.tqreplace ( ':', '_' ); // avoid characters that shouldn't be in filenames
- f.tqreplace ( '/', '#' );
+ f.replace ( ':', '_' ); // avoid characters that shouldn't be in filenames
+ f.replace ( '/', '#' );
f = locateLocal( "cache", TQString( "background/%1x%2_%3.png" )
.arg( m_Size.width()).arg( m_Size.height()).arg( f ));
return f;
@@ -1046,7 +1046,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
}
initRenderers();
- m_size = KApplication::desktop()->tqgeometry().size();
+ m_size = KApplication::desktop()->geometry().size();
}
KVirtualBGRenderer::~KVirtualBGRenderer()
@@ -1153,7 +1153,7 @@ void KVirtualBGRenderer::setEnabled(bool enable)
void KVirtualBGRenderer::desktopResized()
{
- m_size = KApplication::desktop()->tqgeometry().size();
+ m_size = KApplication::desktop()->geometry().size();
if (m_pPixmap)
{
@@ -1194,7 +1194,7 @@ void KVirtualBGRenderer::setPreview(const TQSize & size)
TQSize KVirtualBGRenderer::renderSize(int screen)
{
- return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->tqgeometry().size();
+ return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
}
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 90d028e2..8d3bdac0 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -751,7 +751,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_BackgroundMode = defBackgroundMode;
s = m_pConfig->readEntry("BackgroundMode", "invalid");
- if (m_BMMap.tqcontains(s)) {
+ if (m_BMMap.contains(s)) {
int mode = m_BMMap[s];
// consistency check
if ( ((mode != Pattern) && (mode != Program)) ||
@@ -763,7 +763,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_BlendMode = defBlendMode;
s = m_pConfig->readEntry("BlendMode", "invalid");
- if (m_BlMMap.tqcontains(s)) {
+ if (m_BlMMap.contains(s)) {
m_BlendMode = m_BlMMap[s];
}
@@ -784,7 +784,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_MultiMode = defMultiMode;
s = m_pConfig->readEntry("MultiWallpaperMode");
- if (m_MMMap.tqcontains(s)) {
+ if (m_MMMap.contains(s)) {
int mode = m_MMMap[s];
m_MultiMode = mode;
}
@@ -799,7 +799,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_WallpaperMode = defWallpaperMode;
m_Wallpaper = m_pConfig->readPathEntry("Wallpaper");
s = m_pConfig->readEntry("WallpaperMode", "invalid");
- if (m_WMMap.tqcontains(s)) {
+ if (m_WMMap.contains(s)) {
int mode = m_WMMap[s];
// consistency check.
if ((mode == NoWallpaper) || !m_Wallpaper.isEmpty() || (m_MultiMode == InOrder || m_MultiMode == Random))
@@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint()
s += TQString("wm:%1;").arg(m_WallpaperMode);
if (m_WallpaperMode != NoWallpaper)
{
- TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
+ Q_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper());
}
diff --git a/kcontrol/background/bgwallpaper_ui.ui b/kcontrol/background/bgwallpaper_ui.ui
index a0a4a2a9..c3d9a9a4 100644
--- a/kcontrol/background/bgwallpaper_ui.ui
+++ b/kcontrol/background/bgwallpaper_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>BGMultiWallPaperBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -37,7 +37,7 @@
</widget>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -80,7 +80,7 @@
</widget>
<widget class="QLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@@ -98,7 +98,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>100</height>
@@ -123,7 +123,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -162,6 +162,6 @@
<include location="local" impldecl="in declaration">bgwallpaper.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index e6e7bce3..da77d7cd 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -54,11 +54,11 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
configname.sprintf("kdesktop-screen-%drc", screen_number);
m_pConfig = new KConfig(configname, false, false);
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
m_base = new BGDialog(this, m_pConfig);
setQuickHelp( m_base->quickHelp());
- tqlayout->add(m_base);
- tqlayout->addStretch();
+ layout->add(m_base);
+ layout->addStretch();
KImageIO::registerFormats();
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index c0b9c20f..10d774da 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -67,14 +67,14 @@ extern "C"
KBellConfig::KBellConfig(TQWidget *parent, const char *name):
KCModule(parent, name)
{
- TQBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
int row = 0;
TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this );
box->setColumnLayout( 0, Qt::Horizontal );
- tqlayout->addWidget(box);
- tqlayout->addStretch();
- TQGridLayout *grid = new TQGridLayout(box->tqlayout(), KDialog::spacingHint());
+ layout->addWidget(box);
+ layout->addStretch();
+ TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
grid->setColStretch(0, 0);
grid->setColStretch(1, 1);
grid->addColSpacing(0, 30);
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index cc83f630..109e436c 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -65,14 +65,14 @@ Dtime::Dtime(TQWidget * parent, const char *name)
// Time Server
- privateLayoutWidget = new TQWidget( this, "tqlayout1" );
- TQHBoxLayout *tqlayout1 = new TQHBoxLayout( privateLayoutWidget, 0, 0, "ntptqlayout");
+ privateLayoutWidget = new TQWidget( this, "layout1" );
+ TQHBoxLayout *layout1 = new TQHBoxLayout( privateLayoutWidget, 0, 0, "ntplayout");
setDateTimeAuto = new TQCheckBox( privateLayoutWidget, "setDateTimeAuto" );
setDateTimeAuto->setText(i18n("Set date and time &automatically:"));
connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(serverTimeCheck()));
connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
- tqlayout1->addWidget( setDateTimeAuto );
+ layout1->addWidget( setDateTimeAuto );
timeServerList = new TQComboBox( false, privateLayoutWidget, "timeServerList" );
connect(timeServerList, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged()));
@@ -80,7 +80,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), timeServerList, TQT_SLOT(setEnabled(bool)));
timeServerList->setEnabled(false);
timeServerList->setEditable(true);
- tqlayout1->addWidget( timeServerList );
+ layout1->addWidget( timeServerList );
findNTPutility();
// Date box
@@ -89,7 +89,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() );
cal = new KDatePicker( dateBox );
- cal->setMinimumSize(cal->tqsizeHint());
+ cal->setMinimumSize(cal->sizeHint());
l1->addWidget( cal );
TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") );
@@ -120,7 +120,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQLabel *dots1 = new TQLabel(":", timeBox);
dots1->setMinimumWidth( 7 );
- dots1->tqsetAlignment( TQLabel::AlignCenter );
+ dots1->setAlignment( TQLabel::AlignCenter );
v3->addMultiCellWidget(dots1, 0, 1, 3, 3 );
minute = new HMSTimeWidget( timeBox );
@@ -132,7 +132,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQLabel *dots2 = new TQLabel(":", timeBox);
dots2->setMinimumWidth( 7 );
- dots2->tqsetAlignment( TQLabel::AlignCenter );
+ dots2->setAlignment( TQLabel::AlignCenter );
v3->addMultiCellWidget(dots2, 0, 1, 5, 5 );
second = new HMSTimeWidget( timeBox );
@@ -252,7 +252,7 @@ oceania.pool.ntp.org"))));
// Reset to the current date and time
time = TQTime::currentTime();
- date = TQDate::tqcurrentDate();
+ date = TQDate::currentDate();
cal->setDate(date);
// start internal timer
@@ -285,8 +285,8 @@ void Dtime::save()
// NTP Time setting
TQString timeServer = timeServerList->currentText();
if( timeServer.find( TQRegExp(".*\\(.*\\)$") ) != -1 ) {
- timeServer.tqreplace( TQRegExp(".*\\("), "" );
- timeServer.tqreplace( TQRegExp("\\).*"), "" );
+ timeServer.replace( TQRegExp(".*\\("), "" );
+ timeServer.replace( TQRegExp("\\).*"), "" );
// Would this be better?: s/^.*\(([^)]*)\).*$/\1/
}
KProcess proc;
@@ -368,7 +368,7 @@ TQString Dtime::quickHelp() const
void Kclock::setTime(const TQTime &time)
{
this->time = time;
- tqrepaint();
+ repaint();
}
void Kclock::paintEvent( TQPaintEvent * )
@@ -382,8 +382,8 @@ void Kclock::paintEvent( TQPaintEvent * )
TQPointArray pts;
TQPoint cp = rect().center();
int d = QMIN(width(),height());
- TQColor hands = tqcolorGroup().dark();
- TQColor shadow = tqcolorGroup().text();
+ TQColor hands = colorGroup().dark();
+ TQColor shadow = colorGroup().text();
paint.setPen( shadow );
paint.setBrush( shadow );
paint.setViewport(4,4,width(),height());
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index d6a52456..86e47e7a 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -59,17 +59,17 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis
KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
dtime = new Dtime(this);
- tqlayout->addWidget(dtime);
+ layout->addWidget(dtime);
connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool)));
tzone = new Tzone(this);
- tqlayout->addWidget(tzone);
+ layout->addWidget(tzone);
connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool)));
- tqlayout->addStretch();
+ layout->addStretch();
if(getuid() == 0)
setButtons(Help|Apply);
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index bfb32c55..6161198c 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -154,7 +154,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
TQWhatsThis::add( sList, i18n("This is a list of predefined color schemes,"
" including any that you may have created. You can preview an existing"
" color scheme by selecting it from the list. The current scheme will"
- " be tqreplaced by the selected color scheme.<p>"
+ " be replaced by the selected color scheme.<p>"
" Warning: if you have not yet applied any changes you may have made"
" to the current scheme, those changes will be lost if you select"
" another color scheme.") );
diff --git a/kcontrol/colors/stdclient_bitmaps.h b/kcontrol/colors/stdclient_bitmaps.h
index 6b93e848..912040fe 100644
--- a/kcontrol/colors/stdclient_bitmaps.h
+++ b/kcontrol/colors/stdclient_bitmaps.h
@@ -18,7 +18,7 @@ static unsigned char close_dgray_bits[] = {
0xc0, 0x06, 0x80, 0x03, 0x80, 0x03, 0xc0, 0x06, 0x60, 0x0c, 0x30, 0x18,
0x18, 0x30, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00};
-static unsigned char close_tqmask_bits[] = {
+static unsigned char close_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x1c, 0x38, 0x38, 0x1c, 0x70, 0x0e,
0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07, 0x70, 0x0e, 0x38, 0x1c,
0x1c, 0x38, 0x0c, 0x30, 0x00, 0x00, 0x00, 0x00};
@@ -34,7 +34,7 @@ static unsigned char iconify_dgray_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char iconify_tqmask_bits[] = {
+static unsigned char iconify_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x80, 0x03, 0x80, 0x02, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -49,7 +49,7 @@ static unsigned char maximize_dgray_bits[] = {
0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10,
0xf8, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char maximize_tqmask_bits[] = {
+static unsigned char maximize_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0xfc, 0x1f, 0x0c, 0x18, 0x0c, 0x18,
0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0xfc, 0x1f,
0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -64,7 +64,7 @@ static unsigned char maximizedown_dgray_bits[] = {
0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08,
0xf4, 0x0f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char maximizedown_tqmask_bits[] = {
+static unsigned char maximizedown_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0xfc, 0x1f, 0x0c, 0x18,
0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18,
0xfc, 0x1f, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00};
@@ -79,7 +79,7 @@ static unsigned char menu_dgray_bits[] = {
0x00, 0x00, 0x00, 0x20, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char menu_tqmask_bits[] = {
+static unsigned char menu_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xfc, 0x3f, 0x04, 0x20, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -99,7 +99,7 @@ static unsigned char pindown_dgray_bits[] = {
0x48, 0x30, 0xc8, 0x38, 0x08, 0x1f, 0x08, 0x18, 0x10, 0x1c, 0x10, 0x0e,
0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char pindown_tqmask_bits[] = {
+static unsigned char pindown_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x1f, 0xf0, 0x3f, 0xf0, 0x3f,
0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x0f,
0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -119,7 +119,7 @@ static unsigned char pinup_dgray_bits[] = {
0x40, 0x20, 0x40, 0x20, 0x7f, 0x2a, 0x40, 0x3f, 0xc0, 0x31, 0xc0, 0x20,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char pinup_tqmask_bits[] = {
+static unsigned char pinup_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xc0, 0x31, 0xc0, 0x3f,
0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xc0, 0x3f, 0xc0, 0x31, 0xc0, 0x20,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index 3013321b..67e68b3a 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -64,7 +64,7 @@ void WidgetCanvas::paintEvent(TQPaintEvent *)
void WidgetCanvas::mousePressEvent( TQMouseEvent *me )
{
for ( int i = 0; i < MAX_HOTSPOTS; i++ )
- if ( hotspots[i].rect.tqcontains( me->pos() ) ) {
+ if ( hotspots[i].rect.contains( me->pos() ) ) {
emit widgetSelected( hotspots[i].number );
return;
}
@@ -73,7 +73,7 @@ void WidgetCanvas::mousePressEvent( TQMouseEvent *me )
void WidgetCanvas::mouseMoveEvent( TQMouseEvent *me )
{
for ( int i = 0; i < MAX_HOTSPOTS; i++ )
- if ( hotspots[i].rect.tqcontains( me->pos() ) ) {
+ if ( hotspots[i].rect.contains( me->pos() ) ) {
if ( i != currentHotspot ) {
TQString tip = tips[hotspots[i].number];
TQToolTip::remove( this );
@@ -91,7 +91,7 @@ void WidgetCanvas::dropEvent( TQDropEvent *e)
TQColor c;
if (KColorDrag::decode( e, c)) {
for ( int i = 0; i < MAX_HOTSPOTS; i++ )
- if ( hotspots[i].rect.tqcontains( e->pos() ) ) {
+ if ( hotspots[i].rect.contains( e->pos() ) ) {
emit colorDropped( hotspots[i].number, c);
return;
}
@@ -162,7 +162,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
pact.drawPixmap(0, 0, bitmap);
pdis.drawPixmap(0, 0, bitmap);
pact.end(); pdis.end();
- bitmap = TQBitmap(16, 16, close_tqmask_bits, true);
+ bitmap = TQBitmap(16, 16, close_mask_bits, true);
close_pix->setMask(bitmap); dis_close_pix->setMask(bitmap);
minimize_pix = new TQPixmap(16, 16);
@@ -178,7 +178,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
pact.drawPixmap(0, 0, bitmap);
pdis.drawPixmap(0, 0, bitmap);
pact.end(); pdis.end();
- bitmap = TQBitmap(16, 16, iconify_tqmask_bits, true);
+ bitmap = TQBitmap(16, 16, iconify_mask_bits, true);
minimize_pix->setMask(bitmap); dis_minimize_pix->setMask(bitmap);
maximize_pix = new TQPixmap(16, 16);
@@ -194,7 +194,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
pact.drawPixmap(0, 0, bitmap);
pdis.drawPixmap(0, 0, bitmap);
pact.end(); pdis.end();
- bitmap = TQBitmap(16, 16, maximize_tqmask_bits, true);
+ bitmap = TQBitmap(16, 16, maximize_mask_bits, true);
maximize_pix->setMask(bitmap); dis_maximize_pix->setMask(bitmap);
normalize_pix = new TQPixmap(16, 16);
@@ -210,7 +210,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
pact.drawPixmap(0, 0, bitmap);
pdis.drawPixmap(0, 0, bitmap);
pact.end(); pdis.end();
- bitmap = TQBitmap(16, 16, maximizedown_tqmask_bits, true);
+ bitmap = TQBitmap(16, 16, maximizedown_mask_bits, true);
normalize_pix->setMask(bitmap); dis_normalize_pix->setMask(bitmap);
menu_pix = new TQPixmap(16, 16);
@@ -226,7 +226,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
pact.drawPixmap(0, 0, bitmap);
pdis.drawPixmap(0, 0, bitmap);
pact.end(); pdis.end();
- bitmap = TQBitmap(16, 16, menu_tqmask_bits, true);
+ bitmap = TQBitmap(16, 16, menu_mask_bits, true);
menu_pix->setMask(bitmap); dis_menu_pix->setMask(bitmap);
pinup_pix = new TQPixmap(16, 16);
@@ -247,7 +247,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
pact.drawPixmap(0, 0, bitmap);
pdis.drawPixmap(0, 0, bitmap);
pact.end(); pdis.end();
- bitmap = TQBitmap(16, 16, pinup_tqmask_bits, true);
+ bitmap = TQBitmap(16, 16, pinup_mask_bits, true);
pinup_pix->setMask(bitmap); dis_pinup_pix->setMask(bitmap);
pindown_pix = new TQPixmap(16, 16);
@@ -268,7 +268,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
pact.drawPixmap(0, 0, bitmap);
pdis.drawPixmap(0, 0, bitmap);
pact.end(); pdis.end();
- bitmap = TQBitmap(16, 16, pindown_tqmask_bits, true);
+ bitmap = TQBitmap(16, 16, pindown_mask_bits, true);
pindown_pix->setMask(bitmap); dis_pindown_pix->setMask(bitmap);
}
@@ -327,7 +327,7 @@ void WidgetCanvas::drawSampleWidgets()
#ifndef __osf__
TQPainter::redirect( vertScrollBar, &pm );
#endif
- vertScrollBar->tqrepaint();
+ vertScrollBar->repaint();
TQPainter::redirect( vertScrollBar, 0 );
vertScrollBar->hide();
@@ -337,8 +337,8 @@ void WidgetCanvas::drawSampleWidgets()
// Initialize the pixmap which we draw sample widgets into.
smplw.resize(width(), height());
- //smplw.fill( tqparentWidget()->back() );
- smplw.fill( tqparentWidget()->tqcolorGroup().mid() );
+ //smplw.fill( parentWidget()->back() );
+ smplw.fill( parentWidget()->colorGroup().mid() );
// Actually start painting in
@@ -567,9 +567,9 @@ void WidgetCanvas::drawSampleWidgets()
popup->setItemEnabled( id, false );
// HACK: Force Layouting
- //Sad Eagle: tqsizeHint() forces tqlayouting too, and it's a lot less visible
- //popup->tqsizeHint(); // Breaks with Qt 3.3
- popup->resize(popup->tqsizeHint());
+ //Sad Eagle: sizeHint() forces layouting too, and it's a lot less visible
+ //popup->sizeHint(); // Breaks with Qt 3.3
+ popup->resize(popup->sizeHint());
pm = TQPixmap::grabWidget( popup );
delete popup;
@@ -585,12 +585,12 @@ void WidgetCanvas::drawSampleWidgets()
// Valance
qDrawWinPanel ( &paint, 0, 0, width(), height(),
- tqparentWidget()->tqcolorGroup(), TRUE, 0);
+ parentWidget()->colorGroup(), TRUE, 0);
// Stop the painting
hotspots[ spot++ ] =
HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ?
- tqrepaint( FALSE );
+ repaint( FALSE );
}
diff --git a/kcontrol/componentchooser/EXAMPLE.desktop b/kcontrol/componentchooser/EXAMPLE.desktop
index 69960158..f5501162 100644
--- a/kcontrol/componentchooser/EXAMPLE.desktop
+++ b/kcontrol/componentchooser/EXAMPLE.desktop
@@ -123,14 +123,14 @@ Comment[nl]=Een behulpzame omschrijving van de interface, bedoelt voor het infor
Comment[nn]=Ei hjelpsam skildring av grensesnittet for infoboksen oppe til høgre
Comment[nso]=Thlaloso yeo e tletsego thuso ya interface ya lepokisi la tshedimoso la godimo kago lagoja
Comment[pa]=ਸੱਜੇ ਜਾਣਕਾਰੀ ਬਕਸੇ ਲਈ ਇੰਟਰਫੇਸ ਲ਼ਈ ਸਹਾਇਤਾ ਵੇਰਵਾ
-Comment[pl]=Potqmocny opis programu (dla informacji w okienku w prawym, górnym rogu)
+Comment[pl]=Pomocny opis programu (dla informacji w okienku w prawym, górnym rogu)
Comment[pt]=Uma descrição útil da interface para a zona de informação do canto superior direito
Comment[pt_BR]=Uma descrição útil da interface para a caixa de informação superior direita
Comment[ro]=Aici trebuie să fie descrierea interfeței pentru căsuța din dreapta-sus
Comment[ru]=Полезное описание интерфейса в верхнем правом информационном окне
Comment[rw]=Umwirondoro ngirakamaro w'imigaragarire ujyanye n'agasanduku k'ibisobanuro hejuru iburyo
Comment[se]=Laktaválddahus maid infoboksa badjin olgešbealde geavaha.
-Comment[sk]=Potqmocný popis rozhrania pre informačný box v pravom hornom rohu
+Comment[sk]=Pomocný popis rozhrania pre informačný box v pravom hornom rohu
Comment[sl]=Primeren opis vmesnika za gornjo desno okno z informacijami
Comment[sr]=Опис интерфејса који сте изабрали за горњу десну инфо коцкицу
Comment[sr@Latn]=Opis interfejsa koji ste izabrali za gornju desnu info kockicu
diff --git a/kcontrol/componentchooser/browserconfig_ui.ui b/kcontrol/componentchooser/browserconfig_ui.ui
index 6dd93e40..88672497 100644
--- a/kcontrol/componentchooser/browserconfig_ui.ui
+++ b/kcontrol/componentchooser/browserconfig_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>BrowserConfig_UI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -70,7 +70,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -169,6 +169,6 @@
<slots>
<slot access="protected">selectBrowser()</slot>
</slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index 2da13b52..88fdeb16 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -147,7 +147,7 @@ void CfgEmailClient::load(KConfig *)
kmailCB->setChecked(useKMail);
otherCB->setChecked(!useKMail);
txtEMailClient->setText(emailClient);
- txtEMailClient->setFixedHeight(txtEMailClient->tqsizeHint().height());
+ txtEMailClient->setFixedHeight(txtEMailClient->sizeHint().height());
chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == "true"));
emit changed(false);
@@ -169,9 +169,9 @@ void CfgEmailClient::selectEmailClient()
TQString client = dlg.text();
// get the preferred Terminal Application
- KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
- TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
- preferredTerminal += TQString::tqfromLatin1(" -e ");
+ KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+ TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
+ preferredTerminal += TQString::fromLatin1(" -e ");
int len = preferredTerminal.length();
bool b = client.left(len) == preferredTerminal;
@@ -197,7 +197,7 @@ void CfgEmailClient::save(KConfig *)
pSettings->setSetting(KEMailSettings::ClientTerminal, (chkRunTerminal->isChecked()) ? "true" : "false");
}
- // insure proper permissions -- tqcontains sensitive data
+ // insure proper permissions -- contains sensitive data
TQString cfgName(KGlobal::dirs()->findResource("config", "emails"));
if (!cfgName.isEmpty())
::chmod(TQFile::encodeName(cfgName), 0600);
@@ -393,7 +393,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it)));
}
- ServiceChooser->setFixedWidth(ServiceChooser->tqsizeHint().width());
+ ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width());
ServiceChooser->sort();
connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*)));
ServiceChooser->setSelected(0,true);
@@ -410,7 +410,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available")));
- ComponentDescription->setMinimumSize(ComponentDescription->tqsizeHint());
+ ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
TQString cfgType=cfg.readEntry("configurationType");
@@ -461,7 +461,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
delete configWidget;
configWidget=newConfigWidget;
connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool)));
- configContainer->setMinimumSize(configWidget->tqsizeHint());
+ configContainer->setMinimumSize(configWidget->sizeHint());
}
if (configWidget)
diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui
index d872d774..ed1ed7f7 100644
--- a/kcontrol/componentchooser/componentchooser_ui.ui
+++ b/kcontrol/componentchooser/componentchooser_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>ComponentChooser_UI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -91,7 +91,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -125,8 +125,8 @@
<include location="global" impldecl="in declaration">klistbox.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klistbox.h</includehint>
</includehints>
diff --git a/kcontrol/componentchooser/componentconfig_ui.ui b/kcontrol/componentchooser/componentconfig_ui.ui
index fd5160ba..d6a7bba8 100644
--- a/kcontrol/componentchooser/componentconfig_ui.ui
+++ b/kcontrol/componentchooser/componentconfig_ui.ui
@@ -26,7 +26,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>91</height>
@@ -58,6 +58,6 @@
<include location="global" impldecl="in declaration">kcombobox.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui
index 79b20478..d4cb4408 100644
--- a/kcontrol/componentchooser/emailclientconfig_ui.ui
+++ b/kcontrol/componentchooser/emailclientconfig_ui.ui
@@ -7,7 +7,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -73,7 +73,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -83,7 +83,7 @@
<string>&lt;ul&gt; &lt;li&gt;%t: Recipient's address&lt;/li&gt; &lt;li&gt;%s: Subject&lt;/li&gt; &lt;li&gt;%c: Carbon Copy (CC)&lt;/li&gt; &lt;li&gt;%b: Blind Carbon Copy (BCC)&lt;/li&gt; &lt;li&gt;%B: Template body text&lt;/li&gt; &lt;li&gt;%A: Attachment &lt;/li&gt; &lt;/ul&gt;</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Press this button to select your favorite email client. Please note that the file you select has to have the executable attribute set in order to be accepted.&lt;br&gt; You can also use several placeholders which will be tqreplaced with the actual values when the email client is called:&lt;ul&gt; &lt;li&gt;%t: Recipient's address&lt;/li&gt; &lt;li&gt;%s: Subject&lt;/li&gt; &lt;li&gt;%c: Carbon Copy (CC)&lt;/li&gt; &lt;li&gt;%b: Blind Carbon Copy (BCC)&lt;/li&gt; &lt;li&gt;%B: Template body text&lt;/li&gt; &lt;li&gt;%A: Attachment &lt;/li&gt; &lt;/ul&gt;</string>
+ <string>Press this button to select your favorite email client. Please note that the file you select has to have the executable attribute set in order to be accepted.&lt;br&gt; You can also use several placeholders which will be replaced with the actual values when the email client is called:&lt;ul&gt; &lt;li&gt;%t: Recipient's address&lt;/li&gt; &lt;li&gt;%s: Subject&lt;/li&gt; &lt;li&gt;%c: Carbon Copy (CC)&lt;/li&gt; &lt;li&gt;%b: Blind Carbon Copy (BCC)&lt;/li&gt; &lt;li&gt;%B: Template body text&lt;/li&gt; &lt;li&gt;%A: Attachment &lt;/li&gt; &lt;/ul&gt;</string>
</property>
</widget>
<widget class="QToolButton">
@@ -126,7 +126,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>16</height>
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>16</height>
@@ -182,7 +182,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>16</height>
@@ -231,6 +231,6 @@
<slots>
<slot access="protected">selectEmailClient()</slot>
</slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
index abebae59..7d355fdd 100644
--- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
+++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>TerminalEmulatorConfig_UI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>87</height>
@@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -120,7 +120,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -189,6 +189,6 @@
<slots>
<slot access="protected">selectTerminalApp()</slot>
</slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/crypto/certgen.ui b/kcontrol/crypto/certgen.ui
index cbffdf87..19ee0553 100644
--- a/kcontrol/crypto/certgen.ui
+++ b/kcontrol/crypto/certgen.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>D_GenCert</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>TextLabel2</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>40</y>
@@ -41,7 +41,7 @@
<property name="name">
<cstring>TextLabel3</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>100</y>
@@ -57,7 +57,7 @@
<property name="name">
<cstring>TextLabel4</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>130</y>
@@ -73,7 +73,7 @@
<property name="name">
<cstring>T_CertType</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>10</y>
@@ -89,7 +89,7 @@
<property name="name">
<cstring>TextLabel2_2</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>70</y>
@@ -105,7 +105,7 @@
<property name="name">
<cstring>TextLabel5</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>160</y>
@@ -121,7 +121,7 @@
<property name="name">
<cstring>TextLabel6</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>190</y>
@@ -137,7 +137,7 @@
<property name="name">
<cstring>TextLabel7</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>220</y>
@@ -153,7 +153,7 @@
<property name="name">
<cstring>TextLabel8</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>250</y>
@@ -169,7 +169,7 @@
<property name="name">
<cstring>L_CertType</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>10</y>
@@ -182,7 +182,7 @@
<property name="name">
<cstring>LineEdit3</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>100</y>
@@ -198,7 +198,7 @@
<property name="name">
<cstring>TextLabel9</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>280</y>
@@ -214,7 +214,7 @@
<property name="name">
<cstring>LineEdit4_2_2_2</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>220</y>
@@ -230,7 +230,7 @@
<property name="name">
<cstring>LineEdit4_2_2_2_2</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>250</y>
@@ -246,7 +246,7 @@
<property name="name">
<cstring>LineEdit4_2_2_2_3</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>280</y>
@@ -262,7 +262,7 @@
<property name="name">
<cstring>E_Passphrase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>40</y>
@@ -281,7 +281,7 @@
<property name="name">
<cstring>E_Passphrase_2</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>70</y>
@@ -300,7 +300,7 @@
<property name="name">
<cstring>TextLabel10</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>10</x>
<y>310</y>
@@ -316,7 +316,7 @@
<property name="name">
<cstring>SpinBox1</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>310</y>
@@ -338,7 +338,7 @@
<property name="name">
<cstring>TextLabel11</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>320</x>
<y>40</y>
@@ -354,7 +354,7 @@
<property name="name">
<cstring>CheckBox1</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>320</x>
<y>10</y>
@@ -373,7 +373,7 @@
<property name="name">
<cstring>TextLabel12</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>320</x>
<y>70</y>
@@ -389,7 +389,7 @@
<property name="name">
<cstring>LineEdit19</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>380</x>
<y>70</y>
@@ -402,7 +402,7 @@
<property name="name">
<cstring>LineEdit4_2_2</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>190</y>
@@ -418,7 +418,7 @@
<property name="name">
<cstring>LineEdit4_2</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>160</y>
@@ -434,7 +434,7 @@
<property name="name">
<cstring>ComboBox2</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>380</x>
<y>40</y>
@@ -447,7 +447,7 @@
<property name="name">
<cstring>CheckBox2</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>320</x>
<y>100</y>
@@ -463,7 +463,7 @@
<property name="name">
<cstring>TextLabel13</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>320</x>
<y>130</y>
@@ -479,7 +479,7 @@
<property name="name">
<cstring>ComboBox5</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>400</x>
<y>130</y>
@@ -492,7 +492,7 @@
<property name="name">
<cstring>LineEdit4</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>180</x>
<y>130</y>
@@ -508,6 +508,6 @@
<includes>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index 4194fdae..d39c0975 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -128,7 +128,7 @@ OtherCertItem::OtherCertItem( TQListView *view, const TQString& sub, const TQStr
m_module = module;
KSSLX509Map cert(sub);
setText(0, cert.getValue("O"));
- setText(1, cert.getValue("CN").tqreplace("\n", ", "));
+ setText(1, cert.getValue("CN").replace("\n", ", "));
if (_exp.date().year() > 3000 || _exp.date().year() < 1900)
_exp.setDate(TQDate(3000,1,1));
@@ -151,7 +151,7 @@ YourCertItem::YourCertItem( TQListView *view, TQString pkcs, TQString pass, TQSt
{
m_module = module;
KSSLX509Map cert(name);
- TQString tmp = cert.getValue("CN").tqreplace("\n", ", ");
+ TQString tmp = cert.getValue("CN").replace("\n", ", ");
setText(0, tmp);
setText(1, cert.getValue("Email"));
_pkcs = pkcs;
@@ -180,10 +180,10 @@ KSSLX509Map mcert(name);
TQString tmp;
setText(0, mcert.getValue("O"));
tmp = mcert.getValue("OU");
- tmp.tqreplace("\n", ", ");
+ tmp.replace("\n", ", ");
setText(1, tmp);
tmp = mcert.getValue("CN");
- tmp.tqreplace("\n", ", ");
+ tmp.replace("\n", ", ");
setText(2, tmp);
_name = name;
_cert = cert;
@@ -269,7 +269,7 @@ TQString whatstr;
grid->addWidget(mUseTLS, 0, 0);
whatstr = i18n("TLS is the newest revision of the SSL protocol."
" It integrates better with other protocols and has"
- " tqreplaced SSL in protocols such as POP3 and SMTP.");
+ " replaced SSL in protocols such as POP3 and SMTP.");
TQWhatsThis::add(mUseTLS, whatstr);
mUseSSLv2 = new TQCheckBox(i18n("Enable SSLv&2"), tabSSL);
@@ -842,7 +842,7 @@ TQString whatstr;
tabs->addTab(tabSSLCOpts, i18n("Validation Options"));
#endif
- tabs->resize(tabs->tqsizeHint());
+ tabs->resize(tabs->sizeHint());
load();
}
@@ -1214,7 +1214,7 @@ void KCryptoConfig::save()
pcerts->sync();
authcfg->sync();
- // insure proper permissions -- tqcontains sensitive data
+ // insure proper permissions -- contains sensitive data
TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults"));
if (!cfgName.isEmpty())
::chmod(TQFile::encodeName(cfgName), 0600);
@@ -1480,7 +1480,7 @@ TQString iss = TQString::null;
TQPalette cspl;
iss = cert->getIssuer();
cspl = validFrom->palette();
- if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+ if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1488,7 +1488,7 @@ TQString iss = TQString::null;
validFrom->setPalette(cspl);
cspl = validUntil->palette();
- if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+ if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1498,7 +1498,7 @@ TQString iss = TQString::null;
validFrom->setText(cert->getNotBefore());
validUntil->setText(cert->getNotAfter());
untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires())
- : KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(Qt::UTC)));
+ : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
untilDate->setEnabled(x && !x->isPermanent());
pHash->setText(cert->getMD5DigestText());
delete cert;
@@ -1587,7 +1587,7 @@ TryImportPassAgain:
i;
i = static_cast<YourCertItem *>(i->nextSibling())) {
if (i->configName() == name) {
- rc = KMessageBox::warningContinueCancel(this, i18n("A certificate with that name already exists. Are you sure that you wish to tqreplace it?"), i18n("SSL"), i18n("Replace"));
+ rc = KMessageBox::warningContinueCancel(this, i18n("A certificate with that name already exists. Are you sure that you wish to replace it?"), i18n("SSL"), i18n("Replace"));
if (rc == KMessageBox::Cancel) {
delete cert;
return;
@@ -1718,7 +1718,7 @@ TQString iss;
TQPalette cspl;
KSSLCertificate *cert = pkcs->getCertificate();
cspl = yValidFrom->palette();
- if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+ if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1726,7 +1726,7 @@ TQString iss;
yValidFrom->setPalette(cspl);
cspl = yValidUntil->palette();
- if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+ if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1758,7 +1758,7 @@ TQString iss;
KSSLCertificate *cert = pkcs->getCertificate();
iss = cert->getIssuer();
cspl = yValidFrom->palette();
- if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+ if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1766,7 +1766,7 @@ TQString iss;
yValidFrom->setPalette(cspl);
cspl = yValidUntil->palette();
- if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+ if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1921,7 +1921,7 @@ void KCryptoConfig::slotCAImport() {
if (certStore) { KOSSL::self()->X509_STORE_free(certStore);
certStore = NULL; }
- if (certtext.tqcontains("-----BEGIN CERTIFICATE-----")) {
+ if (certtext.contains("-----BEGIN CERTIFICATE-----")) {
qf.reset();
certtext = TQString::null;
while (!qf.atEnd()) {
@@ -1929,10 +1929,10 @@ void KCryptoConfig::slotCAImport() {
qf.readLine(xx, qf.size());
certtext += xx;
}
- certtext = certtext.tqreplace("-----BEGIN CERTIFICATE-----", TQString::null);
- certtext = certtext.tqreplace("-----END CERTIFICATE-----", TQString::null);
+ certtext = certtext.replace("-----BEGIN CERTIFICATE-----", TQString::null);
+ certtext = certtext.replace("-----END CERTIFICATE-----", TQString::null);
certtext = certtext.stripWhiteSpace();
- certtext = certtext.tqreplace("\n", TQString::null);
+ certtext = certtext.replace("\n", TQString::null);
} else {
// Must [could?] be DER
qf.close();
@@ -2350,7 +2350,7 @@ SSL_CONST SSL_METHOD *meth;
break;
// Leak of sc*?
TQString scn(sc->name);
- if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) {
+ if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) {
continue;
}
k = SSL_CIPHER_get_bits(sc, &j);
@@ -2378,7 +2378,7 @@ SSL_CONST SSL_METHOD *meth;
break;
// Leak of sc*?
TQString scn(sc->name);
- if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) {
+ if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) {
continue;
}
k = SSL_CIPHER_get_bits(sc, &j);
diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui
index dfcf7768..c3d064b4 100644
--- a/kcontrol/css/cssconfig.ui
+++ b/kcontrol/css/cssconfig.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>CSSConfigDialog</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -12,9 +12,9 @@
<height>195</height>
</rect>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
- <property name="tqlayoutSpacing" stdset="0">
+ <property name="layoutSpacing" stdset="0">
</property>
<property name="whatsThis" stdset="0">
<string>&lt;b&gt;Stylesheets&lt;/b&gt;&lt;p&gt;See http://www.w3.org/Style/CSS for further information on cascading style sheets.&lt;/p&gt;</string>
@@ -87,7 +87,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -141,7 +141,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -157,7 +157,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>451</width>
<height>20</height>
@@ -206,7 +206,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -232,8 +232,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui
index da47ec84..b19e08ba 100644
--- a/kcontrol/css/csscustom.ui
+++ b/kcontrol/css/csscustom.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>CSSCustomDialog</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -243,7 +243,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -273,7 +273,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -315,7 +315,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -412,7 +412,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -429,7 +429,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -446,7 +446,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -463,7 +463,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -545,8 +545,8 @@
<include location="global" impldecl="in declaration">kcolorbutton.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui
index bf1b95fd..438d40d3 100644
--- a/kcontrol/css/preview.ui
+++ b/kcontrol/css/preview.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>PreviewDialog</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -87,8 +87,8 @@ people.&lt;/p&gt;
<include location="global" impldecl="in declaration">kseparator.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kseparator.h</includehint>
</includehints>
diff --git a/kcontrol/css/template.cpp b/kcontrol/css/template.cpp
index 02bcf69e..e237ed79 100644
--- a/kcontrol/css/template.cpp
+++ b/kcontrol/css/template.cpp
@@ -32,7 +32,7 @@ bool CSSTemplate::expand(TQString destname, const TQMap<TQString,TQString> &dict
TQString expr = line.mid(start+1, end-start-1);
TQString res = dict[expr];
- line.tqreplace(start, end-start+1, res);
+ line.replace(start, end-start+1, res);
}
}
os << line << endl;
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 611629fa..848457a4 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>ConfigDialog</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -73,7 +73,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>11</x>
<y>51</y>
@@ -95,7 +95,7 @@
<property name="name">
<cstring>LANButtor</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>11</x>
<y>23</y>
@@ -180,7 +180,7 @@ is configured with 'Browse local network' option above.</string>
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<grid>
<property name="name">
@@ -204,7 +204,7 @@ is configured with 'Browse local network' option above.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>130</width>
<height>21</height>
@@ -264,7 +264,7 @@ is configured with 'Browse local network' option above.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>90</width>
<height>20</height>
@@ -281,7 +281,7 @@ is configured with 'Browse local network' option above.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>90</width>
<height>21</height>
@@ -300,7 +300,7 @@ is configured with 'Browse local network' option above.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>110</height>
@@ -318,7 +318,7 @@ is configured with 'Browse local network' option above.</string>
<includes>
<include location="global" impldecl="in declaration">kcmodule.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcmodule.h</includehint>
<includehint>keditlistbox.h</includehint>
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index f2d9907d..97b532b5 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
else if (getenv("KDESU_USER")!=0) tabs->removePage(tab);
addConfig(DNSSD::Configuration::self(),this);
// it is host-wide setting so it has to be in global config file
- domain = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdnssdrc" ));
+ domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" ));
domain->setGroup("publishing");
load();
connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
@@ -119,12 +119,12 @@ void KCMDnssd::load()
{
if (geteuid()==0) loadMdnsd();
enableZeroconf->setChecked(false);
- TQProcess avahitqStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahitqStatus");
- avahitqStatus.start();
- while (avahitqStatus.isRunning()) {
+ TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
+ avahiStatus.start();
+ while (avahiStatus.isRunning()) {
kapp->processEvents();
}
- int exitStatus = avahitqStatus.exitStatus();
+ int exitStatus = avahiStatus.exitStatus();
if (exitStatus == 0) { // disabled
enableZeroconf->setChecked(false);
} else if (exitStatus == 1) { // enabled
diff --git a/kcontrol/ebrowsing/ebrowsing.desktop b/kcontrol/ebrowsing/ebrowsing.desktop
index 52ebe69b..a0bf4593 100644
--- a/kcontrol/ebrowsing/ebrowsing.desktop
+++ b/kcontrol/ebrowsing/ebrowsing.desktop
@@ -177,7 +177,7 @@ Keywords[ca]=Navegació millorada,Navegació,WWW,Internet,Paraules clau d'Intern
Keywords[cs]=Rozšířené procházení,Procházení,WWW,Internet,Klíčová slova internetu,Internetové filtry,Síť,Zkratky,Vyhledávací stroje
Keywords[csb]=Rozszérzoné przezéranié,przezéranié,WWW,Internet,kluczowé słowa w Internece,filtrë w Internece,séc,szëkôrze,skrodzënë
Keywords[cy]=Pori Uchel,Pori,WWW,Rhyngrwyd,Allweddair Rhyngrwyd,Hidl Rhyngrwyd,Rhwydwaith,Peiriannau Chwilio,Llwybrau Byr
-Keywords[da]=Udvidet netsøgning,Netsøgning,www,Internet,Internet-nøgleord,Internet-filtre,Søgetqmaskiner,Genveje
+Keywords[da]=Udvidet netsøgning,Netsøgning,www,Internet,Internet-nøgleord,Internet-filtre,Søgemaskiner,Genveje
Keywords[de]=Browsen,Erweitertes Browsen,WWW,Internet,Stichwörter,Filter,Netz,Internetfilter,Suchmaschinen,Kurzbefehle,Netzwerk
Keywords[el]=Εμπλουτισμένη περιήγηση,Περιήγηση,WWW,Διαδίκτυο,Λέξεις κλειδιά διαδικτύου,Φίλτρα διαδικτύου,Δίκτυο,Μηχανές αναζήτησης,Συντομεύσεις
Keywords[eo]=progresintoj,TTT,krozado,WWW,Interreto,filtrilo,reto,serĉiloj,mallongigoj
diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp
index f6e5efc4..a41ab92e 100644
--- a/kcontrol/ebrowsing/main.cpp
+++ b/kcontrol/ebrowsing/main.cpp
@@ -56,7 +56,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
" Even easier: just press Alt+F2 (if you have not"
" changed this shortcut) and enter the shortcut in the KDE Run Command dialog."));
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
#if 0
opts = new FilterOptions(this);
@@ -95,10 +95,10 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
else if (modules.count() == 1)
{
widget = modules.first();
- tqlayout->setMargin(-KDialog::marginHint());
+ layout->setMargin(-KDialog::marginHint());
}
- tqlayout->addWidget(widget);
+ layout->addWidget(widget);
}
void KURIFilterModule::load()
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
index 302bdf21..fdeeb27c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>FilterOptionsUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -34,7 +34,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<grid>
<property name="name">
@@ -161,7 +161,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>170</height>
@@ -254,5 +254,5 @@ Select the search engine to use for input boxes that provide automatic lookup se
<tabstop>cmbDefaultEngine</tabstop>
<tabstop>cmbDelimiter</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index 3f96f90e..9f3a245f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -149,11 +149,11 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
TQString s = userquery.mid (pos, qsexpr.matchedLength());
while ((i = s.find(" ")) != -1)
{
- s = s.tqreplace (i, 1, "%20");
+ s = s.replace (i, 1, "%20");
n++;
}
start = pos + qsexpr.matchedLength() + 2*n; // Move after last quote
- userquery = userquery.tqreplace (pos, qsexpr.matchedLength(), s);
+ userquery = userquery.replace (pos, qsexpr.matchedLength(), s);
}
}
@@ -164,10 +164,10 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
{
int i = 0;
while ((i = userquery.find("%20")) != -1)
- userquery = userquery.tqreplace(i, 3, " ");
+ userquery = userquery.replace(i, 3, " ");
for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it )
- *it = (*it).tqreplace("%20", " ");
+ *it = (*it).replace("%20", " ");
}
PIDDBG << "Generating substitution map:\n";
@@ -188,10 +188,10 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
// Back-substitute quoted strings (%20 -> " "):
while ((j = v.find("%20")) != -1)
- v = v.tqreplace(j, 3, " ");
+ v = v.replace(j, 3, " ");
// Insert partial queries (referenced by \1 ... \n) to map:
- map.tqreplace(TQString::number(i), v);
+ map.replace(TQString::number(i), v);
PDVAR (" map['" + nr + "']", map[nr]);
// Insert named references (referenced by \name) to map:
@@ -202,8 +202,8 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
TQString k = v.left(pos);
// Back-substitute references contained in references (e.g. '\refname' substitutes to 'thisquery=\0')
- while ((j = s.find("%5C")) != -1) s = s.tqreplace(j, 3, "\\");
- map.tqreplace(k, s);
+ while ((j = s.find("%5C")) != -1) s = s.replace(j, 3, "\\");
+ map.replace(k, s);
PDVAR (" map['" + k + "']", map[k]);
}
}
@@ -228,15 +228,15 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
TQStringList ql = modifySubstitutionMap (map, userquery);
int count = ql.count();
- // Check, if old style '\1' is found and tqreplace it with \{@} (compatibility mode):
+ // Check, if old style '\1' is found and replace it with \{@} (compatibility mode):
{
int pos = -1;
if ((pos = newurl.find("\\1")) >= 0)
{
PIDDBG << "WARNING: Using compatibility mode for newurl='" << newurl
- << "'. Please tqreplace old style '\\1' with new style '\\{0}' "
+ << "'. Please replace old style '\\1' with new style '\\{0}' "
"in the query definition.\n";
- newurl = newurl.tqreplace(pos, 2, "\\{@}");
+ newurl = newurl.replace(pos, 2, "\\{@}");
}
}
@@ -307,7 +307,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
v = encodeString(s, encodingMib);
PDVAR (" default", s);
}
- else if (map.tqcontains(rlitem))
+ else if (map.contains(rlitem))
{
// Use value from substitution map:
found = true;
@@ -341,7 +341,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
// Encode '+', otherwise it would be interpreted as space in the resulting url:
int vpos = 0;
while ((vpos = v.find('+')) != -1)
- v = v.tqreplace (vpos, 1, "%2B");
+ v = v.replace (vpos, 1, "%2B");
}
else if (rlitem == "@")
@@ -353,7 +353,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
i++;
}
- newurl = newurl.tqreplace(pos, reflist.matchedLength(), v);
+ newurl = newurl.replace(pos, reflist.matchedLength(), v);
}
// Special handling for \{@};
@@ -371,7 +371,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
// Substitute \{@} with list of unmatched query strings
int vpos = 0;
while ((vpos = newurl.find("\\@")) != -1)
- newurl = newurl.tqreplace (vpos, 2, v);
+ newurl = newurl.replace (vpos, 2, v);
}
}
@@ -395,7 +395,7 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url,
bool /* isMalformed */,
SubstMap& map ) const
{
- // Return nothing if userquery is empty and it tqcontains
+ // Return nothing if userquery is empty and it contains
// substitution strings...
if (query.isEmpty() && url.find(TQRegExp(TQRegExp::escape("\\{"))) > 0)
return TQString::null;
@@ -427,13 +427,13 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url,
PDVAR ("query definition", url);
// Add charset indicator for the query to substitution map:
- map.tqreplace("ikw_charset", cseta);
+ map.replace("ikw_charset", cseta);
// Add charset indicator for the fallback query to substitution map:
TQString csetb = cset2;
if (csetb.isEmpty())
csetb = "iso-8859-1";
- map.tqreplace("wsc_charset", csetb);
+ map.replace("wsc_charset", csetb);
TQString newurl = substituteQuery (url, map, userquery, csetacodec->mibEnum());
@@ -446,7 +446,7 @@ void KURISearchFilterEngine::loadConfig()
{
// Migrate from the old format, this block should remain until
// we can assume "every" user has upgraded to a KDE version that
- // tqcontains the sycoca based search provider configuration (malte).
+ // contains the sycoca based search provider configuration (malte).
// TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time...
{
KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc");
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop b/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop
index b9c60f2a..35bb3242 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop
@@ -13,7 +13,7 @@ Comment[ca]=Motor de recerca
Comment[cs]=Vyhledávací stroj
Comment[csb]=Szëkôrz
Comment[cy]=Peiriant Chwilio
-Comment[da]=Søgetqmaskine
+Comment[da]=Søgemaskine
Comment[de]=Suchmaschine
Comment[el]=Μηχανή αναζήτησης
Comment[eo]=Serĉilo
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
index ab28f7e3..1a507c0f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>SearchProviderDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -127,7 +127,7 @@ Recommended is \{@}, since it removes all query variables (name=value) from the
<tabstop>leShortcut</tabstop>
<tabstop>cbCharset</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
index cdc3590f..2e104f15 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
@@ -11,7 +11,7 @@ Name[ca]=Mamma - La mare de tots els motors de recerca
Name[cs]=Mamma
Name[csb]=Mamma - mëmka wszëstczich szëkôrzów
Name[cy]=Mamma - Mam holl Beiriannau Chwilio
-Name[da]=Mamma - moderen til alle søgetqmaskiner
+Name[da]=Mamma - moderen til alle søgemaskiner
Name[de]=Mamma - Die Mutter aller Suchmaschinen
Name[el]=Mamma - Η μητέρα όλων των μηχανών αναζήτησης
Name[eo]=Mamma - Patrino de ĉiuj retserĉiloj
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
index 761a2095..7abbad0e 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
@@ -26,7 +26,7 @@ Name[he]=חיפוש ספר של ספר טלפונים
Name[hi]=टेलिफोनबुक खोज प्रदायक
Name[hr]=Davatelj usluge pretraživanja imenika
Name[hu]=Telefonkönyv (NL)
-Name[is]=Leitarvél fyrir sítqmaskrár
+Name[is]=Leitarvél fyrir símaskrár
Name[it]=Motore di ricerca Elencotelefonico
Name[ja]=Telephonebook 検索プロバイダ
Name[km]=អ្នក​ផ្ដល់​សេវា​ស្វែងរក​សៀវភៅ​លេខ​ទូរស័ព្ទ
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index 94565719..f0986c18 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -41,7 +41,7 @@ LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name,
: KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ),
DCOPObject( "LocalDomainURIFilterIface" ),
last_time( 0 ),
- m_hostPortPattern( TQString::tqfromLatin1(HOSTPORT_PATTERN) )
+ m_hostPortPattern( TQString::fromLatin1(HOSTPORT_PATTERN) )
{
configure();
}
@@ -56,7 +56,7 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const
if( m_hostPortPattern.exactMatch( cmd ) &&
isLocalDomainHost( cmd ) )
{
- cmd.prepend( TQString::tqfromLatin1("http://") );
+ cmd.prepend( TQString::fromLatin1("http://") );
setFilteredURI( data, KURL( cmd ) );
setURIType( data, KURIFilterData::NET_PROTOCOL );
@@ -76,7 +76,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
if( !(host == last_host && last_time > time( NULL ) - 5 ) ) {
- TQString helper = KStandardDirs::findExe(TQString::tqfromLatin1( "klocaldomainurifilterhelper" ));
+ TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" ));
if( helper.isEmpty())
return last_result = false;
@@ -95,7 +95,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
last_result = proc.wait( 1 ) && proc.normalExit() && !proc.exitStatus();
if( !m_fullname.isEmpty() )
- cmd.tqreplace( 0, host.length(), m_fullname );
+ cmd.replace( 0, host.length(), m_fullname );
}
return last_result;
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
index 4f646409..9d15802f 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
@@ -43,7 +43,7 @@
#define IPv6_PATTERN "^\\[.*\\]"
#define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*"
-#define QFL1(x) TQString::tqfromLatin1(x)
+#define QFL1(x) TQString::fromLatin1(x)
/**
* IMPORTANT:
@@ -66,7 +66,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
// Match FQDN_PATTERN
exp.setPattern( QFL1(FQDN_PATTERN) );
- if ( cmd.tqcontains( exp ) )
+ if ( cmd.contains( exp ) )
{
if (verbose)
kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
@@ -85,7 +85,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
// Match IPv4 addresses
exp.setPattern( QFL1(IPv4_PATTERN) );
- if ( cmd.tqcontains( exp ) )
+ if ( cmd.contains( exp ) )
{
if (verbose)
kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
@@ -95,7 +95,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
// Match IPv6 addresses
exp.setPattern( QFL1(IPv6_PATTERN) );
- if ( cmd.tqcontains( exp ) )
+ if ( cmd.contains( exp ) )
{
if (verbose)
kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
@@ -164,13 +164,13 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
if (!isMalformed &&
(url.protocol().length() == 4) &&
- (url.protocol() != TQString::tqfromLatin1("http")) &&
+ (url.protocol() != TQString::fromLatin1("http")) &&
(url.protocol()[0]=='h') &&
(url.protocol()[1]==url.protocol()[2]) &&
(url.protocol()[3]=='p'))
{
// Handle "encrypted" URLs like: h++p://www.kde.org
- url.setProtocol( TQString::tqfromLatin1("http"));
+ url.setProtocol( TQString::fromLatin1("http"));
setFilteredURI( data, url);
setURIType( data, KURIFilterData::NET_PROTOCOL );
return true;
@@ -210,11 +210,11 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
}
// Detect UNC style (aka windows SMB) URLs
- if ( cmd.startsWith( TQString::tqfromLatin1( "\\\\") ) )
+ if ( cmd.startsWith( TQString::fromLatin1( "\\\\") ) )
{
// make sure path is unix style
- cmd.tqreplace('\\', '/');
- cmd.prepend( TQString::tqfromLatin1( "smb:" ) );
+ cmd.replace('\\', '/');
+ cmd.prepend( TQString::fromLatin1( "smb:" ) );
setFilteredURI( data, KURL( cmd ));
setURIType( data, KURIFilterData::NET_PROTOCOL );
return true;
@@ -262,7 +262,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
slashPos = path.length();
if( slashPos == 1 ) // ~/
{
- path.tqreplace ( 0, 1, TQDir::homeDirPath() );
+ path.replace ( 0, 1, TQDir::homeDirPath() );
}
else // ~username/
{
@@ -270,7 +270,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
struct passwd *dir = getpwnam(user.local8Bit().data());
if( dir && strlen(dir->pw_dir) )
{
- path.tqreplace (0, slashPos, TQString::fromLocal8Bit(dir->pw_dir));
+ path.replace (0, slashPos, TQString::fromLocal8Bit(dir->pw_dir));
}
else
{
@@ -293,7 +293,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
const char* exp = getenv( path.mid( 1, r.matchedLength() - 1 ).local8Bit().data() );
if(exp)
{
- path.tqreplace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) );
+ path.replace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) );
expanded = true;
}
}
@@ -379,7 +379,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
u.setRef(ref);
u.setQuery(query);
- if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u))
+ if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
{
// No authorisation, we pretend it's a file will get
// an access denied error later on.
@@ -453,7 +453,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
// Okay this is the code that allows users to supply custom matches for
// specific URLs using Qt's regexp class. This is hard-coded for now.
// TODO: Make configurable at some point...
- if ( !cmd.tqcontains( ' ' ) )
+ if ( !cmd.contains( ' ' ) )
{
TQValueList<URLHint>::ConstIterator it;
for( it = m_urlHints.begin(); it != m_urlHints.end(); ++it )
@@ -492,7 +492,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
u.setPath(path);
u.setRef(ref);
- if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u))
+ if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
{
// No authorisation, we pretend it exists and will get
// an access denied error later on.
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 1ca4b48a..1d024191 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -50,7 +50,7 @@
#include <X11/Xmd.h>
extern "C" {
#include <X11/extensions/dpms.h>
-tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * );
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
Bool DPMSCapable( Display * );
int __kde_do_not_unload = 1;
@@ -59,7 +59,7 @@ Bool DPMSCapable ( Display * );
#endif
#ifndef HAVE_DPMSINFO_PROTO
-tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * );
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
#endif
}
@@ -67,8 +67,8 @@ tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * );
extern "C" {
#endif
Bool DPMSQueryExtension(Display *, int *, int *);
- tqStatus DPMSEnable(Display *);
- tqStatus DPMSDisable(Display *);
+ Status DPMSEnable(Display *);
+ Status DPMSDisable(Display *);
Bool DPMSGetTimeouts(Display *, CARD16 *, CARD16 *, CARD16 *);
Bool DPMSSetTimeouts(Display *, CARD16, CARD16, CARD16);
#if defined(XIMStringConversionRetrival) || defined (__sun) || defined(__hpux)
diff --git a/kcontrol/energy/energy.desktop b/kcontrol/energy/energy.desktop
index 2293bf6c..bf856866 100644
--- a/kcontrol/energy/energy.desktop
+++ b/kcontrol/energy/energy.desktop
@@ -143,7 +143,7 @@ Comment[nl]=Instellingen voor energiebesparing voor monitors/displays
Comment[nn]=Innstillingar for straumkontroll av skjerm
Comment[nso]=Dipeakanyo tsa taolo ya matla a pontsho
Comment[pa]=ਊਰਜਾ ਪਰਬੰਧਨ ਝਲਕ ਲਈ ਸੈਟਿੰਗ
-Comment[pl]=Ustawienia zarządzania tqmocą
+Comment[pl]=Ustawienia zarządzania mocą
Comment[pt]=Configurações para a gestão de energia do ecrã
Comment[pt_BR]= Configurações para o gerenciamento de energia do monitor
Comment[ro]=Setări pentru controlul energiei consumate de monitor
diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp
index 1c5127fc..eb57f50a 100644
--- a/kcontrol/filetypes/filegroupdetails.cpp
+++ b/kcontrol/filetypes/filegroupdetails.cpp
@@ -27,12 +27,12 @@
FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
- TQWidget * tqparentWidget = this;
- TQVBoxLayout *secondLayout = new TQVBoxLayout(tqparentWidget,
+ TQWidget * parentWidget = this;
+ TQVBoxLayout *secondLayout = new TQVBoxLayout(parentWidget,
0, KDialog::spacingHint());
- m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), tqparentWidget );
- m_autoEmbed->tqlayout()->setSpacing( KDialog::spacingHint() );
+ m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), parentWidget );
+ m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
secondLayout->addWidget( m_autoEmbed );
// The order of those two items is very important. If you change it, fix typeslistitem.cpp !
new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
diff --git a/kcontrol/filetypes/filegroupdetails.h b/kcontrol/filetypes/filegroupdetails.h
index c5724186..bb4d15bd 100644
--- a/kcontrol/filetypes/filegroupdetails.h
+++ b/kcontrol/filetypes/filegroupdetails.h
@@ -23,7 +23,7 @@ class TypesListItem;
class TQButtonGroup;
/**
- * This widget tqcontains the details for a filetype group.
+ * This widget contains the details for a filetype group.
* Currently this only involves the embedding configuration.
*/
class FileGroupDetails : public QWidget
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index ffa6ff01..a678e0eb 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -52,7 +52,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
grid->setRowStretch(1, 1);
grid->setRowStretch(2, 0);
- TQWhatsThis::add( extensionLB, i18n("This box tqcontains a list of patterns that can be"
+ TQWhatsThis::add( extensionLB, i18n("This box contains a list of patterns that can be"
" used to identify files of the selected type. For example, the pattern *.txt is"
" associated with the file type 'text/plain'; all files ending in '.txt' are recognized"
" as plain text files.") );
@@ -97,10 +97,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
KDialog::spacingHint());
m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), secondWidget );
- m_autoEmbed->tqlayout()->setSpacing( KDialog::spacingHint() );
+ m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
secondLayout->addWidget( m_autoEmbed, 1 );
- m_autoEmbed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) );
+ m_autoEmbed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) );
// The order of those three items is very important. If you change it, fix typeslistitem.cpp !
new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
@@ -120,7 +120,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
secondLayout->addSpacing(10);
embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget );
- embedServiceListWidget->setMinimumHeight( serviceListWidget->tqsizeHint().height() );
+ embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() );
connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
secondLayout->addWidget(embedServiceListWidget, 3);
@@ -241,8 +241,8 @@ void FileTypeDetails::updateAskSave()
mime->is( "text/xml" ) ||
mime->is( "inode/directory" ) ||
mimeType.startsWith( "image" ) ||
- mime->is( "multipart/x-mixed-tqreplace" ) ||
- mime->is( "multipart/tqreplace" ) ||
+ mime->is( "multipart/x-mixed-replace" ) ||
+ mime->is( "multipart/replace" ) ||
mimeType.startsWith( "print" ) )
{
neverAsk = true;
diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h
index c774d677..b364d919 100644
--- a/kcontrol/filetypes/filetypedetails.h
+++ b/kcontrol/filetypes/filetypedetails.h
@@ -13,7 +13,7 @@ class TQPushButton;
class KServiceListWidget;
/**
- * This widget tqcontains the right part of the file type configuration
+ * This widget contains the right part of the file type configuration
* dialog, that shows the details for a file type.
* It is implemented as a separate class so that it can be used by
* the keditfiletype program to show the details of a single mimetype.
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index d9d1f813..ad60fc3d 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -126,7 +126,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
// Widget shown on startup
m_emptyWidget = new TQLabel( i18n("Select a file type by name or by extension"), m_widgetStack);
- m_emptyWidget->tqsetAlignment(AlignCenter);
+ m_emptyWidget->setAlignment(AlignCenter);
m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ );
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index e2429e66..8ff08d15 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -69,7 +69,7 @@ void TypesListItem::initMeta( const TQString & major )
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
bool defaultValue = defaultEmbeddingSetting( major );
- m_autoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
+ m_autoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
}
bool TypesListItem::defaultEmbeddingSetting( const TQString& major )
@@ -230,7 +230,7 @@ bool TypesListItem::isDirty() const
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
bool defaultValue = defaultEmbeddingSetting(m_major);
- unsigned int oldAutoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
+ unsigned int oldAutoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
if ( m_autoEmbed != oldAutoEmbed )
return true;
}
@@ -249,7 +249,7 @@ void TypesListItem::sync()
{
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
- config->writeEntry( TQString::tqfromLatin1("embed-")+m_major, m_autoEmbed == 0 );
+ config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 );
return;
}
@@ -286,9 +286,9 @@ void TypesListItem::sync()
config.writeEntry("Hidden", false);
if ( m_autoEmbed == 2 )
- config.deleteEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), false );
+ config.deleteEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), false );
else
- config.writeEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
+ config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
m_bNewItem = false;
}
@@ -343,18 +343,18 @@ void TypesListItem::sync()
continue; // Only those which were added in init()
// Look in the correct list...
- if ( (isApplication && ! m_appServices.tqcontains( pService->desktopEntryPath() ))
- || (!isApplication && !m_embedServices.tqcontains( pService->desktopEntryPath() ))
+ if ( (isApplication && ! m_appServices.contains( pService->desktopEntryPath() ))
+ || (!isApplication && !m_embedServices.contains( pService->desktopEntryPath() ))
) {
// The service was in m_appServices but has been removed
// create a new .desktop file without this mimetype
if( s_changedServices == NULL )
deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
- TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
+ TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes();
- if ( mimeTypeList.tqcontains( name() ) ) {
+ if ( mimeTypeList.contains( name() ) ) {
// The mimetype is listed explicitly in the .desktop files, so
// just remove it and we're done
KConfig *desktop;
@@ -370,7 +370,7 @@ void TypesListItem::sync()
}
desktop->setDesktopGroup();
- mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
+ mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';');
// Remove entry and the number that might follow.
@@ -438,7 +438,7 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop)
if( s_changedServices == NULL )
deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
- TQStringList mimeTypeList = s_changedServices->tqcontains( s->desktopEntryPath())
+ TQStringList mimeTypeList = s_changedServices->contains( s->desktopEntryPath())
? (*s_changedServices)[ s->desktopEntryPath() ] : s->serviceTypes();
for(TQStringList::ConstIterator it = mimeTypeList.begin();
@@ -477,10 +477,10 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons
// merge new mimetype
if( s_changedServices == NULL )
deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
- TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
+ TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes();
- if (!mimeTypeList.tqcontains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList))
+ if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList))
{
KConfig *desktop;
if ( pService->type() == TQString("Service") )
@@ -495,7 +495,7 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons
}
desktop->setDesktopGroup();
- mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
+ mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';');
mimeTypeList.append(name());
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index ab70526a..b082cf1f 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -220,21 +220,21 @@ FontAASettings::FontAASettings(TQWidget *parent)
changesMade(false)
{
TQWidget *mw=new TQWidget(this);
- TQGridLayout *tqlayout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint());
+ TQGridLayout *layout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint());
excludeRange=new TQCheckBox(i18n("E&xclude range:"), mw),
- tqlayout->addWidget(excludeRange, 0, 0);
+ layout->addWidget(excludeRange, 0, 0);
excludeFrom=new KDoubleNumInput(0, 72, 8.0, 1, 1, mw),
excludeFrom->setSuffix(i18n(" pt"));
- tqlayout->addWidget(excludeFrom, 0, 1);
+ layout->addWidget(excludeFrom, 0, 1);
excludeToLabel=new TQLabel(i18n(" to "), mw);
- tqlayout->addWidget(excludeToLabel, 0, 2);
+ layout->addWidget(excludeToLabel, 0, 2);
excludeTo=new KDoubleNumInput(0, 72, 15.0, 1, 1, mw);
excludeTo->setSuffix(i18n(" pt"));
- tqlayout->addWidget(excludeTo, 0, 3);
+ layout->addWidget(excludeTo, 0, 3);
useSubPixel=new TQCheckBox(i18n("&Use sub-pixel hinting:"), mw);
- tqlayout->addWidget(useSubPixel, 1, 0);
+ layout->addWidget(useSubPixel, 1, 0);
TQWhatsThis::add(useSubPixel, i18n("If you have a TFT or LCD screen you"
" can further improve the quality of displayed fonts by selecting"
@@ -242,7 +242,7 @@ FontAASettings::FontAASettings(TQWidget *parent)
"<br><b>This will not work with CRT monitors.</b>"));
subPixelType=new TQComboBox(false, mw);
- tqlayout->addMultiCellWidget(subPixelType, 1, 1, 1, 3);
+ layout->addMultiCellWidget(subPixelType, 1, 1, 1, 3);
TQWhatsThis::add(subPixelType, i18n("In order for sub-pixel hinting to"
" work correctly you need to know how the sub-pixels of your display"
@@ -256,9 +256,9 @@ FontAASettings::FontAASettings(TQWidget *parent)
#ifdef HAVE_FONTCONFIG
TQLabel *hintingLabel=new TQLabel(i18n("Hinting style: "), mw);
- tqlayout->addWidget(hintingLabel, 2, 0);
+ layout->addWidget(hintingLabel, 2, 0);
hintingStyle=new TQComboBox(false, mw);
- tqlayout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3);
+ layout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3);
for(int s=KXftConfig::Hint::NotSet+1; s<=KXftConfig::Hint::Full; ++s)
hintingStyle->insertItem(KXftConfig::description((KXftConfig::Hint::Style)s));
@@ -560,11 +560,11 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
<< i18n("Used by the taskbar.")
<< i18n("Used for desktop icons.");
- TQVBoxLayout * tqlayout =
+ TQVBoxLayout * layout =
new TQVBoxLayout(this, 0, KDialog::spacingHint());
TQGridLayout * fontUseLayout =
- new TQGridLayout(tqlayout, nameGroupKeyRc.count() / 4, 3);
+ new TQGridLayout(layout, nameGroupKeyRc.count() / 4, 3);
fontUseLayout->setColStretch(0, 0);
fontUseLayout->setColStretch(1, 1);
@@ -607,16 +607,16 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
++count;
}
- TQHBoxLayout *hblay = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+ TQHBoxLayout *hblay = new TQHBoxLayout(layout, KDialog::spacingHint());
hblay->addStretch();
TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this);
TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts"));
hblay->addWidget( fontAdjustButton );
connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff()));
- tqlayout->addSpacing(KDialog::spacingHint());
+ layout->addSpacing(KDialog::spacingHint());
- TQGridLayout* lay = new TQGridLayout(tqlayout, 2, 4, KDialog::spacingHint());
+ TQGridLayout* lay = new TQGridLayout(layout, 2, 4, KDialog::spacingHint());
lay->setColStretch( 3, 10 );
TQLabel* label = new TQLabel( i18n( "Use a&nti-aliasing:" ), this );
lay->addWidget( label, 0, 0 );
@@ -655,7 +655,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
connect( comboForceDpi, TQT_SIGNAL( activated( int )), TQT_SLOT( changed()));
lay->addWidget( comboForceDpi, 1, 1 );
- tqlayout->addStretch(1);
+ layout->addStretch(1);
aaSettings=new FontAASettings(this);
diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp
index 4718e8fd..682672a7 100644
--- a/kcontrol/fonts/kxftconfig.cpp
+++ b/kcontrol/fonts/kxftconfig.cpp
@@ -52,7 +52,7 @@ TQString KXftConfig::contractHome(TQString path)
unsigned int len = home.length();
if(path.length() == len || path[len] == '/')
- return path.tqreplace(0, len, TQString::tqfromLatin1("~"));
+ return path.replace(0, len, TQString::fromLatin1("~"));
}
}
@@ -62,7 +62,7 @@ TQString KXftConfig::contractHome(TQString path)
TQString KXftConfig::expandHome(TQString path)
{
if(!path.isEmpty() && '~'==path[0])
- return 1==path.length() ? TQDir::homeDirPath() : path.tqreplace(0, 1, TQDir::homeDirPath());
+ return 1==path.length() ? TQDir::homeDirPath() : path.replace(0, 1, TQDir::homeDirPath());
return path;
}
@@ -88,7 +88,7 @@ static TQString dirSyntax(const TQString &d)
{
TQString ds(d);
- ds.tqreplace("//", "/");
+ ds.replace("//", "/");
int slashPos=ds.findRev('/');
@@ -648,10 +648,10 @@ bool KXftConfig::apply()
if(0!=str.find("<?xml"))
str.insert(0, xmlHeader);
else if(0==str.find(qtXmlHeader))
- str.tqreplace(0, strlen(qtXmlHeader), xmlHeader);
+ str.replace(0, strlen(qtXmlHeader), xmlHeader);
if(-1!=(idx=str.find(qtDocTypeLine)))
- str.tqreplace(idx, strlen(qtDocTypeLine), docTypeLine);
+ str.replace(idx, strlen(qtDocTypeLine), docTypeLine);
//
// Write to file...
@@ -1291,7 +1291,7 @@ void KXftConfig::applySubPixelType()
if(m_subPixel.node.isNull())
m_doc.documentElement().appendChild(matchNode);
else
- m_doc.documentElement().tqreplaceChild(matchNode, m_subPixel.node);
+ m_doc.documentElement().replaceChild(matchNode, m_subPixel.node);
m_subPixel.node=matchNode;
}
@@ -1323,7 +1323,7 @@ void KXftConfig::applyHintStyle()
if(m_hint.node.isNull())
m_doc.documentElement().appendChild(matchNode);
else
- m_doc.documentElement().tqreplaceChild(matchNode, m_hint.node);
+ m_doc.documentElement().replaceChild(matchNode, m_hint.node);
m_hint.node=matchNode;
}
}
@@ -1344,7 +1344,7 @@ void KXftConfig::applyHinting()
if(m_hinting.node.isNull())
m_doc.documentElement().appendChild(matchNode);
else
- m_doc.documentElement().tqreplaceChild(matchNode, m_hinting.node);
+ m_doc.documentElement().replaceChild(matchNode, m_hinting.node);
m_hinting.node=matchNode;
}
diff --git a/kcontrol/fonts/kxftconfig.h b/kcontrol/fonts/kxftconfig.h
index e78358eb..cb5cd71f 100644
--- a/kcontrol/fonts/kxftconfig.h
+++ b/kcontrol/fonts/kxftconfig.h
@@ -175,7 +175,7 @@ class KXftConfig
//
// Constructor
- // required - This should be a bittqmask of 'RequiredData', and indicates the data to be
+ // required - This should be a bitmask of 'RequiredData', and indicates the data to be
// read/written to the config file. It is intended that the 'fonts' KControl
// module will use KXftConfig::SubPixelType|KXftConfig::ExcludeRange, and the
// font installer will use KXftConfig::Dirs|KXftConfig::SymbolFamilies.
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 30445b0d..41ddfe8e 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -64,9 +64,9 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KICCCFactory::instance(), parent, name)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
- config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" ));
- systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
+ systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
KAboutData *about =
new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"),
@@ -77,7 +77,7 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
setAboutData( about );
base = new ICCConfigBase(this);
- tqlayout->add(base);
+ layout->add(base);
setRootOnlyMsg(i18n("<b>The global ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global ICC profile, click on the \"Administrator Mode\" button below."));
setUseRootOnlyMsg(true);
diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui
index 4823fab3..c9be0818 100644
--- a/kcontrol/iccconfig/iccconfigbase.ui
+++ b/kcontrol/iccconfig/iccconfigbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>ICCConfigBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -168,7 +168,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -197,6 +197,6 @@
<includes>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index a12bbed3..d1454171 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -80,7 +80,7 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
// Size
TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1);
- lbl->setFixedSize(lbl->tqsizeHint());
+ lbl->setFixedSize(lbl->sizeHint());
grid->addWidget(lbl, 0, 0, Qt::AlignLeft);
mpSizeBox = new TQComboBox(m_pTab1);
connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int)));
@@ -105,8 +105,8 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
top->activate();
- mpSystrayConfig = new KSimpleConfig( TQString::tqfromLatin1( "systemtray_panelappletrc" ));
- mpKickerConfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" ));
+ mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" ));
+ mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
init();
read();
@@ -125,7 +125,7 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *
TQLabel *lab = new TQLabel(str, parent);
lay->addWidget(lab, 1, i, AlignCenter);
mpPreview[i] = new TQLabel(parent);
- mpPreview[i]->tqsetAlignment(AlignCenter);
+ mpPreview[i]->setAlignment(AlignCenter);
mpPreview[i]->setMinimumSize(105, 105);
lay->addWidget(mpPreview[i], 2, i);
TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent);
@@ -688,7 +688,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
top->setRowStretch(1,1);
lbl = new TQLabel(i18n("&Effect:"), page);
- lbl->setFixedSize(lbl->tqsizeHint());
+ lbl->setFixedSize(lbl->sizeHint());
top->addWidget(lbl, 0, 0, Qt::AlignLeft);
mpEffectBox = new TQListBox(page);
mpEffectBox->insertItem(i18n("No Effect"));
@@ -713,7 +713,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
grid->setRowStretch(1, 1);
mpPreview = new TQLabel(frame);
- mpPreview->tqsetAlignment(AlignCenter);
+ mpPreview->setAlignment(AlignCenter);
mpPreview->setMinimumSize(105, 105);
grid->addWidget(mpPreview, 1, 0);
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index ad84e9e1..5d7f924a 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -158,7 +158,7 @@ void IconThemesConfig::installNewTheme()
if (themeURL.url().isEmpty()) return;
TQString themeTmpFile;
- // themeTmpFile tqcontains the name of the downloaded file
+ // themeTmpFile contains the name of the downloaded file
if (!KIO::NetAccess::download(themeURL, themeTmpFile, this)) {
TQString sorryText;
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index c16a8db0..396a6ee4 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -39,9 +39,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_icons, IconsFactory("kcmicons") )
IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(IconsFactory::instance(), parent, name)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(this);
- tqlayout->addWidget(tab);
+ layout->addWidget(tab);
tab1 = new IconThemesConfig(this, "themes");
tab->addTab(tab1, i18n("&Theme"));
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp
index d5cc677d..770b2cdf 100644
--- a/kcontrol/info/info.cpp
+++ b/kcontrol/info/info.cpp
@@ -80,7 +80,7 @@ static const TQString HexStr(unsigned long val, int digits )
{
TQString hexstr;
int i;
- hexstr = TQString::tqfromLatin1("0x%1").arg(val, digits, 16/*=HEX*/);
+ hexstr = TQString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/);
for (i=hexstr.length()-1; i>0; --i)
if (hexstr[i]==' ')
hexstr[i] = '0';
@@ -167,7 +167,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
for (i = 0; i < ndepths; i++) {
txt = txt + Value(depths[i]);
if (i < ndepths - 1)
- txt = txt + TQString::tqfromLatin1(", ");
+ txt = txt + TQString::fromLatin1(", ");
}
last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt);
@@ -200,11 +200,11 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
((DoesBackingStore(s) == Always) ? YES : i18n("When mapped")) )
.arg( DoesSaveUnders(s) ? YES : NO ));
- XQueryBestSize (dpy, tqCursorShape, RootWindow(dpy,scr), 65535, 65535,
+ XQueryBestSize (dpy, CursorShape, RootWindow(dpy,scr), 65535, 65535,
&width, &height);
last = new TQListViewItem(item, last, i18n("Largest Cursor"),
(width == 65535 && height == 65535)
- ? i18n("unlimited") : TQString::tqfromLatin1("%1 x %2").arg(width).arg(height));
+ ? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height));
last = new TQListViewItem(item, last, i18n("Current Input Event Mask"),
HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS));
@@ -272,12 +272,12 @@ static bool GetInfo_XServer_Generic( TQListView *lBox )
last = new TQListViewItem(next, i18n("Name of the Display"),
DisplayString(dpy));
- last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::tqfromLatin1(ServerVendor(dpy)));
+ last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::fromLatin1(ServerVendor(dpy)));
last = new TQListViewItem(next, last, i18n("Vendor Release Number"),
Value((int)VendorRelease(dpy)));
last = new TQListViewItem(next, last, i18n("Version Number"),
- TQString::tqfromLatin1("%1.%2").arg((int)ProtocolVersion(dpy))
+ TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy))
.arg((int)ProtocolRevision(dpy)));
last = item = new TQListViewItem(next, last, i18n("Available Screens"));
@@ -294,7 +294,7 @@ static bool GetInfo_XServer_Generic( TQListView *lBox )
int extCount;
char **extensions = XListExtensions( dpy, &extCount );
for ( i = 0; i < extCount; i++ ) {
- item = new TQListViewItem( last, item, TQString::tqfromLatin1( extensions[i] ) );
+ item = new TQListViewItem( last, item, TQString::fromLatin1( extensions[i] ) );
}
XFreeExtensionList( extensions );
@@ -356,7 +356,7 @@ void KInfoListWidget::load()
retrieve-function. If the function wants the widget to show
another string, then it change *GetInfo_ErrorString ! */
ErrorString = i18n("No information available about %1.").arg(title)
- + TQString::tqfromLatin1("\n\n") + DEFAULT_ERRORSTRING;
+ + TQString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING;
GetInfo_ErrorString = &ErrorString; /* save the address of ErrorString */
sorting_allowed = true; /* the functions may set that */
@@ -414,9 +414,9 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
setButtons(KCModule::Help);
getlistbox = _getlistbox;
GetInfo_ErrorString = 0;
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
+ TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
widgetStack = new TQWidgetStack(this);
- tqlayout->addWidget(widgetStack);
+ layout->addWidget(widgetStack);
lBox = new TQListView(widgetStack);
widgetStack->addWidget(lBox, 0);
lBox->setMinimumSize(200,120);
@@ -425,7 +425,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
NoInfoText = new TQLabel(widgetStack);
widgetStack->addWidget(NoInfoText, 1);
- NoInfoText->tqsetAlignment(AlignCenter | WordBreak);
+ NoInfoText->setAlignment(AlignCenter | WordBreak);
widgetStack->raiseWidget(NoInfoText);
load();
}
diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp
index de7c3a09..9aa0d376 100644
--- a/kcontrol/info/info_aix.cpp
+++ b/kcontrol/info/info_aix.cpp
@@ -70,7 +70,7 @@ list_devices(TQListView *lBox, char *criteria)
TQListViewItem *lastitem = NULL;
lBox->addColumn(i18n("Name"));
- lBox->addColumn(i18n("tqStatus"));
+ lBox->addColumn(i18n("Status"));
lBox->addColumn(i18n("Location"));
lBox->addColumn(i18n("Description"));
diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp
index 74bb0825..18287c45 100644
--- a/kcontrol/info/info_linux.cpp
+++ b/kcontrol/info/info_linux.cpp
@@ -503,7 +503,7 @@ bool GetInfo_Partitions(TQListView * lbox)
#endif
{
total = avail = 0; /* initialize size.. */
- found_in_List = (Mounted_Partitions.tqcontains(FS_NAME) > 0);
+ found_in_List = (Mounted_Partitions.contains(FS_NAME) > 0);
if (found_in_List && statfs(FS_FILE, &sfs) == 0) {
total = ((LONG_TYPE) sfs.f_blocks) * sfs.f_bsize;
avail = (getuid()? sfs.f_bavail : sfs.f_bfree)
@@ -573,7 +573,7 @@ bool GetInfo_CD_ROM(TQListView * lBox)
if (-1 != rx.search(line)) {
TQString text = rx.cap(1);
TQString value = rx.cap(2);
- if (!text.tqcontains('#')) {
+ if (!text.contains('#')) {
if (value == "0")
value = KStdGuiItem::no().plainText();
if (value == "1")
diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp
index d9857af2..02fd98b1 100644
--- a/kcontrol/info/info_netbsd.cpp
+++ b/kcontrol/info/info_netbsd.cpp
@@ -125,18 +125,18 @@ static bool GetDmesgInfo(TQListView *lBox, const char *filter,
TQListViewItem *olditem = NULL;
while(!(s = t->readLine().local8Bit()).isEmpty()) {
if (!seencpu) {
- if (s.tqcontains("cpu"))
+ if (s.contains("cpu"))
seencpu = true;
else
continue;
}
- if (s.tqcontains("boot device") ||
- s.tqcontains("WARNING: old BSD partition ID!"))
+ if (s.contains("boot device") ||
+ s.contains("WARNING: old BSD partition ID!"))
break;
if (!filter
|| (filter[0] == '^' && s.find(&filter[1]) == 0)
- || (filter[0] != '^' && s.tqcontains(filter))) {
+ || (filter[0] != '^' && s.contains(filter))) {
if (func)
func(lBox, s);
else
@@ -253,7 +253,7 @@ bool GetInfo_SCSI (TQListView *lbox)
for(; lvitem; lvitem = lvitem->nextSibling()) {
TQString s = lvitem->text(0);
- if (s.tqcontains("seconds for devices to settle")) {
+ if (s.contains("seconds for devices to settle")) {
lbox->removeItem(lvitem);
break;
}
@@ -296,18 +296,18 @@ bool GetInfo_Partitions (TQListView *lbox)
// convert to strings
vv[0] = KIO::convertSize(big[0]);
- vv[1] = TQString::tqfromLatin1("%1 (%2%%)")
+ vv[1] = TQString::fromLatin1("%1 (%2%%)")
.arg(KIO::convertSize(big[1]))
.arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0);
// FIXME: these two are large enough to punctuate
vv[2] = TQString::number(mnt->f_files);
- vv[3] = TQString::tqfromLatin1("%1 (%2%%) ")
+ vv[3] = TQString::fromLatin1("%1 (%2%%) ")
.arg(mnt->f_ffree)
.arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0);
vv[4] = TQString::null;
-#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::tqfromLatin1(#x " ");
+#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::fromLatin1(#x " ");
MNTF(ASYNC)
MNTF(DEFEXPORTED)
MNTF(EXKERB)
diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp
index 22b6c842..12ec8ee2 100644
--- a/kcontrol/info/info_openbsd.cpp
+++ b/kcontrol/info/info_openbsd.cpp
@@ -122,16 +122,16 @@ static bool GetDmesgInfo(TQListView *lBox, const char *filter,
TQListViewItem *olditem = NULL;
while(!(s = t->readLine()).isNull()) {
if (!seencpu) {
- if (s.tqcontains("cpu"))
+ if (s.contains("cpu"))
seencpu = true;
else
continue;
}
- if (s.tqcontains("boot device") ||
- s.tqcontains("WARNING: old BSD partition ID!"))
+ if (s.contains("boot device") ||
+ s.contains("WARNING: old BSD partition ID!"))
break;
- if (!filter || s.tqcontains(filter)) {
+ if (!filter || s.contains(filter)) {
if (func) {
func(lBox, s, &opaque, false);
}
diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp
index 1b457f18..5f18aebe 100644
--- a/kcontrol/info/info_osx.cpp
+++ b/kcontrol/info/info_osx.cpp
@@ -115,7 +115,7 @@ bool GetInfo_Sound (TQListView *lBox)
{
#ifdef HAVE_COREAUDIO
#define kMaxStringSize 1024
- OStqStatus status;
+ OSStatus status;
AudioDeviceID gOutputDeviceID;
unsigned long propertySize;
char deviceName[kMaxStringSize];
diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp
index 6dd215f5..9f2b17e1 100644
--- a/kcontrol/info/info_solaris.cpp
+++ b/kcontrol/info/info_solaris.cpp
@@ -184,10 +184,10 @@ bool GetInfo_Partitions( TQListView *lBox ) {
lBox->addColumn( i18n( "Mount Point" ));
lBox->addColumn( i18n( "FS Type" ));
lBox->addColumn( i18n( "Total Size" ));
- // XXX: FIXME: how do I set column tqalignment correctly?
+ // XXX: FIXME: how do I set column alignment correctly?
lBox->setColumnAlignment( 3, 2 );
lBox->addColumn( i18n( "Free Size" ));
- // XXX: FIXME: how do I set column tqalignment correctly?
+ // XXX: FIXME: how do I set column alignment correctly?
lBox->setColumnAlignment( 4, 2 );
lBox->addColumn( i18n( "Mount Time" ));
lBox->addColumn( i18n( "Mount Options" ));
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 0720f32a..7bfe5294 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -163,7 +163,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
break;
};
Widget = new TQLabel(title, this);
- Widget->tqsetAlignment(AlignLeft);
+ Widget->setAlignment(AlignLeft);
vbox->addWidget(Widget, 1);
}
@@ -174,7 +174,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
if (i == SWAP_MEM)
vbox->addSpacing(SPACING);
Widget = new TQLabel(this);
- Widget->tqsetAlignment(AlignRight);
+ Widget->setAlignment(AlignRight);
MemSizeLabel[i][j] = Widget;
vbox->addWidget(Widget, 1);
}
@@ -228,7 +228,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
hint = "<qt>" + hint + "</qt>";
Widget = new TQLabel("<b>" + title + "</b>", this);
- Widget->tqsetAlignment(AlignCenter);
+ Widget->setAlignment(AlignCenter);
TQToolTip::add(Widget, hint);
vbox->addWidget(Widget);
vbox->addSpacing(SPACING / 2);
@@ -243,7 +243,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
vbox->addSpacing(SPACING / 2);
Widget = new TQLabel(this); /* xx MB used. */
- Widget->tqsetAlignment(AlignCenter);
+ Widget->setAlignment(AlignCenter);
TQToolTip::add(Widget, hint);
GraphLabel[i] = Widget;
vbox->addWidget(Widget);
@@ -424,7 +424,7 @@ void KMemoryWidget::update_Values()
used, swap_colors, swap_text);
/* RAM + SWAP usage: */
- /* used[0] already tqcontains the amount of used swap */
+ /* used[0] already contains the amount of used swap */
used[2] = Memory_Info[FREE_MEM] + ZERO_IF_NO_INFO(Memory_Info[FREESWAP_MEM]);
used[1] = Memory_Info[TOTAL_MEM] - Memory_Info[FREE_MEM];
if (!all_colors_initialized) {
diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp
index 49b29f95..061e368e 100644
--- a/kcontrol/info/opengl.cpp
+++ b/kcontrol/info/opengl.cpp
@@ -194,7 +194,7 @@ print_extension_list(const char *ext, TQListViewItem *l1)
if (!ext || !ext[0])
return;
- TQString qext = TQString::tqfromLatin1(ext);
+ TQString qext = TQString::fromLatin1(ext);
TQListViewItem *l2 = NULL;
i = j = 0;
@@ -551,7 +551,7 @@ static TQListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,TQ
None };
XSetWindowAttributes attr;
- unsigned long tqmask;
+ unsigned long mask;
Window root;
GLXContext ctx;
XVisualInfo *visinfo;
@@ -573,10 +573,10 @@ static TQListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,TQ
attr.border_pixel = 0;
attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
attr.event_mask = StructureNotifyMask | ExposureMask;
- tqmask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
+ mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
win = XCreateWindow(dpy, root, 0, 0, width, height,
0, visinfo->depth, InputOutput,
- visinfo->visual, tqmask, &attr);
+ visinfo->visual, mask, &attr);
ctx = glXCreateContext( dpy, visinfo, NULL, allowDirect );
if (!ctx) {
diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop
index fa38a0db..4451c516 100644
--- a/kcontrol/info/opengl.desktop
+++ b/kcontrol/info/opengl.desktop
@@ -121,11 +121,11 @@ Keywords[km]=OpenGL,DRI,GLX,3D,ប័ណ្ណ​វីដេអូ,បន្ទ
Keywords[lt]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,Video plokštė,aparatūros greitinimas,grafika
Keywords[lv]=OpenGL,DRI,GLX,3D,VideoKarte,Dzelžu paātrināšana,Grafika,X,X11,Xserveris,X-Serveris,XFree86,Ekrāns
Keywords[mk]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,Видео-картичка,Хардверско забрзување,Графика,екран,приказ
-Keywords[nb]=OpenGL,DRI,GLX,3D,skjermkort,tqmaskinvareakselerasjon,bilde,X,X11,X-tenar,XFree86,skjerm
+Keywords[nb]=OpenGL,DRI,GLX,3D,skjermkort,maskinvareakselerasjon,bilde,X,X11,X-tenar,XFree86,skjerm
Keywords[nds]=OpenGL,DRI,GLX,3D,Videokort,Hardware Acceleration,Grafik,X,X11,Xserver,X-Server,XFree86,Display,Dorstellen,Beslünigen
Keywords[ne]=खुला GL, DRI, GLX, 3D,भिडियो कार्ड, हार्डवेयर गतिवर्धन, ग्राफिक्स, X, X11, Xसर्भर, X-सर्भर, X स्वतन्त्र 86, प्रदर्शन गर्नुहोस्
Keywords[nl]=OpenGL,DRI,GLX,3D,videokaart,hardware-acceleratie,grafisch,graphics,X,X11,Xserver,X-Server,XFree86,display,beeldscherm
-Keywords[nn]=OpenGL,DRI,GLX,3D,skjermkort,tqmaskinvareakselerasjon,grafikk,X,X11,X-tenar,XFree86,skjerm
+Keywords[nn]=OpenGL,DRI,GLX,3D,skjermkort,maskinvareakselerasjon,grafikk,X,X11,X-tenar,XFree86,skjerm
Keywords[pa]=OpenGL,DRI,GLX,3D,ਵੀਡਿਓਕਾਰਡ, ਹਾਰਡਵੇਅਰ ਪਰਵੇਸ਼ਕ,ਗਰਾਫਿਕਸ,X,X11,Xserver,X-Server,XFree86,ਦਰਿਸ਼
Keywords[pl]=OpenGL,DRI,GLX,3D,karta graficzna,grafika,X,X11,Xserver,X-Server,XFree86,ekran
Keywords[pt]=OpenGL,DRI,GLX,3D,Placa Vídeo,Aceleração por Hardware,Gráficos,X,X11,Servidor X,XFree86,Ecrã
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index 90afbbdf..a2b5f1b8 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -52,10 +52,10 @@ namespace {
ThemePage::ThemePage( TQWidget* parent, const char* name )
: TQWidget( parent, name )
{
- TQBoxLayout *tqlayout = new TQVBoxLayout( this );
- tqlayout->setAutoAdd( true );
- tqlayout->setMargin( KDialog::marginHint() );
- tqlayout->setSpacing( KDialog::spacingHint() );
+ TQBoxLayout *layout = new TQVBoxLayout( this );
+ layout->setAutoAdd( true );
+ layout->setMargin( KDialog::marginHint() );
+ layout->setSpacing( KDialog::spacingHint() );
new TQLabel( i18n("Select the cursor theme you want to use:"), this );
diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui
index 53353c3f..01ba9966 100644
--- a/kcontrol/input/kmousedlg.ui
+++ b/kcontrol/input/kmousedlg.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>KMouseDlg</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -74,7 +74,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -112,7 +112,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>150</width>
<height>115</height>
@@ -181,10 +181,10 @@
</widget>
<widget class="QCheckBox" row="2" column="1" rowspan="1" colspan="2">
<property name="name">
- <cstring>cb_pointertqshape</cstring>
+ <cstring>cb_pointershape</cstring>
</property>
<property name="text">
- <string>Cha&amp;nge pointer tqshape over icons</string>
+ <string>Cha&amp;nge pointer shape over icons</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -208,7 +208,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -217,7 +217,7 @@
</spacer>
<widget class="QLayoutWidget" row="4" column="2">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<grid>
<property name="name">
@@ -235,7 +235,7 @@
<property name="name">
<cstring>slAutoSelect</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -258,7 +258,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>230</width>
<height>20</height>
@@ -283,7 +283,7 @@
<property name="text">
<string>Long</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@@ -301,7 +301,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -331,7 +331,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -344,7 +344,7 @@
<connection>
<sender>singleClick</sender>
<signal>toggled(bool)</signal>
- <receiver>cb_pointertqshape</receiver>
+ <receiver>cb_pointershape</receiver>
<slot>setEnabled(bool)</slot>
</connection>
<connection>
@@ -364,7 +364,7 @@
<tabstop>rightHanded</tabstop>
<tabstop>leftHanded</tabstop>
<tabstop>singleClick</tabstop>
- <tabstop>cb_pointertqshape</tabstop>
+ <tabstop>cb_pointershape</tabstop>
<tabstop>cbAutoSelect</tabstop>
<tabstop>slAutoSelect</tabstop>
<tabstop>doubleClick</tabstop>
@@ -373,6 +373,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp
index ee0c31b0..9fc8daf3 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -86,7 +86,7 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
if ( mouseCapabilityFlags & HAS_CSR ) {
- initCordlesstqStatusReporting();
+ initCordlessStatusReporting();
// Do a name
cordlessNameLabel->setText( i18n("Mouse type: %1").arg( cordlessName() ) );
@@ -118,15 +118,15 @@ LogitechMouse::~LogitechMouse()
usb_close( m_usbDeviceHandle );
}
-void LogitechMouse::initCordlesstqStatusReporting()
+void LogitechMouse::initCordlessStatusReporting()
{
- updateCordlesstqStatus();
+ updateCordlessStatus();
doUpdate = new TQTimer( this ); // will be automatically deleted
connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) );
doUpdate->start( 20000 );
}
-void LogitechMouse::updateCordlesstqStatus()
+void LogitechMouse::updateCordlessStatus()
{
TQByteArray status(8);
@@ -147,7 +147,7 @@ void LogitechMouse::updateCordlesstqStatus()
} else {
// kdDebug() << "P6 (connect status): " << (status[0] & 0xFF) << endl;
if ( status[0] & 0x20 ) { // mouse is talking
- m_connecttqStatus = ( status[0] & 0x80 );
+ m_connectStatus = ( status[0] & 0x80 );
m_mousePowerup = ( status[0] & 0x40 );
m_receiverUnlock = ( status[0] & 0x10 );
m_waitLock = ( status[0] & 0x08 );
@@ -188,7 +188,7 @@ void LogitechMouse::updateCordlesstqStatus()
void LogitechMouse::updateGUI()
{
- updateCordlesstqStatus();
+ updateCordlessStatus();
batteryBar->setProgress( batteryLevel() );
@@ -229,7 +229,7 @@ void LogitechMouse::applyChanges()
KMessageBox::information(this, i18n("RF channel 2 has been set. Please press Connect button on mouse to re-establish link"), i18n("Press Connect Button") );
}
- initCordlesstqStatusReporting();
+ initCordlessStatusReporting();
}
}
@@ -238,7 +238,7 @@ void LogitechMouse::save(KConfig * /*config*/)
kdDebug() << "Logitech mouse settings not saved - not implemented yet" << endl;
}
-TQ_UINT8 LogitechMouse::resolution()
+Q_UINT8 LogitechMouse::resolution()
{
// kdDebug() << "resolution: " << m_resolution << endl;
if ( 0 == m_resolution ) {
@@ -299,13 +299,13 @@ void LogitechMouse::setLogitechTo400()
}
}
-TQ_UINT8 LogitechMouse::batteryLevel()
+Q_UINT8 LogitechMouse::batteryLevel()
{
return m_batteryLevel;
}
-TQ_UINT8 LogitechMouse::channel()
+Q_UINT8 LogitechMouse::channel()
{
return m_channel;
}
diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h
index 20e7400c..4ea29672 100644
--- a/kcontrol/input/logitechmouse.h
+++ b/kcontrol/input/logitechmouse.h
@@ -61,36 +61,36 @@ protected slots:
void stopTimerForNow();
private:
- void initCordlesstqStatusReporting();
- void updateCordlesstqStatus();
+ void initCordlessStatusReporting();
+ void updateCordlessStatus();
void setLogitechTo400();
void setLogitechTo800();
TQString cordlessName();
- TQ_UINT8 resolution();
+ Q_UINT8 resolution();
void updateResolution();
- TQ_UINT8 batteryLevel();
- TQ_UINT8 channel();
+ Q_UINT8 batteryLevel();
+ Q_UINT8 channel();
bool isDualChannelCapable();
TQTimer *doUpdate;
struct usb_dev_handle *m_usbDeviceHandle;
- bool m_connecttqStatus; // true if the CONNECT button on the mouse is pressed
+ bool m_connectStatus; // true if the CONNECT button on the mouse is pressed
bool m_mousePowerup; // true if we are doing "just out of the box" auto-locking
bool m_receiverUnlock; // true if mouse has been disconnected by a long press
// of the receiver's CONNECT button
bool m_waitLock; // true if receiver searching for new mouse because the
// CONNECT button on the receiver was pressed
- TQ_UINT8 m_batteryLevel;
- TQ_UINT8 m_channel;
- TQ_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName()
- TQ_UINT16 m_cordlessSecurity;
- TQ_UINT16 m_useSecondChannel;
- TQ_UINT8 m_caseShape;
- TQ_UINT8 m_numberOfButtons;
- TQ_UINT8 m_resolution;
+ Q_UINT8 m_batteryLevel;
+ Q_UINT8 m_channel;
+ Q_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName()
+ Q_UINT16 m_cordlessSecurity;
+ Q_UINT16 m_useSecondChannel;
+ Q_UINT8 m_caseShape;
+ Q_UINT8 m_numberOfButtons;
+ Q_UINT8 m_resolution;
bool m_twoChannelCapable; // true if the mouse supports dual channels
bool m_verticalRoller; // true if the mouse has a vertical roller (wheel)
bool m_horizontalRoller; // true if the mouse has a horizontal roller (wheel)
diff --git a/kcontrol/input/logitechmouse_base.ui b/kcontrol/input/logitechmouse_base.ui
index 3b12782d..5c9c1cd9 100644
--- a/kcontrol/input/logitechmouse_base.ui
+++ b/kcontrol/input/logitechmouse_base.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>LogitechMouseBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -31,7 +31,7 @@
<property name="text">
<string>You have a Logitech Mouse connected, and libusb was found at compile time, but it was not possible to access this mouse. This is probably caused by a permissions problem - you should consult the manual on how to fix this.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -149,5 +149,5 @@
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 1b64dbb9..68f37647 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -150,7 +150,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- connect(tab1->cb_pointertqshape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick()));
@@ -291,7 +291,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(),
KDialog::spacingHint());
- TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->tqlayout(), KDialog::spacingHint());
+ TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->layout(), KDialog::spacingHint());
mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse);
vvbox->addWidget(mouseKeys);
@@ -506,7 +506,7 @@ void MouseConfig::load( bool useDefaults )
tab1->singleClick->setChecked( settings->singleClick );
tab1->doubleClick->setChecked(!settings->singleClick);
- tab1->cb_pointertqshape->setChecked(settings->changeCursor);
+ tab1->cb_pointershape->setChecked(settings->changeCursor);
tab1->cbAutoSelect->setChecked( settings->autoSelectDelay >= 0 );
if ( settings->autoSelectDelay < 0 )
tab1->slAutoSelect->setValue( 0 );
@@ -564,7 +564,7 @@ void MouseConfig::save()
settings->autoSelectDelay = tab1->cbAutoSelect->isChecked()? tab1->slAutoSelect->value():-1;
settings->visualActivate = tab1->cbVisualActivate->isChecked();
// settings->changeCursor = tab1->singleClick->isChecked();
- settings->changeCursor = tab1->cb_pointertqshape->isChecked();
+ settings->changeCursor = tab1->cb_pointershape->isChecked();
settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked();
settings->apply();
@@ -723,7 +723,7 @@ void MouseConfig::slotWheelScrollLinesChanged(int value)
void MouseSettings::apply(bool force)
{
XChangePointerControl( kapp->getDisplay(),
- true, true, int(tqRound(accelRate*10)), 10, thresholdMove);
+ true, true, int(qRound(accelRate*10)), 10, thresholdMove);
// 256 might seems extreme, but X has already been known to return 32,
// and we don't want to truncate things. Xlib limits the table to 256 bytes,
diff --git a/kcontrol/input/mouse.desktop b/kcontrol/input/mouse.desktop
index 8560e645..fe0f3028 100644
--- a/kcontrol/input/mouse.desktop
+++ b/kcontrol/input/mouse.desktop
@@ -214,7 +214,7 @@ Keywords[ne]=माउस, माउस गतिवर्धन, माउस
Keywords[nl]=muis,muissnelheid,muisknoppen,selectie,cursor-uiterlijk,input devices,invoerapparaten,knopindeling,klikken,iconen,pictogrammen,icons,aanwijzers,pointers,drag,verslepen,dubbelklikken,linkshandig,rechtshandig.randapparaten
Keywords[nn]=mus,musakselerasjon,musterskel,musknappar,val,peikar,peikarform,inneiningar,knappar,klikk,ikon,tilbakemelding,dra,dobbeltklikk,høgrehendt,venstrehendt
Keywords[nso]=Legotlo,Koketso ya legotlo,Threshold ya legotlo,Ditobetswa tsa legotlo, Kgetho,Sebopego sa Cursor,Maano a Tsenyo,Mapping Setobetswa,Tobetsa, diemedi,phetolo,Disupi,Topa,Tobetsopedi,mapping,swerwe ka lagoja,swerwe ka lanngele
-Keywords[pa]=ਮਾਊਸ,ਮਾਊਸ ਪ੍ਰਵੇਸ਼,ਮਾਊਸ threshold,ਮਾਊਸ buttons,Selection,tqCursorShape,Input ਜੰਤਰ,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,righthanded,left handed,ਕਲਿੱਕ,ਆਈਕਾਨ
+Keywords[pa]=ਮਾਊਸ,ਮਾਊਸ ਪ੍ਰਵੇਸ਼,ਮਾਊਸ threshold,ਮਾਊਸ buttons,Selection,CursorShape,Input ਜੰਤਰ,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,righthanded,left handed,ਕਲਿੱਕ,ਆਈਕਾਨ
Keywords[pl]=Mysz,Akceleracja myszy,Próg myszy,Przyciski myszy,Zaznaczenie,Kształt kursora,Urządzenia wejściowe,mapowanie przycisków,kliknięcie,ikony,widoczne efekty,wskaźniki,przeciąganie,podwójne kliknięcie,mapowanie,praworęczny,leworęczny
Keywords[pt]=rato,aceleração do rato,limite do rato,botões do rato,selecção,forma do cursor,dispositivos de entrada,atribuição de botões,click,ícones,feedback,cursores,arrastar,duplo 'click',atribuição,destro,esquerdino
Keywords[pt_BR]=Mouse,aceleração do mouse,limiar do mouse, botões do mouse,Seleção,Formato do Cursor,Dispositivos de entrada,mapeamento de botões,clique,ícones,retorno,ponteiros,arrastar,clique duplo,mapeamento,destro,canhoto
diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h
index 8d6bba1d..bee04d5e 100644
--- a/kcontrol/input/mouse.h
+++ b/kcontrol/input/mouse.h
@@ -84,7 +84,7 @@ public:
bool reverseScrollPolarity;
#ifdef HAVE_LIBUSB
- // TODO: In Qt4, tqreplace with a better container.
+ // TODO: In Qt4, replace with a better container.
TQPtrList <LogitechMouse> logitechMouseList;
#endif
};
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index a7a35687..ceb39964 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -68,8 +68,8 @@ namespace {
"center_ptr",
"circle",
"dot",
- "dot_box_tqmask",
- "dot_box_tqmask",
+ "dot_box_mask",
+ "dot_box_mask",
"double_arrow",
"draped_box",
"left_side",
@@ -303,7 +303,7 @@ void PreviewWidget::setTheme( const TQString &theme )
current = -1;
setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) );
setUpdatesEnabled( true );
- tqrepaint( false );
+ repaint( false );
}
@@ -311,7 +311,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * )
{
TQPixmap buffer( size() );
TQPainter p( &buffer );
- p.fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) );
+ p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
Picture dest;
if ( !qt_has_xft || !qt_use_xrender ) {
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index 38d41fff..7caf18c3 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -83,10 +83,10 @@ static TQString defaultThemeDescription( const TQString& theme )
ThemePage::ThemePage( TQWidget* parent, const char* name )
: TQWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL )
{
- TQBoxLayout *tqlayout = new TQVBoxLayout( this );
- tqlayout->setAutoAdd( true );
- tqlayout->setMargin( KDialog::marginHint() );
- tqlayout->setSpacing( KDialog::spacingHint() );
+ TQBoxLayout *layout = new TQVBoxLayout( this );
+ layout->setAutoAdd( true );
+ layout->setMargin( KDialog::marginHint() );
+ layout->setSpacing( KDialog::spacingHint() );
new TQLabel( i18n("Select the cursor theme you want to use (hover preview to test cursor):"), this );
@@ -122,7 +122,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
( !icons.exists() && !TQFileInfo( TQDir::homeDirPath() ).isWritable() ) )
installButton->setEnabled( false );
- if ( !themeDirs.tqcontains( path ) )
+ if ( !themeDirs.contains( path ) )
installButton->setEnabled( false );
selectionChanged( listview->currentItem() );
@@ -305,17 +305,17 @@ bool ThemePage::installThemes( const TQString &file )
// Check if a theme with that name already exists
if ( TQDir( destDir ).exists( *it ) ) {
const TQString question = i18n( "A theme named %1 already exists in your icon "
- "theme folder. Do you want tqreplace it with this one?" ).arg( *it );
+ "theme folder. Do you want replace it with this one?" ).arg( *it );
int answer = KMessageBox::warningContinueCancel( this, question, i18n( "Overwrite Theme?"), i18n("Replace") );
if ( answer != KMessageBox::Continue )
continue;
- // ### If the theme that's being tqreplaced is the current theme, it
+ // ### If the theme that's being replaced is the current theme, it
// will cause cursor inconsistencies in newly started apps.
}
// ### Should we check if a theme with the same name exists in a global theme dir?
- // If that's the case it will effectively tqreplace it, even though the global theme
+ // If that's the case it will effectively replace it, even though the global theme
// won't be deleted. Checking for this situation is easy, since the global theme
// will be in the listview. Maybe this should never be allowed since it might
// result in strange side effects (from the average users point of view). OTOH
@@ -395,7 +395,7 @@ const TQStringList ThemePage::getThemeBaseDirs() const
TQString path = XcursorLibraryPath();
#endif
// Expand all occurences of ~ to the home dir
- path.tqreplace( "~/", TQDir::homeDirPath() + '/' );
+ path.replace( "~/", TQDir::homeDirPath() + '/' );
return TQStringList::split( ':', path );
}
@@ -414,7 +414,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const
continue;
const TQStringList subdirs( dir.entryList( TQDir::Dirs ) );
- if ( subdirs.tqcontains( theme ) )
+ if ( subdirs.contains( theme ) )
{
const TQString path = *it + '/' + theme;
const TQString indexfile = path + "/index.theme";
@@ -453,7 +453,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const
void ThemePage::insertThemes()
{
// Scan each base dir for cursor themes and add them to the listview.
- // An icon theme is considered to be a cursor theme if it tqcontains
+ // An icon theme is considered to be a cursor theme if it contains
// a cursors subdirectory or if it inherits a cursor theme.
for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it )
{
@@ -585,7 +585,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
image.setAlphaBuffer( true );
// Clear the image
- TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( image.bits() );
+ Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( image.bits() );
for ( int i = 0; i < image.width() * image.height(); i++ )
dst[i] = 0;
@@ -593,26 +593,26 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
TQPoint dstOffset( (image.width() - r.width()) / 2, (image.height() - r.height()) / 2 );
TQPoint srcOffset( r.topLeft() );
- dst = reinterpret_cast<TQ_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x();
- src = reinterpret_cast<TQ_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x();
+ dst = reinterpret_cast<Q_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x();
+ src = reinterpret_cast<Q_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x();
// Copy the XcursorImage into the TQImage, converting it from premultiplied
// to non-premultiplied alpha and cropping it if needed.
for ( int y = 0; y < r.height(); y++ )
{
for ( int x = 0; x < r.width(); x++, dst++, src++ ) {
- const TQ_UINT32 pixel = *src;
+ const Q_UINT32 pixel = *src;
- const TQ_UINT8 a = tqAlpha( pixel );
- const TQ_UINT8 r = tqRed( pixel );
- const TQ_UINT8 g = tqGreen( pixel );
- const TQ_UINT8 b = tqBlue( pixel );
+ const Q_UINT8 a = qAlpha( pixel );
+ const Q_UINT8 r = qRed( pixel );
+ const Q_UINT8 g = qGreen( pixel );
+ const Q_UINT8 b = qBlue( pixel );
if ( !a || a == 255 ) {
*dst = pixel;
} else {
float alpha = a / 255.0;
- *dst = tqRgba( int(r / alpha), int(g / alpha), int(b / alpha), a );
+ *dst = qRgba( int(r / alpha), int(g / alpha), int(b / alpha), a );
}
}
dst += ( image.width() - r.width() );
@@ -630,7 +630,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
TQImage image( iconSize, iconSize, 32 );
image.setAlphaBuffer( true );
- TQ_UINT32 *data = reinterpret_cast< TQ_UINT32* >( image.bits() );
+ Q_UINT32 *data = reinterpret_cast< Q_UINT32* >( image.bits() );
for ( int i = 0; i < image.width() * image.height(); i++ )
data[ i ] = 0;
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
index 647b6762..e2014a1c 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
@@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_ioslaveinfo, SlaveFactory("kcmioslaveinfo") )
KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStringList &)
:KCModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0)
{
- TQVBoxLayout *tqlayout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
setQuickHelp( i18n("<h1>IO slaves</h1> Gives you an overview of the installed ioslaves."));
setButtons( KCModule::Help );
@@ -65,8 +65,8 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin
m_info=new KTextBrowser(hbox);
hbox->setSpacing(KDialog::spacingHint());
- tqlayout->addWidget(label);
- tqlayout->addWidget(hbox);
+ layout->addWidget(label);
+ layout->addWidget(hbox);
hbox->setStretchFactor(m_ioslavesLb,1);
hbox->setStretchFactor(m_info,5);
diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp
index 84135bb6..095f18f4 100644
--- a/kcontrol/joystick/caldialog.cpp
+++ b/kcontrol/joystick/caldialog.cpp
@@ -65,7 +65,7 @@ void CalDialog::calibrate()
do
{
- tqApp->processEvents(2000);
+ qApp->processEvents(2000);
}
while ( ti.isActive() && (result() != TQDialog::Rejected) );
@@ -165,7 +165,7 @@ void CalDialog::waitButton(int axis, bool press, int &lastVal)
// loop until the user presses a button on the device or on the dialog
do
{
- tqApp->processEvents(100);
+ qApp->processEvents(100);
if ( joydev->getEvent(type, number, value) )
{
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index 87b6f4e0..3ffc0e1d 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -95,7 +95,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
joyWidget = new JoyWidget(this);
- setMinimumSize(joyWidget->tqminimumSize());
+ setMinimumSize(joyWidget->minimumSize());
setButtons(KCModule::Default);
}
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index d460eaf3..cfc293b8 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -56,7 +56,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
TQLabel *icon = new TQLabel(messageBox);
icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
KIcon::SizeMedium, KIcon::DefaultState, 0, true));
- icon->setFixedSize(icon->tqsizeHint());
+ icon->setFixedSize(icon->sizeHint());
message = new TQLabel(messageBox);
messageBox->hide();
}
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index 9c7d2589..f25eae00 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -82,7 +82,7 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca
// set qwhatsthis help
TQWhatsThis::add(this, i18n(intro_text));
_viewer = new KHTMLPart( this, "_viewer" );
- _viewer->widget()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
+ _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
connect( _viewer->browserExtension(),
TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) );
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index 4f0b14f4..598807a2 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -131,7 +131,7 @@ DockContainer::DockContainer(TQWidget *parent)
, _module(0L)
{
_busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this);
- _busyw->tqsetAlignment(AlignCenter);
+ _busyw->setAlignment(AlignCenter);
_busyw->setTextFormat(RichText);
_busyw->setGeometry(0,0, width(), height());
addWidget( _busyw );
@@ -221,7 +221,7 @@ i18n("There are unsaved changes in the active module.\n"
ProxyWidget *widget = loadModule( module );
- KCGlobal::repairAccels( tqtopLevelWidget() );
+ KCGlobal::repairAccels( topLevelWidget() );
return ( widget!=0 );
}
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index ed892ac7..0a409b7e 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -91,12 +91,12 @@ TQString KCGlobal::baseGroup()
if (_infocenter)
{
kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl;
- _baseGroup = TQString::tqfromLatin1("Settings/Information/");
+ _baseGroup = TQString::fromLatin1("Settings/Information/");
}
else
{
kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl;
- _baseGroup = TQString::tqfromLatin1("Settings/");
+ _baseGroup = TQString::fromLatin1("Settings/");
}
}
}
diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp
index 237cbdfe..723895de 100644
--- a/kcontrol/kcontrol/kcrootonly.cpp
+++ b/kcontrol/kcontrol/kcrootonly.cpp
@@ -26,13 +26,13 @@
KCRootOnly::KCRootOnly(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
- TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
+ TQVBoxLayout *layout=new TQVBoxLayout(this);
TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>"
"Click on the \"Administrator Mode\" button below."), this);
- tqlayout->addWidget(label);
- label->tqsetAlignment(AlignCenter);
+ layout->addWidget(label);
+ label->setAlignment(AlignCenter);
label->setTextFormat(RichText);
- label->setMinimumSize(label->tqsizeHint());
+ label->setMinimumSize(label->sizeHint());
}
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 67ffdaa4..758b742f 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -77,9 +77,9 @@ KControlApp::KControlApp()
int fontSize = toplevel->fontInfo().pointSize();
if (fontSize == 0)
fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX();
- int x = config->readNumEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk.width()),
+ int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()),
QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) );
- int y = config->readNumEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk.height()),
+ int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()),
QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
toplevel->resize(x,y);
}
@@ -91,8 +91,8 @@ KControlApp::~KControlApp()
KConfig *config = KGlobal::config();
config->setGroup("General");
TQWidget *desk = TQApplication::desktop();
- config->writeEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
- config->writeEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
+ config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
+ config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
config->sync();
}
delete toplevel;
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index 6ab26250..ad60eda5 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -68,9 +68,9 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
// Item names may contain ampersands. To avoid them being converted to
- // accelators, tqreplace them with two ampersands.
+ // accelators, replace them with two ampersands.
TQString name = group->caption();
- name.tqreplace("&", "&&");
+ name.replace("&", "&&");
parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
, name, menu);
@@ -83,9 +83,9 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
for (module=moduleList.first(); module != 0; module=moduleList.next())
{
// Item names may contain ampersands. To avoid them being converted to
- // accelators, tqreplace them with two ampersands.
+ // accelators, replace them with two ampersands.
TQString name = module->moduleName();
- name.tqreplace("&", "&&");
+ name.replace("&", "&&");
int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
, name, id);
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 14b75c78..cc8c63af 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -142,12 +142,12 @@ void ConfigModule::runAsRoot()
// create an embed widget that will embed the
// kcmshell running as root
- _embedLayout = new TQVBoxLayout(_module->tqparentWidget());
- _embedFrame = new TQVBox( _module->tqparentWidget() );
+ _embedLayout = new TQVBoxLayout(_module->parentWidget());
+ _embedFrame = new TQVBox( _module->parentWidget() );
_embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
TQPalette pal( red );
pal.setColor( TQColorGroup::Background,
- _module->tqparentWidget()->tqcolorGroup().background() );
+ _module->parentWidget()->colorGroup().background() );
_embedFrame->setPalette( pal );
_embedFrame->setLineWidth( 2 );
_embedFrame->setMidLineWidth( 2 );
@@ -158,7 +158,7 @@ void ConfigModule::runAsRoot()
_module->hide();
_embedFrame->show();
TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack);
- _busy->tqsetAlignment(AlignCenter);
+ _busy->setAlignment(AlignCenter);
_busy->setTextFormat(RichText);
_busy->setGeometry(0,0, _module->width(), _module->height());
_busy->show();
@@ -338,7 +338,7 @@ TQString ConfigModuleList::findModule(ConfigModule *module)
Menu *menu;
for(;(menu = it.current());++it)
{
- if (menu->modules.tqcontainsRef(module))
+ if (menu->modules.containsRef(module))
return it.currentKey();
}
return TQString::null;
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index b15f0ccd..6f767ab2 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -133,9 +133,9 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath)
-TQSize ModuleTreeView::tqsizeHint() const
+TQSize ModuleTreeView::sizeHint() const
{
- return TQListView::tqsizeHint().boundedTo(
+ return TQListView::sizeHint().boundedTo(
TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) );
}
@@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem>
{
while (item)
{
- setOpen(item, parentList->tqcontains(item));
+ setOpen(item, parentList->contains(item));
if (item->childCount() != 0)
expandItem(item->firstChild(), parentList);
@@ -342,8 +342,8 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu
TQPixmap pixmap(offset, offset);
pixmap.fill(Qt::color0);
pixmap.setMask(pixmap.createHeuristicMask());
- TQBitmap tqmask( pixmap.size(), true );
- pixmap.setMask( tqmask );
+ TQBitmap mask( pixmap.size(), true );
+ pixmap.setMask( mask );
TQListViewItem::setPixmap(0, pixmap);
}
}
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index 448251a6..ede3c8a5 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -74,7 +74,7 @@ public:
void makeSelected(ConfigModule* module);
void makeVisible(ConfigModule *module);
void fill();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
signals:
void moduleSelected(ConfigModule*);
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index e50b67fa..b8f83c5f 100644
--- a/