From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/TODO | 12 +-- kcontrol/access/eventsrc | 8 +- kcontrol/access/kaccess.cpp | 22 ++--- kcontrol/access/kcmaccess.cpp | 24 ++--- .../accessibility/accessibilityconfigwidget.ui | 38 ++++---- kcontrol/arts/arts.cpp | 40 ++++---- kcontrol/arts/arts.h | 2 +- kcontrol/arts/generaltab.ui | 18 ++-- kcontrol/arts/hardwaretab.ui | 20 ++-- kcontrol/arts/krichtextlabel.cpp | 10 +- kcontrol/arts/krichtextlabel.h | 6 +- kcontrol/background/bgadvanced.cpp | 2 +- kcontrol/background/bgadvanced_ui.ui | 16 +-- kcontrol/background/bgdialog.cpp | 20 ++-- kcontrol/background/bgdialog_ui.ui | 40 ++++---- kcontrol/background/bghash.h | 2 +- kcontrol/background/bgmonitor.cpp | 14 +-- kcontrol/background/bgrender.cpp | 34 +++---- kcontrol/background/bgsettings.cpp | 10 +- kcontrol/background/bgwallpaper_ui.ui | 16 +-- kcontrol/background/main.cpp | 6 +- kcontrol/bell/bell.cpp | 8 +- kcontrol/clock/dtime.cpp | 26 ++--- kcontrol/clock/main.cpp | 8 +- kcontrol/colors/colorscm.cpp | 2 +- kcontrol/colors/stdclient_bitmaps.h | 14 +-- kcontrol/colors/widgetcanvas.cpp | 36 +++---- kcontrol/componentchooser/EXAMPLE.desktop | 4 +- kcontrol/componentchooser/browserconfig_ui.ui | 12 +-- kcontrol/componentchooser/componentchooser.cpp | 16 +-- kcontrol/componentchooser/componentchooser_ui.ui | 8 +- kcontrol/componentchooser/componentconfig_ui.ui | 8 +- kcontrol/componentchooser/emailclientconfig_ui.ui | 16 +-- .../componentchooser/terminalemulatorconfig_ui.ui | 12 +-- kcontrol/crypto/certgen.ui | 66 ++++++------- kcontrol/crypto/crypto.cpp | 42 ++++---- kcontrol/css/cssconfig.ui | 22 ++--- kcontrol/css/csscustom.ui | 20 ++-- kcontrol/css/preview.ui | 8 +- kcontrol/css/template.cpp | 2 +- kcontrol/dnssd/configdialog.ui | 20 ++-- kcontrol/dnssd/kcmdnssd.cpp | 10 +- kcontrol/ebrowsing/ebrowsing.desktop | 2 +- kcontrol/ebrowsing/main.cpp | 6 +- kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui | 8 +- .../ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp | 38 ++++---- .../ebrowsing/plugins/ikws/searchprovider.desktop | 2 +- .../ebrowsing/plugins/ikws/searchproviderdlg_ui.ui | 4 +- .../plugins/ikws/searchproviders/mamma.desktop | 2 +- .../ikws/searchproviders/nl-telephone.desktop | 2 +- .../plugins/localdomain/localdomainurifilter.cpp | 8 +- .../ebrowsing/plugins/shorturi/kshorturifilter.cpp | 30 +++--- kcontrol/energy/energy.cpp | 8 +- kcontrol/energy/energy.desktop | 2 +- kcontrol/filetypes/filegroupdetails.cpp | 8 +- kcontrol/filetypes/filegroupdetails.h | 2 +- kcontrol/filetypes/filetypedetails.cpp | 12 +-- kcontrol/filetypes/filetypedetails.h | 2 +- kcontrol/filetypes/filetypesview.cpp | 2 +- kcontrol/filetypes/typeslistitem.cpp | 28 +++--- kcontrol/fonts/fonts.cpp | 30 +++--- kcontrol/fonts/kxftconfig.cpp | 16 +-- kcontrol/fonts/kxftconfig.h | 2 +- kcontrol/iccconfig/iccconfig.cpp | 8 +- kcontrol/iccconfig/iccconfigbase.ui | 8 +- kcontrol/icons/icons.cpp | 12 +-- kcontrol/icons/iconthemes.cpp | 2 +- kcontrol/icons/main.cpp | 4 +- kcontrol/info/info.cpp | 22 ++--- kcontrol/info/info_aix.cpp | 2 +- kcontrol/info/info_linux.cpp | 4 +- kcontrol/info/info_netbsd.cpp | 16 +-- kcontrol/info/info_openbsd.cpp | 8 +- kcontrol/info/info_osx.cpp | 2 +- kcontrol/info/info_solaris.cpp | 4 +- kcontrol/info/memory.cpp | 10 +- kcontrol/info/opengl.cpp | 8 +- kcontrol/info/opengl.desktop | 4 +- kcontrol/input/core/themepage.cpp | 8 +- kcontrol/input/kmousedlg.ui | 34 +++---- kcontrol/input/logitechmouse.cpp | 20 ++-- kcontrol/input/logitechmouse.h | 28 +++--- kcontrol/input/logitechmouse_base.ui | 6 +- kcontrol/input/mouse.cpp | 10 +- kcontrol/input/mouse.desktop | 2 +- kcontrol/input/mouse.h | 2 +- kcontrol/input/xcursor/previewwidget.cpp | 8 +- kcontrol/input/xcursor/themepage.cpp | 42 ++++---- kcontrol/ioslaveinfo/kcmioslaveinfo.cpp | 6 +- kcontrol/joystick/caldialog.cpp | 4 +- kcontrol/joystick/joystick.cpp | 2 +- kcontrol/joystick/joywidget.cpp | 2 +- kcontrol/kcontrol/aboutwidget.cpp | 2 +- kcontrol/kcontrol/dockcontainer.cpp | 4 +- kcontrol/kcontrol/global.cpp | 4 +- kcontrol/kcontrol/kcrootonly.cpp | 8 +- kcontrol/kcontrol/main.cpp | 8 +- kcontrol/kcontrol/modulemenu.cpp | 8 +- kcontrol/kcontrol/modules.cpp | 10 +- kcontrol/kcontrol/moduletreeview.cpp | 10 +- kcontrol/kcontrol/moduletreeview.h | 2 +- kcontrol/kcontrol/proxywidget.cpp | 4 +- kcontrol/kcontrol/toplevel.cpp | 6 +- kcontrol/kded/kcmkded.cpp | 16 +-- kcontrol/kded/kcmkded.h | 2 +- kcontrol/kdm/ChangeLog | 2 +- kcontrol/kdm/background.cpp | 4 +- kcontrol/kdm/kbackedcombobox.cpp | 2 +- kcontrol/kdm/kdm-appear.cpp | 20 ++-- kcontrol/kdm/kdm-conv.cpp | 4 +- kcontrol/kdm/kdm-users.cpp | 14 +-- kcontrol/kdm/main.cpp | 4 +- kcontrol/keys/commandShortcuts.cpp | 4 +- kcontrol/keys/convertShortcuts.pl | 2 +- kcontrol/keys/kaccelaction.h | 4 +- kcontrol/keys/keyconfig.cpp | 10 +- kcontrol/keys/keys.desktop | 2 +- kcontrol/keys/modifiers.cpp | 2 +- kcontrol/keys/shortcuts.cpp | 18 ++-- kcontrol/keys/treeview.cpp | 12 +-- kcontrol/kfontinst/ChangeLog | 6 +- kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 34 +++---- kcontrol/kfontinst/kcmfontinst/KCmFontInst.h | 2 +- kcontrol/kfontinst/kcmfontinst/KFileFontView.h | 2 +- kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp | 12 +-- kcontrol/kfontinst/kfile-plugin/KFileFont.cpp | 48 ++++----- kcontrol/kfontinst/kfontinst/FontEngine.cpp | 4 +- kcontrol/kfontinst/kfontinst/Fontmap.cpp | 4 +- kcontrol/kfontinst/kfontinst/GetPid.c | 2 +- kcontrol/kfontinst/kfontinst/XConfig.cpp | 2 +- kcontrol/kfontinst/kio/KioFonts.cpp | 50 +++++----- kcontrol/kfontinst/kio/KioFonts.h | 2 +- kcontrol/kfontinst/lib/FcEngine.cpp | 2 +- kcontrol/kfontinst/lib/Misc.cpp | 4 +- kcontrol/kfontinst/viewpart/FontPreview.cpp | 4 +- kcontrol/kfontinst/viewpart/FontPreview.h | 4 +- kcontrol/kfontinst/viewpart/FontViewPart.cpp | 24 ++--- kcontrol/kfontinst/viewpart/FontViewPart.h | 2 +- kcontrol/kicker/advancedDialog.cpp | 12 +-- kcontrol/kicker/advancedOptions.ui | 18 ++-- kcontrol/kicker/applettab.ui | 16 +-- kcontrol/kicker/applettab_impl.cpp | 4 +- kcontrol/kicker/extensionInfo.cpp | 16 +-- kcontrol/kicker/extensionInfo.h | 4 +- kcontrol/kicker/hidingconfig.cpp | 6 +- kcontrol/kicker/hidingtab.ui | 36 +++---- kcontrol/kicker/lookandfeelconfig.cpp | 6 +- kcontrol/kicker/lookandfeeltab.ui | 22 ++--- kcontrol/kicker/lookandfeeltab_kcm.cpp | 6 +- kcontrol/kicker/main.cpp | 2 +- kcontrol/kicker/menuconfig.cpp | 6 +- kcontrol/kicker/menutab.ui | 32 +++--- kcontrol/kicker/menutab_impl.cpp | 12 +-- kcontrol/kicker/positionconfig.cpp | 6 +- kcontrol/kicker/positiontab.ui | 76 +++++++-------- kcontrol/kicker/positiontab_impl.cpp | 12 +-- kcontrol/kio/UA-DESKTOP-FILE-HOWTO | 10 +- kcontrol/kio/cache_ui.ui | 8 +- kcontrol/kio/envvarproxy_ui.ui | 4 +- kcontrol/kio/fakeuaprovider.cpp | 24 ++--- kcontrol/kio/fakeuaprovider.h | 4 +- kcontrol/kio/kcookiesmain.cpp | 4 +- kcontrol/kio/kcookiesmanagement.cpp | 2 +- kcontrol/kio/kcookiesmanagementdlg_ui.ui | 14 +-- kcontrol/kio/kcookiespolicies.cpp | 4 +- kcontrol/kio/kcookiespoliciesdlg_ui.ui | 12 +-- kcontrol/kio/kenvvarproxydlg.cpp | 8 +- kcontrol/kio/kmanualproxydlg.cpp | 4 +- kcontrol/kio/kproxydlg.cpp | 4 +- kcontrol/kio/kproxydlg_ui.ui | 18 ++-- kcontrol/kio/lanbrowser.desktop | 2 +- kcontrol/kio/main.cpp | 4 +- kcontrol/kio/main.h | 2 +- kcontrol/kio/manualproxy_ui.ui | 12 +-- kcontrol/kio/policydlg.cpp | 2 +- kcontrol/kio/policydlg.h | 6 +- kcontrol/kio/policydlg_ui.ui | 6 +- kcontrol/kio/smbrodlg.cpp | 28 +++--- kcontrol/kio/socks.cpp | 4 +- kcontrol/kio/socksbase.ui | 18 ++-- kcontrol/kio/uagentproviderdlg.cpp | 2 +- kcontrol/kio/uagentproviderdlg_ui.ui | 12 +-- kcontrol/kio/useragentdlg.cpp | 28 +++--- kcontrol/kio/useragentdlg_ui.ui | 14 +-- kcontrol/knotify/knotify.cpp | 6 +- kcontrol/knotify/playersettings.ui | 18 ++-- kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg | Bin 44075 -> 44077 bytes kcontrol/knotify/sounds/KDE_Startup_1.ogg | Bin 124445 -> 124444 bytes kcontrol/knotify/sounds/KDE_Window_Iconify.wav | Bin 26134 -> 26133 bytes kcontrol/konq/README | 4 +- kcontrol/konq/behaviour.cpp | 6 +- kcontrol/konq/browser.cpp | 12 +-- kcontrol/konq/desktop.cpp | 10 +- kcontrol/konq/desktopbehavior.ui | 12 +-- kcontrol/konq/desktopbehavior_impl.cpp | 16 +-- kcontrol/konq/previews.cpp | 2 +- kcontrol/konq/previews.h | 2 +- kcontrol/konq/rootopts.cpp | 14 +-- kcontrol/konq/rootopts.h | 2 +- kcontrol/konqhtml/advancedTabDialog.cpp | 8 +- kcontrol/konqhtml/advancedTabOptions.ui | 10 +- kcontrol/konqhtml/domainlistview.cpp | 8 +- kcontrol/konqhtml/domainlistview.h | 6 +- kcontrol/konqhtml/filteropts.cpp | 2 +- kcontrol/konqhtml/htmlopts.cpp | 4 +- kcontrol/konqhtml/htmlopts.h | 2 +- kcontrol/konqhtml/javaopts.cpp | 6 +- kcontrol/konqhtml/javaopts.h | 6 +- kcontrol/konqhtml/jsopts.cpp | 4 +- kcontrol/konqhtml/jspolicies.cpp | 108 ++++++++++----------- kcontrol/konqhtml/jspolicies.h | 26 ++--- kcontrol/konqhtml/main.cpp | 4 +- kcontrol/konqhtml/nsconfigwidget.ui | 14 +-- kcontrol/konqhtml/pluginopts.cpp | 8 +- kcontrol/konqhtml/pluginopts.h | 6 +- kcontrol/konqhtml/policies.h | 6 +- kcontrol/konqhtml/policydlg.h | 2 +- kcontrol/konsole/kcmkonsoledialog.ui | 20 ++-- kcontrol/konsole/schemadialog.ui | 24 ++--- kcontrol/konsole/sessiondialog.ui | 28 +++--- kcontrol/krdb/krdb.cpp | 14 +-- kcontrol/kthememanager/knewthemedlg.h | 2 +- kcontrol/kthememanager/ktheme.cpp | 16 +-- kcontrol/kthememanager/kthemedlg.ui | 38 ++++---- kcontrol/kthememanager/kthememanager.cpp | 2 +- kcontrol/kthememanager/newthemewidget.ui | 6 +- kcontrol/launch/kcmlaunch.cpp | 12 +-- kcontrol/locale/kcmlocale.cpp | 24 ++--- kcontrol/locale/klocalesample.cpp | 6 +- kcontrol/locale/localemon.cpp | 12 +-- kcontrol/locale/localenum.cpp | 12 +-- kcontrol/locale/localeother.cpp | 2 +- kcontrol/locale/localetime.cpp | 22 ++--- kcontrol/locale/toplevel.cpp | 6 +- kcontrol/nics/nic.cpp | 20 ++-- kcontrol/performance/kcmperformance.cpp | 4 +- kcontrol/performance/konqueror_ui.ui | 12 +-- kcontrol/performance/system_ui.ui | 8 +- kcontrol/privacy/kcmprivacydialog.ui | 22 ++--- kcontrol/privacy/kprivacysettings.ui | 10 +- kcontrol/randr/configdialog.cpp | 2 +- kcontrol/randr/configdialog.h | 8 +- kcontrol/randr/krandrmodule.cpp | 2 +- kcontrol/randr/krandrpassivepopup.cpp | 4 +- kcontrol/randr/krandrtray.cpp | 6 +- kcontrol/randr/ktimerdialog.cpp | 8 +- kcontrol/randr/ktimerdialog.h | 2 +- kcontrol/samba/AUTHORS | 2 +- kcontrol/samba/kcmsambaimports.cpp | 6 +- kcontrol/samba/kcmsambalog.cpp | 16 +-- kcontrol/samba/kcmsambastatistics.cpp | 40 ++++---- kcontrol/samba/ksmbstatus.cpp | 8 +- kcontrol/samba/main.cpp | 6 +- kcontrol/samba/smbstatus.desktop | 22 ++--- kcontrol/screensaver/advanceddialogimpl.ui | 32 +++--- kcontrol/screensaver/category_list | 2 +- kcontrol/screensaver/kswidget.cpp | 2 +- kcontrol/screensaver/scrnsave.cpp | 26 ++--- kcontrol/smartcard/nosmartcardbase.ui | 12 +-- kcontrol/smartcard/smartcard.cpp | 6 +- kcontrol/smartcard/smartcardbase.ui | 14 +-- kcontrol/smserver/smserverconfigdlg.ui | 10 +- kcontrol/spellchecking/spellchecking.cpp | 8 +- kcontrol/style/kcmstyle.cpp | 32 +++--- kcontrol/style/keramik/keramikconf.cpp | 10 +- kcontrol/style/menupreview.cpp | 12 +-- kcontrol/style/stylepreview.ui | 22 ++--- kcontrol/taskbar/kcmtaskbar.cpp | 4 +- kcontrol/taskbar/kcmtaskbarui.ui | 24 ++--- kcontrol/usbview/kcmusb.cpp | 10 +- kcontrol/usbview/kcmusb.desktop | 4 +- kcontrol/usbview/usb.ids | 18 ++-- kcontrol/usbview/usbdevices.cpp | 8 +- kcontrol/view1394/kcmview1394.desktop | 4 +- kcontrol/view1394/oui.db | 2 +- kcontrol/view1394/view1394widget.ui | 8 +- kcontrol/xinerama/kcmxinerama.cpp | 4 +- kcontrol/xinerama/xineramawidget.ui | 10 +- 278 files changed, 1621 insertions(+), 1621 deletions(-) (limited to 'kcontrol') diff --git a/kcontrol/TODO b/kcontrol/TODO index b3b8d2971..48d8587b4 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 replaced by the new kcm_useraccount +* Remove "Internet & Network/Email". It is tqreplaced by the new kcm_useraccount -* Remove "System Administration/User Info". It is replaced by the new kcm_useraccount +* Remove "System Administration/User Info". It is tqreplaced by the new kcm_useraccount -* Remove "Privacy & Crypto/Passwords". It is replaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron) +* Remove "Privacy & Crypto/Passwords". It is tqreplaced 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 layout and it would be much easier to see at once what the dialog is about. +That way one would have a much cleaner tqlayout 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 contains 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 tqcontains 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 contains all the nice +After pressing the "Customize"-Button a dialog should pop up which tqcontains all the nice "Add"-checkboxes which have been added recently. diff --git a/kcontrol/access/eventsrc b/kcontrol/access/eventsrc index 185460ec4..f8ac0d207 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 Status geändert und ist jetzt aktiv +Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus 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 Status geändert und ist jetzt inaktiv +Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus 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 Status geändert und ist nun aktiv +Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus 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 Status geändert und ist nun inaktiv +Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus 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 10c593ed7..5dca89695 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -31,7 +31,7 @@ #include "kaccess.moc" struct ModifierKey { - const unsigned int mask; + const unsigned int tqmask; const KeySym keysym; const char *name; const char *lockedText; @@ -303,9 +303,9 @@ void KAccessApp::readSettings() overlay = 0; } -static int maskToBit (int mask) { +static int tqmaskToBit (int tqmask) { for (int i = 0; i < 8; i++) - if (mask & (1 << i)) + if (tqmask & (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 mask = modifierKeys[i].mask; - if (mask == 0) + int tqmask = modifierKeys[i].tqmask; + if (tqmask == 0) if (modifierKeys[i].keysym != 0) - mask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym); + tqmask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym); else if (!strcmp(modifierKeys[i].name, "Win")) - mask = KKeyNative::modX(KKey::WIN); + tqmask = KKeyNative::modX(KKey::WIN); else - mask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch) + tqmask = 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 = maskToBit (mask); + int bit = tqmaskToBit (tqmask); 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.mask; + modifiers = type->map[i].mods.tqmask; found = true; } } @@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() { TQVBoxLayout * vlay = new TQVBoxLayout(lay); featuresLabel = new TQLabel( "", contents ); - featuresLabel->setAlignment( WordBreak|AlignVCenter ); + featuresLabel->tqsetAlignment( WordBreak|AlignVCenter ); vlay->addWidget( featuresLabel ); vlay->addStretch(); diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index d7e114c55..ecd55e02b 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.mask; + modifiers = type->map[i].mods.tqmask; 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->layout(), + TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(), 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->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), 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->sizeHint().height()*2); + colorButton->setFixedWidth(colorButton->tqsizeHint().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->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), 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->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), 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->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + kNotifyModifiersButton->tqsetSizePolicy(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->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), 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->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), 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->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), 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->layout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->tqlayout(), 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->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + kNotifyAccessXButton->tqsetSizePolicy(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 5d0069a09..f18758eac 100644 --- a/kcontrol/accessibility/accessibilityconfigwidget.ui +++ b/kcontrol/accessibility/accessibilityconfigwidget.ui @@ -5,7 +5,7 @@ AccessibilityConfigWidget - + 0 0 @@ -95,7 +95,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -152,7 +152,7 @@ Please note that on slow machines this may cause a "lag" between the event causi - layout9 + tqlayout9 @@ -244,7 +244,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -338,7 +338,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Expanding - + 0 15 @@ -363,7 +363,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Expanding - + 20 0 @@ -420,7 +420,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -534,7 +534,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -625,7 +625,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -683,7 +683,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Expanding - + 21 61 @@ -789,7 +789,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Ma&ximum speed: - + AlignVCenter|AlignRight @@ -806,7 +806,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Acceleration &time: - + AlignVCenter|AlignRight @@ -895,7 +895,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Fixed - + 20 20 @@ -944,7 +944,7 @@ Please note that on slow machines this may cause a "lag" between the event causi &Repeat interval: - + AlignVCenter|AlignRight @@ -992,7 +992,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Acceleration &profile: - + AlignVCenter|AlignRight @@ -1087,7 +1087,7 @@ Please note that on slow machines this may cause a "lag" between the event causi &Acceleration delay: - + AlignVCenter|AlignRight @@ -1108,7 +1108,7 @@ Please note that on slow machines this may cause a "lag" between the event causi Expanding - + 20 1 @@ -1610,8 +1610,8 @@ Please note that on slow machines this may cause a "lag" between the event causi updateFlashScreenColor() - - + + kcmodule.h kurlrequester.h diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 792951aec..68ca85932 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -116,7 +116,7 @@ void KArtsModule::initAudioIOList() void KArtsModule::slotArtsdExited(KProcess* proc) { - latestProcessStatus = proc->exitStatus(); + latestProcesstqStatus = proc->exitStatus(); delete proc; } @@ -151,17 +151,17 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name) initAudioIOList(); - TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQTabWidget *tab = new TQTabWidget(this); - layout->addWidget(tab); + tqlayout->addWidget(tab); general = new generalTab(tab); hardware = new hardwareTab(tab); //mixer = KCModuleLoader::loadModule("kmixcfg", tab); //midi = new KMidConfig(tab, "kmidconfig"); - general->layout()->setMargin( KDialog::marginHint() ); - hardware->layout()->setMargin( KDialog::marginHint() ); + general->tqlayout()->setMargin( KDialog::marginHint() ); + hardware->tqlayout()->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::fromLatin1("jack")); + bool jack = (audioIO == TQString::tqfromLatin1("jack")); if(jack) { customRate->setChecked(false); @@ -549,7 +549,7 @@ bool KArtsModule::realtimeIsPossible() delete checkProcess; realtimePossible = false; } - else if (latestProcessStatus == 0) + else if (latestProcesstqStatus == 0) { realtimePossible = true; } @@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans, TQString args; if(fragmentCount) - args += TQString::fromLatin1(" -F %1").arg(fragmentCount); + args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount); if(fragmentSize) - args += TQString::fromLatin1(" -S %1").arg(fragmentSize); + args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize); if (!audioIO.isEmpty()) - args += TQString::fromLatin1(" -a %1").arg(audioIO); + args += TQString::tqfromLatin1(" -a %1").arg(audioIO); if (duplex) - args += TQString::fromLatin1(" -d"); + args += TQString::tqfromLatin1(" -d"); if (netTrans) - args += TQString::fromLatin1(" -n"); + args += TQString::tqfromLatin1(" -n"); if (!deviceName.isEmpty()) - args += TQString::fromLatin1(" -D ") + deviceName; + args += TQString::tqfromLatin1(" -D ") + deviceName; if (rate) - args += TQString::fromLatin1(" -r %1").arg(rate); + args += TQString::tqfromLatin1(" -r %1").arg(rate); if (bits) - args += TQString::fromLatin1(" -b %1").arg(bits); + args += TQString::tqfromLatin1(" -b %1").arg(bits); if (autoSuspend && suspendTime) - args += TQString::fromLatin1(" -s %1").arg(suspendTime); + args += TQString::tqfromLatin1(" -s %1").arg(suspendTime); if (!addOptions.isEmpty()) args += TQChar(' ') + addOptions; - args += TQString::fromLatin1(" -m artsmessage"); - args += TQString::fromLatin1(" -c drkonqi"); - args += TQString::fromLatin1(" -l 3"); - args += TQString::fromLatin1(" -f"); + args += TQString::tqfromLatin1(" -m artsmessage"); + args += TQString::tqfromLatin1(" -c drkonqi"); + args += TQString::tqfromLatin1(" -l 3"); + args += TQString::tqfromLatin1(" -f"); return args; } diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h index 80df5bd8e..2e033286d 100644 --- a/kcontrol/arts/arts.h +++ b/kcontrol/arts/arts.h @@ -92,7 +92,7 @@ private: hardwareTab *hardware; KConfig *config; DeviceManager *deviceManager; - int latestProcessStatus; + int latestProcesstqStatus; int fragmentCount; int fragmentSize; bool configChanged; diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui index 5b7ba7f79..19aa6444a 100644 --- a/kcontrol/arts/generaltab.ui +++ b/kcontrol/arts/generaltab.ui @@ -4,7 +4,7 @@ generalTab - + 0 0 @@ -12,7 +12,7 @@ 613 - + 0 450 @@ -186,7 +186,7 @@ Recommended if you want sound. - layout7 + tqlayout7 @@ -227,7 +227,7 @@ Recommended if you want sound. Expanding - + 173 20 @@ -240,7 +240,7 @@ Recommended if you want sound. - layout3 + tqlayout3 @@ -256,7 +256,7 @@ Recommended if you want sound. Expanding - + 40 20 @@ -289,7 +289,7 @@ Recommended if you want sound. Expanding - + 40 20 @@ -308,7 +308,7 @@ Recommended if you want sound. Expanding - + 20 0 @@ -322,7 +322,7 @@ Recommended if you want sound. krichtextlabel.h - + knuminput.h knuminput.h diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui index c11f19962..977cb6440 100644 --- a/kcontrol/arts/hardwaretab.ui +++ b/kcontrol/arts/hardwaretab.ui @@ -4,7 +4,7 @@ hardwareTab - + 0 0 @@ -35,7 +35,7 @@ - layout57 + tqlayout57 @@ -77,7 +77,7 @@ - layout31 + tqlayout31 @@ -117,7 +117,7 @@ - layout4 + tqlayout4 @@ -133,7 +133,7 @@ Fixed - + 20 20 @@ -189,7 +189,7 @@ Expanding - + 0 20 @@ -208,7 +208,7 @@ - layout6 + tqlayout6 @@ -252,7 +252,7 @@ Expanding - + 0 20 @@ -345,7 +345,7 @@ Expanding - + 20 60 @@ -354,5 +354,5 @@ - + diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp index 5c7618a1b..0d20965c7 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); - setAlignment( Qt::WordBreak ); + tqsetAlignment( Qt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); - setAlignment( Qt::WordBreak ); + tqsetAlignment( Qt::WordBreak ); } void KRichTextLabel::setDefaultWidth(int defaultWidth) @@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -TQSize KRichTextLabel::minimumSizeHint() const +TQSize KRichTextLabel::tqminimumSizeHint() const { TQString qt_text = qrichtextify( text() ); int pref_width = 0; @@ -97,9 +97,9 @@ TQSize KRichTextLabel::minimumSizeHint() const return TQSize(pref_width, rt.height()); } -TQSize KRichTextLabel::sizeHint() const +TQSize KRichTextLabel::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } void KRichTextLabel::setText( const TQString &text ) { diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index 40ead0375..178630bc2 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -24,7 +24,7 @@ #include /** - * @short A replacement for TQLabel that supports richtext and proper layout management + * @short A tqreplacement for TQLabel that supports richtext and proper tqlayout management * * @author Waldo Bastian */ @@ -45,8 +45,8 @@ public: int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual TQSize minimumSizeHint() const; - virtual TQSize sizeHint() const; + virtual TQSize tqminimumSizeHint() const; + virtual TQSize tqsizeHint() const; TQSizePolicy sizePolicy() const; public slots: diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index e1f9ece96..c6b21c38a 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->sizeHint()); + m_RefreshEdit->setFixedSize(m_RefreshEdit->tqsizeHint()); 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 6aa3d436a..4048c820f 100644 --- a/kcontrol/background/bgadvanced_ui.ui +++ b/kcontrol/background/bgadvanced_ui.ui @@ -4,7 +4,7 @@ BGAdvancedBase - + 0 0 @@ -91,7 +91,7 @@ Expanding - + 20 20 @@ -138,7 +138,7 @@ false - + 400 0 @@ -223,7 +223,7 @@ You can also remove programs from this list clicking on the <b>Remove</ Expanding - + 220 20 @@ -376,7 +376,7 @@ You can also remove programs from this list clicking on the <b>Remove</ Expanding - + 20 20 @@ -395,7 +395,7 @@ You can also remove programs from this list clicking on the <b>Remove</ Expanding - + 20 16 @@ -453,8 +453,8 @@ You can also remove programs from this list clicking on the <b>Remove</ kdialog.h - - + + kcolorbutton.h kcolorbutton.h diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 8294f53a3..309d19d08 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::fromLatin1("fileopen")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("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( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support + connect( tqApp->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.

" " KDE allows you to have the wallpaper change automatically at specified" - " intervals of time. You can also replace the background with a program" + " intervals of time. You can also tqreplace 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->setAlignment(Qt::AlignCenter); + screenLabel->tqsetAlignment(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->sizeHint()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); @@ -524,7 +524,7 @@ void BGDialog::loadWallpaperFilesList() { if (imageCaption.isEmpty()) { imageCaption = fileName; - imageCaption.replace('_', ' '); + imageCaption.tqreplace('_', ' '); imageCaption = KStringHandler::capwords(imageCaption); } @@ -571,7 +571,7 @@ void BGDialog::loadWallpaperFilesList() { else imageCaption = (*it).mid(slash); - imageCaption.replace('_', ' '); + imageCaption.tqreplace('_', ' '); imageCaption = KStringHandler::capwords(imageCaption); } @@ -943,7 +943,7 @@ void BGDialog::slotWallpaperTypeChanged(int i) else m_wallpaperPos = KBackgroundSettings::Tiled; } - else if (KMimeType::findByPath(path)->is("image/svg+xml")) + else if (KMimeType::tqfindByPath(path)->is("image/svg+xml")) { m_wallpaperPos = KBackgroundSettings::Scaled; } @@ -1004,7 +1004,7 @@ void BGDialog::slotSetupMulti() { KBackgroundRenderer *r = eRenderer(); - BGMultiWallpaperDialog dlg(r, topLevelWidget()); + BGMultiWallpaperDialog dlg(r, tqtopLevelWidget()); 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, topLevelWidget(), m_multidesktop); + BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop); if (!m_pMonitorArrangement->isEnabled()) { dlg.makeReadOnly(); diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui index 7cc6571d5..93df51428 100644 --- a/kcontrol/background/bgdialog_ui.ui +++ b/kcontrol/background/bgdialog_ui.ui @@ -4,7 +4,7 @@ BGDialog_UI - + 0 0 @@ -105,7 +105,7 @@ Expanding - + 0 0 @@ -114,7 +114,7 @@ - layout36 + tqlayout36 @@ -132,7 +132,7 @@ 0 - + 100 0 @@ -141,7 +141,7 @@ - layout35 + tqlayout35 @@ -161,7 +161,7 @@ Minimum - + 4 20 @@ -197,7 +197,7 @@ Minimum - + 4 20 @@ -219,7 +219,7 @@ Minimum - + 4 20 @@ -255,7 +255,7 @@ Minimum - + 4 20 @@ -277,7 +277,7 @@ Minimum - + 4 20 @@ -313,7 +313,7 @@ Minimum - + 4 20 @@ -333,7 +333,7 @@ MinimumExpanding - + 20 0 @@ -386,7 +386,7 @@ - layout31 + tqlayout31 @@ -440,7 +440,7 @@ - layout23 + tqlayout23 @@ -522,7 +522,7 @@ Fixed - + 120 10 @@ -539,7 +539,7 @@ Fixed - + 130 10 @@ -613,7 +613,7 @@ Expanding - + 260 20 @@ -641,7 +641,7 @@ Expanding - + 110 16 @@ -711,8 +711,8 @@ kurlrequester.h kdialog.h - - + + kcombobox.h kcolorbutton.h diff --git a/kcontrol/background/bghash.h b/kcontrol/background/bghash.h index ab13daf90..b59a46f96 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.unicode(); + const TQChar *p = key.tqunicode(); 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 f78a7b616..3c2278722 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 contains the preview of the background. The monitor image + // image that tqcontains 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) { - setAlignment(AlignCenter); + tqsetAlignment(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 contains a preview of what the current settings will look like on your desktop.") ); + TQWhatsThis::add( this, i18n("This picture of a monitor tqcontains a preview of what the current settings will look like on your desktop.") ); } void BGMonitorLabel::updateMonitorGeometry() { - double scaleX = double(width()) / double(sizeHint().width()); - double scaleY = double(height()) / double(sizeHint().height()); + double scaleX = double(width()) / double(tqsizeHint().width()); + double scaleY = double(height()) / double(tqsizeHint().height()); - kdDebug() << k_funcinfo << " Setting geometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl; + kdDebug() << k_funcinfo << " Setting tqgeometry 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) { - setAlignment(AlignCenter); + tqsetAlignment(AlignCenter); setScaledContents(true); setAcceptDrops(true); } diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index f11363982..288a06aa3 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()->geometry().size(); + m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->tqgeometry().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()->geometry().size(); + m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->tqgeometry().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.replace(pos, 2, KShellProcess::quote(m_Tempfile->name())); + cmd.tqreplace(pos, 2, KShellProcess::quote(m_Tempfile->name())); pos += m_Tempfile->name().length() - 2; break; case 'x': num.setNum(m_Size.width()); - cmd.replace(pos, 2, num); + cmd.tqreplace(pos, 2, num); pos += num.length() - 2; break; case 'y': num.setNum(m_Size.height()); - cmd.replace(pos, 2, num); + cmd.tqreplace(pos, 2, num); pos += num.length() - 2; break; case '%': - cmd.replace(pos, 2, "%"); + cmd.tqreplace(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, repainting the desktop causes nasty effect (XFree86 4.1.0 ) + // with tileWidth>2, tqrepainting 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.contains( TQRect( TQPoint( 0, 0 ), m_Size )) + else if( m_WallpaperRect.tqcontains( 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(src.scanLine(soffs.y() + y) + (soffs.x() + x) * sizeof(QRgb)); - 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)); + 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)); } } } @@ -946,8 +946,8 @@ void KBackgroundRenderer::createTempFile() TQString KBackgroundRenderer::cacheFileName() { TQString f = fingerprint(); - f.replace ( ':', '_' ); // avoid characters that shouldn't be in filenames - f.replace ( '/', '#' ); + f.tqreplace ( ':', '_' ); // avoid characters that shouldn't be in filenames + f.tqreplace ( '/', '#' ); 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()->geometry().size(); + m_size = KApplication::desktop()->tqgeometry().size(); } KVirtualBGRenderer::~KVirtualBGRenderer() @@ -1153,7 +1153,7 @@ void KVirtualBGRenderer::setEnabled(bool enable) void KVirtualBGRenderer::desktopResized() { - m_size = KApplication::desktop()->geometry().size(); + m_size = KApplication::desktop()->tqgeometry().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()->geometry().size(); + return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->tqgeometry().size(); } diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index 8d3bdac0f..90d028e22 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.contains(s)) { + if (m_BMMap.tqcontains(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.contains(s)) { + if (m_BlMMap.tqcontains(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.contains(s)) { + if (m_MMMap.tqcontains(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.contains(s)) { + if (m_WMMap.tqcontains(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) { - Q_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false); + TQ_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 c3d9a9a40..a0a4a2a96 100644 --- a/kcontrol/background/bgwallpaper_ui.ui +++ b/kcontrol/background/bgwallpaper_ui.ui @@ -4,7 +4,7 @@ BGMultiWallPaperBase - + 0 0 @@ -37,7 +37,7 @@ - layout3 + tqlayout3 @@ -69,7 +69,7 @@ Expanding - + 20 20 @@ -80,7 +80,7 @@ - layout4 + tqlayout4 @@ -98,7 +98,7 @@ 0 - + 300 100 @@ -123,7 +123,7 @@ Expanding - + 20 20 @@ -162,6 +162,6 @@ bgwallpaper.h kdialog.h - - + + diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index da77d7cda..e6e7bce35 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 *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); m_base = new BGDialog(this, m_pConfig); setQuickHelp( m_base->quickHelp()); - layout->add(m_base); - layout->addStretch(); + tqlayout->add(m_base); + tqlayout->addStretch(); KImageIO::registerFormats(); diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 10d774da7..c0b9c20fc 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 *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); int row = 0; TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this ); box->setColumnLayout( 0, Qt::Horizontal ); - layout->addWidget(box); - layout->addStretch(); - TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint()); + tqlayout->addWidget(box); + tqlayout->addStretch(); + TQGridLayout *grid = new TQGridLayout(box->tqlayout(), 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 109e436c4..cc83f6306 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, "layout1" ); - TQHBoxLayout *layout1 = new TQHBoxLayout( privateLayoutWidget, 0, 0, "ntplayout"); + privateLayoutWidget = new TQWidget( this, "tqlayout1" ); + TQHBoxLayout *tqlayout1 = new TQHBoxLayout( privateLayoutWidget, 0, 0, "ntptqlayout"); 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())); - layout1->addWidget( setDateTimeAuto ); + tqlayout1->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); - layout1->addWidget( timeServerList ); + tqlayout1->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->sizeHint()); + cal->setMinimumSize(cal->tqsizeHint()); 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->setAlignment( TQLabel::AlignCenter ); + dots1->tqsetAlignment( 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->setAlignment( TQLabel::AlignCenter ); + dots2->tqsetAlignment( 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::currentDate(); + date = TQDate::tqcurrentDate(); 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.replace( TQRegExp(".*\\("), "" ); - timeServer.replace( TQRegExp("\\).*"), "" ); + timeServer.tqreplace( TQRegExp(".*\\("), "" ); + timeServer.tqreplace( 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; - repaint(); + tqrepaint(); } 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 = colorGroup().dark(); - TQColor shadow = colorGroup().text(); + TQColor hands = tqcolorGroup().dark(); + TQColor shadow = tqcolorGroup().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 86e47e7ad..d6a52456c 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 *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); dtime = new Dtime(this); - layout->addWidget(dtime); + tqlayout->addWidget(dtime); connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool))); tzone = new Tzone(this); - layout->addWidget(tzone); + tqlayout->addWidget(tzone); connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool))); - layout->addStretch(); + tqlayout->addStretch(); if(getuid() == 0) setButtons(Help|Apply); diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 6161198c0..bfb32c557 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 replaced by the selected color scheme.

" + " be tqreplaced by the selected color scheme.

" " 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 912040fe2..6b93e8481 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_mask_bits[] = { +static unsigned char close_tqmask_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_mask_bits[] = { +static unsigned char iconify_tqmask_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_mask_bits[] = { +static unsigned char maximize_tqmask_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_mask_bits[] = { +static unsigned char maximizedown_tqmask_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_mask_bits[] = { +static unsigned char menu_tqmask_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_mask_bits[] = { +static unsigned char pindown_tqmask_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_mask_bits[] = { +static unsigned char pinup_tqmask_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 67e68b3a3..3013321b8 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.contains( me->pos() ) ) { + if ( hotspots[i].rect.tqcontains( 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.contains( me->pos() ) ) { + if ( hotspots[i].rect.tqcontains( 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.contains( e->pos() ) ) { + if ( hotspots[i].rect.tqcontains( 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_mask_bits, true); + bitmap = TQBitmap(16, 16, close_tqmask_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_mask_bits, true); + bitmap = TQBitmap(16, 16, iconify_tqmask_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_mask_bits, true); + bitmap = TQBitmap(16, 16, maximize_tqmask_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_mask_bits, true); + bitmap = TQBitmap(16, 16, maximizedown_tqmask_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_mask_bits, true); + bitmap = TQBitmap(16, 16, menu_tqmask_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_mask_bits, true); + bitmap = TQBitmap(16, 16, pinup_tqmask_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_mask_bits, true); + bitmap = TQBitmap(16, 16, pindown_tqmask_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->repaint(); + vertScrollBar->tqrepaint(); 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( parentWidget()->back() ); - smplw.fill( parentWidget()->colorGroup().mid() ); + //smplw.fill( tqparentWidget()->back() ); + smplw.fill( tqparentWidget()->tqcolorGroup().mid() ); // Actually start painting in @@ -567,9 +567,9 @@ void WidgetCanvas::drawSampleWidgets() popup->setItemEnabled( id, false ); // HACK: Force Layouting - //Sad Eagle: sizeHint() forces layouting too, and it's a lot less visible - //popup->sizeHint(); // Breaks with Qt 3.3 - popup->resize(popup->sizeHint()); + //Sad Eagle: tqsizeHint() forces tqlayouting too, and it's a lot less visible + //popup->tqsizeHint(); // Breaks with Qt 3.3 + popup->resize(popup->tqsizeHint()); pm = TQPixmap::grabWidget( popup ); delete popup; @@ -585,12 +585,12 @@ void WidgetCanvas::drawSampleWidgets() // Valance qDrawWinPanel ( &paint, 0, 0, width(), height(), - parentWidget()->colorGroup(), TRUE, 0); + tqparentWidget()->tqcolorGroup(), TRUE, 0); // Stop the painting hotspots[ spot++ ] = HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ? - repaint( FALSE ); + tqrepaint( FALSE ); } diff --git a/kcontrol/componentchooser/EXAMPLE.desktop b/kcontrol/componentchooser/EXAMPLE.desktop index f5501162b..699601588 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]=Pomocny opis programu (dla informacji w okienku w prawym, górnym rogu) +Comment[pl]=Potqmocny 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]=Pomocný popis rozhrania pre informačný box v pravom hornom rohu +Comment[sk]=Potqmocný 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 886724970..6dd93e404 100644 --- a/kcontrol/componentchooser/browserconfig_ui.ui +++ b/kcontrol/componentchooser/browserconfig_ui.ui @@ -4,7 +4,7 @@ BrowserConfig_UI - + 0 0 @@ -70,7 +70,7 @@ - layout3 + tqlayout3 @@ -86,7 +86,7 @@ Fixed - + 20 20 @@ -134,7 +134,7 @@ Expanding - + 20 20 @@ -169,6 +169,6 @@ selectBrowser() - - + + diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index 88fdeb165..2da13b52a 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->sizeHint().height()); + txtEMailClient->setFixedHeight(txtEMailClient->tqsizeHint().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::fromLatin1("General") ); - TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); - preferredTerminal += TQString::fromLatin1(" -e "); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); + TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); + preferredTerminal += TQString::tqfromLatin1(" -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 -- contains sensitive data + // insure proper permissions -- tqcontains 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->sizeHint().width()); + ServiceChooser->setFixedWidth(ServiceChooser->tqsizeHint().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(it)->File); ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available"))); - ComponentDescription->setMinimumSize(ComponentDescription->sizeHint()); + ComponentDescription->setMinimumSize(ComponentDescription->tqsizeHint()); 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->sizeHint()); + configContainer->setMinimumSize(configWidget->tqsizeHint()); } if (configWidget) diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui index ed1ed7f7b..d872d774a 100644 --- a/kcontrol/componentchooser/componentchooser_ui.ui +++ b/kcontrol/componentchooser/componentchooser_ui.ui @@ -4,7 +4,7 @@ ComponentChooser_UI - + 0 0 @@ -91,7 +91,7 @@ - + WordBreak|AlignTop @@ -125,8 +125,8 @@ klistbox.h kdialog.h - - + + klistbox.h diff --git a/kcontrol/componentchooser/componentconfig_ui.ui b/kcontrol/componentchooser/componentconfig_ui.ui index d6a7bba87..fd5160ba4 100644 --- a/kcontrol/componentchooser/componentconfig_ui.ui +++ b/kcontrol/componentchooser/componentconfig_ui.ui @@ -26,7 +26,7 @@ - + WordBreak|AlignVCenter @@ -45,7 +45,7 @@ Expanding - + 0 91 @@ -58,6 +58,6 @@ kcombobox.h kdialog.h - - + + diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui index d4cb44085..79b204781 100644 --- a/kcontrol/componentchooser/emailclientconfig_ui.ui +++ b/kcontrol/componentchooser/emailclientconfig_ui.ui @@ -7,7 +7,7 @@ true - + 0 0 @@ -73,7 +73,7 @@ 0 - + 0 0 @@ -83,7 +83,7 @@ <ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: Attachment </li> </ul> - 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.<br> You can also use several placeholders which will be replaced with the actual values when the email client is called:<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: Attachment </li> </ul> + 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.<br> You can also use several placeholders which will be tqreplaced with the actual values when the email client is called:<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: Attachment </li> </ul> @@ -126,7 +126,7 @@ Expanding - + 0 16 @@ -165,7 +165,7 @@ Fixed - + 30 16 @@ -182,7 +182,7 @@ Fixed - + 30 16 @@ -231,6 +231,6 @@ selectEmailClient() - - + + diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui index 7d355fdd8..abebae591 100644 --- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui +++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui @@ -4,7 +4,7 @@ TerminalEmulatorConfig_UI - + 0 0 @@ -57,7 +57,7 @@ Expanding - + 0 87 @@ -82,7 +82,7 @@ Fixed - + 31 20 @@ -120,7 +120,7 @@ 0 - + 0 0 @@ -189,6 +189,6 @@ selectTerminalApp() - - + + diff --git a/kcontrol/crypto/certgen.ui b/kcontrol/crypto/certgen.ui index 19ee05535..cbffdf872 100644 --- a/kcontrol/crypto/certgen.ui +++ b/kcontrol/crypto/certgen.ui @@ -4,7 +4,7 @@ D_GenCert - + 0 0 @@ -19,7 +19,7 @@ TextLabel2 - + 10 40 @@ -41,7 +41,7 @@ TextLabel3 - + 10 100 @@ -57,7 +57,7 @@ TextLabel4 - + 10 130 @@ -73,7 +73,7 @@ T_CertType - + 10 10 @@ -89,7 +89,7 @@ TextLabel2_2 - + 10 70 @@ -105,7 +105,7 @@ TextLabel5 - + 10 160 @@ -121,7 +121,7 @@ TextLabel6 - + 10 190 @@ -137,7 +137,7 @@ TextLabel7 - + 10 220 @@ -153,7 +153,7 @@ TextLabel8 - + 10 250 @@ -169,7 +169,7 @@ L_CertType - + 180 10 @@ -182,7 +182,7 @@ LineEdit3 - + 180 100 @@ -198,7 +198,7 @@ TextLabel9 - + 10 280 @@ -214,7 +214,7 @@ LineEdit4_2_2_2 - + 180 220 @@ -230,7 +230,7 @@ LineEdit4_2_2_2_2 - + 180 250 @@ -246,7 +246,7 @@ LineEdit4_2_2_2_3 - + 180 280 @@ -262,7 +262,7 @@ E_Passphrase - + 180 40 @@ -281,7 +281,7 @@ E_Passphrase_2 - + 180 70 @@ -300,7 +300,7 @@ TextLabel10 - + 10 310 @@ -316,7 +316,7 @@ SpinBox1 - + 180 310 @@ -338,7 +338,7 @@ TextLabel11 - + 320 40 @@ -354,7 +354,7 @@ CheckBox1 - + 320 10 @@ -373,7 +373,7 @@ TextLabel12 - + 320 70 @@ -389,7 +389,7 @@ LineEdit19 - + 380 70 @@ -402,7 +402,7 @@ LineEdit4_2_2 - + 180 190 @@ -418,7 +418,7 @@ LineEdit4_2 - + 180 160 @@ -434,7 +434,7 @@ ComboBox2 - + 380 40 @@ -447,7 +447,7 @@ CheckBox2 - + 320 100 @@ -463,7 +463,7 @@ TextLabel13 - + 320 130 @@ -479,7 +479,7 @@ ComboBox5 - + 400 130 @@ -492,7 +492,7 @@ LineEdit4 - + 180 130 @@ -508,6 +508,6 @@ kdialog.h - - + + diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index d39c09752..4194fdaec 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").replace("\n", ", ")); + setText(1, cert.getValue("CN").tqreplace("\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").replace("\n", ", "); + TQString tmp = cert.getValue("CN").tqreplace("\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.replace("\n", ", "); + tmp.tqreplace("\n", ", "); setText(1, tmp); tmp = mcert.getValue("CN"); - tmp.replace("\n", ", "); + tmp.tqreplace("\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" - " replaced SSL in protocols such as POP3 and SMTP."); + " tqreplaced 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->sizeHint()); + tabs->resize(tabs->tqsizeHint()); load(); } @@ -1214,7 +1214,7 @@ void KCryptoConfig::save() pcerts->sync(); authcfg->sync(); - // insure proper permissions -- contains sensitive data + // insure proper permissions -- tqcontains 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::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime(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::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime(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::currentDateTime(Qt::UTC))); + : KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(Qt::UTC))); untilDate->setEnabled(x && !x->isPermanent()); pHash->setText(cert->getMD5DigestText()); delete cert; @@ -1587,7 +1587,7 @@ TryImportPassAgain: i; i = static_cast(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 replace it?"), i18n("SSL"), i18n("Replace")); + 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")); if (rc == KMessageBox::Cancel) { delete cert; return; @@ -1718,7 +1718,7 @@ TQString iss; TQPalette cspl; KSSLCertificate *cert = pkcs->getCertificate(); cspl = yValidFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime(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::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime(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::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime(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::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime(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.contains("-----BEGIN CERTIFICATE-----")) { + if (certtext.tqcontains("-----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.replace("-----BEGIN CERTIFICATE-----", TQString::null); - certtext = certtext.replace("-----END CERTIFICATE-----", TQString::null); + certtext = certtext.tqreplace("-----BEGIN CERTIFICATE-----", TQString::null); + certtext = certtext.tqreplace("-----END CERTIFICATE-----", TQString::null); certtext = certtext.stripWhiteSpace(); - certtext = certtext.replace("\n", TQString::null); + certtext = certtext.tqreplace("\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.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) { + if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("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.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) { + if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) { continue; } k = SSL_CIPHER_get_bits(sc, &j); diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui index c3d064b48..dfcf7768e 100644 --- a/kcontrol/css/cssconfig.ui +++ b/kcontrol/css/cssconfig.ui @@ -4,7 +4,7 @@ CSSConfigDialog - + 0 0 @@ -12,9 +12,9 @@ 195 - + - + <b>Stylesheets</b><p>See http://www.w3.org/Style/CSS for further information on cascading style sheets.</p> @@ -87,7 +87,7 @@ - layout3 + tqlayout3 @@ -103,7 +103,7 @@ Fixed - + 16 20 @@ -141,7 +141,7 @@ - layout2 + tqlayout2 @@ -157,7 +157,7 @@ Fixed - + 16 20 @@ -185,7 +185,7 @@ Expanding - + 451 20 @@ -206,7 +206,7 @@ Expanding - + 20 50 @@ -232,8 +232,8 @@ kdialog.h - - + + kurlrequester.h klineedit.h diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui index b19e08baf..da47ec849 100644 --- a/kcontrol/css/csscustom.ui +++ b/kcontrol/css/csscustom.ui @@ -4,7 +4,7 @@ CSSCustomDialog - + 0 0 @@ -243,7 +243,7 @@ Expanding - + 0 20 @@ -273,7 +273,7 @@ Expanding - + 20 0 @@ -315,7 +315,7 @@ Expanding - + 0 20 @@ -412,7 +412,7 @@ Expanding - + 0 20 @@ -429,7 +429,7 @@ Fixed - + 21 20 @@ -446,7 +446,7 @@ Fixed - + 20 20 @@ -463,7 +463,7 @@ Expanding - + 0 20 @@ -545,8 +545,8 @@ kcolorbutton.h kdialog.h - - + + kcolorbutton.h kcolorbutton.h diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui index 438d40d37..bf1b95fd1 100644 --- a/kcontrol/css/preview.ui +++ b/kcontrol/css/preview.ui @@ -4,7 +4,7 @@ PreviewDialog - + 0 0 @@ -37,7 +37,7 @@ Expanding - + 20 20 @@ -87,8 +87,8 @@ people.</p> kseparator.h kdialog.h - - + + kseparator.h diff --git a/kcontrol/css/template.cpp b/kcontrol/css/template.cpp index e237ed796..02bcf69ed 100644 --- a/kcontrol/css/template.cpp +++ b/kcontrol/css/template.cpp @@ -32,7 +32,7 @@ bool CSSTemplate::expand(TQString destname, const TQMap &dict TQString expr = line.mid(start+1, end-start-1); TQString res = dict[expr]; - line.replace(start, end-start+1, res); + line.tqreplace(start, end-start+1, res); } } os << line << endl; diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui index 848457a44..611629fad 100644 --- a/kcontrol/dnssd/configdialog.ui +++ b/kcontrol/dnssd/configdialog.ui @@ -4,7 +4,7 @@ ConfigDialog - + 0 0 @@ -20,7 +20,7 @@ 0 - + 0 0 @@ -73,7 +73,7 @@ true - + 11 51 @@ -95,7 +95,7 @@ LANButtor - + 11 23 @@ -180,7 +180,7 @@ is configured with 'Browse local network' option above. - layout7 + tqlayout7 @@ -204,7 +204,7 @@ is configured with 'Browse local network' option above. Expanding - + 130 21 @@ -264,7 +264,7 @@ is configured with 'Browse local network' option above. Expanding - + 90 20 @@ -281,7 +281,7 @@ is configured with 'Browse local network' option above. Expanding - + 90 21 @@ -300,7 +300,7 @@ is configured with 'Browse local network' option above. Expanding - + 50 110 @@ -318,7 +318,7 @@ is configured with 'Browse local network' option above. kcmodule.h - + kcmodule.h keditlistbox.h diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 97b532b54..f2d9907dc 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::fromLatin1( KDE_CONFDIR "/kdnssdrc" )); + domain = new KSimpleConfig( TQString::tqfromLatin1( 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 avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus"); - avahiStatus.start(); - while (avahiStatus.isRunning()) { + TQProcess avahitqStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahitqStatus"); + avahitqStatus.start(); + while (avahitqStatus.isRunning()) { kapp->processEvents(); } - int exitStatus = avahiStatus.exitStatus(); + int exitStatus = avahitqStatus.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 a0bf4593b..52ebe69b1 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øgemaskiner,Genveje +Keywords[da]=Udvidet netsøgning,Netsøgning,www,Internet,Internet-nøgleord,Internet-filtre,Søgetqmaskiner,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 a41ab92e3..f6e5efc49 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 *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = 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(); - layout->setMargin(-KDialog::marginHint()); + tqlayout->setMargin(-KDialog::marginHint()); } - layout->addWidget(widget); + tqlayout->addWidget(widget); } void KURIFilterModule::load() diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui index fdeeb27ca..302bdf21b 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui @@ -4,7 +4,7 @@ FilterOptionsUI - + 0 0 @@ -34,7 +34,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo - layout10 + tqlayout10 @@ -161,7 +161,7 @@ Select the search engine to use for input boxes that provide automatic lookup se Expanding - + 21 170 @@ -254,5 +254,5 @@ Select the search engine to use for input boxes that provide automatic lookup se cmbDefaultEngine cmbDelimiter - + diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index 9f3a245fc..3f96f90e2 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.replace (i, 1, "%20"); + s = s.tqreplace (i, 1, "%20"); n++; } start = pos + qsexpr.matchedLength() + 2*n; // Move after last quote - userquery = userquery.replace (pos, qsexpr.matchedLength(), s); + userquery = userquery.tqreplace (pos, qsexpr.matchedLength(), s); } } @@ -164,10 +164,10 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, { int i = 0; while ((i = userquery.find("%20")) != -1) - userquery = userquery.replace(i, 3, " "); + userquery = userquery.tqreplace(i, 3, " "); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) - *it = (*it).replace("%20", " "); + *it = (*it).tqreplace("%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.replace(j, 3, " "); + v = v.tqreplace(j, 3, " "); // Insert partial queries (referenced by \1 ... \n) to map: - map.replace(TQString::number(i), v); + map.tqreplace(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.replace(j, 3, "\\"); - map.replace(k, s); + while ((j = s.find("%5C")) != -1) s = s.tqreplace(j, 3, "\\"); + map.tqreplace(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 replace it with \{@} (compatibility mode): + // Check, if old style '\1' is found and tqreplace it with \{@} (compatibility mode): { int pos = -1; if ((pos = newurl.find("\\1")) >= 0) { PIDDBG << "WARNING: Using compatibility mode for newurl='" << newurl - << "'. Please replace old style '\\1' with new style '\\{0}' " + << "'. Please tqreplace old style '\\1' with new style '\\{0}' " "in the query definition.\n"; - newurl = newurl.replace(pos, 2, "\\{@}"); + newurl = newurl.tqreplace(pos, 2, "\\{@}"); } } @@ -307,7 +307,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & v = encodeString(s, encodingMib); PDVAR (" default", s); } - else if (map.contains(rlitem)) + else if (map.tqcontains(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.replace (vpos, 1, "%2B"); + v = v.tqreplace (vpos, 1, "%2B"); } else if (rlitem == "@") @@ -353,7 +353,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & i++; } - newurl = newurl.replace(pos, reflist.matchedLength(), v); + newurl = newurl.tqreplace(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.replace (vpos, 2, v); + newurl = newurl.tqreplace (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 contains + // Return nothing if userquery is empty and it tqcontains // 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.replace("ikw_charset", cseta); + map.tqreplace("ikw_charset", cseta); // Add charset indicator for the fallback query to substitution map: TQString csetb = cset2; if (csetb.isEmpty()) csetb = "iso-8859-1"; - map.replace("wsc_charset", csetb); + map.tqreplace("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 - // contains the sycoca based search provider configuration (malte). + // tqcontains 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 35bb3242a..b9c60f2aa 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øgemaskine +Comment[da]=Søgetqmaskine 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 1a507c0ff..ab28f7e30 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui @@ -4,7 +4,7 @@ SearchProviderDlgUI - + 0 0 @@ -127,7 +127,7 @@ Recommended is \{@}, since it removes all query variables (name=value) from the leShortcut cbCharset - + klineedit.h klineedit.h diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop index 2e104f15b..cdc3590f1 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øgemaskiner +Name[da]=Mamma - moderen til alle søgetqmaskiner 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 7abbad0e1..761a20954 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ímaskrár +Name[is]=Leitarvél fyrir sítqmaskrá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 f0986c188..94565719c 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::fromLatin1(HOSTPORT_PATTERN) ) + m_hostPortPattern( TQString::tqfromLatin1(HOSTPORT_PATTERN) ) { configure(); } @@ -56,7 +56,7 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const if( m_hostPortPattern.exactMatch( cmd ) && isLocalDomainHost( cmd ) ) { - cmd.prepend( TQString::fromLatin1("http://") ); + cmd.prepend( TQString::tqfromLatin1("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::fromLatin1( "klocaldomainurifilterhelper" )); + TQString helper = KStandardDirs::findExe(TQString::tqfromLatin1( "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.replace( 0, host.length(), m_fullname ); + cmd.tqreplace( 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 9d15802f1..4f6464097 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::fromLatin1(x) +#define QFL1(x) TQString::tqfromLatin1(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.contains( exp ) ) + if ( cmd.tqcontains( 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.contains( exp ) ) + if ( cmd.tqcontains( 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.contains( exp ) ) + if ( cmd.tqcontains( 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::fromLatin1("http")) && + (url.protocol() != TQString::tqfromLatin1("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::fromLatin1("http")); + url.setProtocol( TQString::tqfromLatin1("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::fromLatin1( "\\\\") ) ) + if ( cmd.startsWith( TQString::tqfromLatin1( "\\\\") ) ) { // make sure path is unix style - cmd.replace('\\', '/'); - cmd.prepend( TQString::fromLatin1( "smb:" ) ); + cmd.tqreplace('\\', '/'); + cmd.prepend( TQString::tqfromLatin1( "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.replace ( 0, 1, TQDir::homeDirPath() ); + path.tqreplace ( 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.replace (0, slashPos, TQString::fromLocal8Bit(dir->pw_dir)); + path.tqreplace (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.replace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) ); + path.tqreplace( 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::fromLatin1("open"), KURL(), u)) + if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("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.contains( ' ' ) ) + if ( !cmd.tqcontains( ' ' ) ) { TQValueList::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::fromLatin1("open"), KURL(), u)) + if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("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 1d0241914..1ca4b48ae 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -50,7 +50,7 @@ #include extern "C" { #include -Status DPMSInfo ( Display *, CARD16 *, BOOL * ); +tqStatus 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 -Status DPMSInfo ( Display *, CARD16 *, BOOL * ); +tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * ); #endif } @@ -67,8 +67,8 @@ Status DPMSInfo ( Display *, CARD16 *, BOOL * ); extern "C" { #endif Bool DPMSQueryExtension(Display *, int *, int *); - Status DPMSEnable(Display *); - Status DPMSDisable(Display *); + tqStatus DPMSEnable(Display *); + tqStatus 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 bf856866a..2293bf6c8 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 mocą +Comment[pl]=Ustawienia zarządzania tqmocą 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 eb57f50ac..1c5127fca 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 * parentWidget = this; - TQVBoxLayout *secondLayout = new TQVBoxLayout(parentWidget, + TQWidget * tqparentWidget = this; + TQVBoxLayout *secondLayout = new TQVBoxLayout(tqparentWidget, 0, KDialog::spacingHint()); - m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), parentWidget ); - m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() ); + m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), tqparentWidget ); + m_autoEmbed->tqlayout()->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 bb4d15bd7..c5724186e 100644 --- a/kcontrol/filetypes/filegroupdetails.h +++ b/kcontrol/filetypes/filegroupdetails.h @@ -23,7 +23,7 @@ class TypesListItem; class TQButtonGroup; /** - * This widget contains the details for a filetype group. + * This widget tqcontains 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 a678e0eb2..ffa6ff010 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 contains a list of patterns that can be" + TQWhatsThis::add( extensionLB, i18n("This box tqcontains 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->layout()->setSpacing( KDialog::spacingHint() ); + m_autoEmbed->tqlayout()->setSpacing( KDialog::spacingHint() ); secondLayout->addWidget( m_autoEmbed, 1 ); - m_autoEmbed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) ); + m_autoEmbed->tqsetSizePolicy( 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->sizeHint().height() ); + embedServiceListWidget->setMinimumHeight( serviceListWidget->tqsizeHint().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-replace" ) || - mime->is( "multipart/replace" ) || + mime->is( "multipart/x-mixed-tqreplace" ) || + mime->is( "multipart/tqreplace" ) || mimeType.startsWith( "print" ) ) { neverAsk = true; diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h index b364d919d..c774d677f 100644 --- a/kcontrol/filetypes/filetypedetails.h +++ b/kcontrol/filetypes/filetypedetails.h @@ -13,7 +13,7 @@ class TQPushButton; class KServiceListWidget; /** - * This widget contains the right part of the file type configuration + * This widget tqcontains 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 ad60fc3de..d9d1f8138 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->setAlignment(AlignCenter); + m_emptyWidget->tqsetAlignment(AlignCenter); m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ ); diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp index 8ff08d157..e2429e661 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::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; + m_autoEmbed = config->readBoolEntry( TQString::tqfromLatin1("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::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; + unsigned int oldAutoEmbed = config->readBoolEntry( TQString::tqfromLatin1("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::fromLatin1("embed-")+m_major, m_autoEmbed == 0 ); + config->writeEntry( TQString::tqfromLatin1("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::fromLatin1("X-KDE-AutoEmbed"), false ); + config.deleteEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), false ); else - config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 ); + config.writeEntry( TQString::tqfromLatin1("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.contains( pService->desktopEntryPath() )) - || (!isApplication && !m_embedServices.contains( pService->desktopEntryPath() )) + if ( (isApplication && ! m_appServices.tqcontains( pService->desktopEntryPath() )) + || (!isApplication && !m_embedServices.tqcontains( 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->contains( pService->desktopEntryPath()) + TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes(); - if ( mimeTypeList.contains( name() ) ) { + if ( mimeTypeList.tqcontains( 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->contains( pService->desktopEntryPath()) + mimeTypeList = s_changedServices->tqcontains( 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->contains( s->desktopEntryPath()) + TQStringList mimeTypeList = s_changedServices->tqcontains( 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->contains( pService->desktopEntryPath()) + TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes(); - if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList)) + if (!mimeTypeList.tqcontains(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->contains( pService->desktopEntryPath()) + mimeTypeList = s_changedServices->tqcontains( 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 b082cf1fa..ab70526a3 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 *layout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint()); + TQGridLayout *tqlayout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint()); excludeRange=new TQCheckBox(i18n("E&xclude range:"), mw), - layout->addWidget(excludeRange, 0, 0); + tqlayout->addWidget(excludeRange, 0, 0); excludeFrom=new KDoubleNumInput(0, 72, 8.0, 1, 1, mw), excludeFrom->setSuffix(i18n(" pt")); - layout->addWidget(excludeFrom, 0, 1); + tqlayout->addWidget(excludeFrom, 0, 1); excludeToLabel=new TQLabel(i18n(" to "), mw); - layout->addWidget(excludeToLabel, 0, 2); + tqlayout->addWidget(excludeToLabel, 0, 2); excludeTo=new KDoubleNumInput(0, 72, 15.0, 1, 1, mw); excludeTo->setSuffix(i18n(" pt")); - layout->addWidget(excludeTo, 0, 3); + tqlayout->addWidget(excludeTo, 0, 3); useSubPixel=new TQCheckBox(i18n("&Use sub-pixel hinting:"), mw); - layout->addWidget(useSubPixel, 1, 0); + tqlayout->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) "
This will not work with CRT monitors.")); subPixelType=new TQComboBox(false, mw); - layout->addMultiCellWidget(subPixelType, 1, 1, 1, 3); + tqlayout->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); - layout->addWidget(hintingLabel, 2, 0); + tqlayout->addWidget(hintingLabel, 2, 0); hintingStyle=new TQComboBox(false, mw); - layout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3); + tqlayout->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 * layout = + TQVBoxLayout * tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQGridLayout * fontUseLayout = - new TQGridLayout(layout, nameGroupKeyRc.count() / 4, 3); + new TQGridLayout(tqlayout, 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(layout, KDialog::spacingHint()); + TQHBoxLayout *hblay = new TQHBoxLayout(tqlayout, 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())); - layout->addSpacing(KDialog::spacingHint()); + tqlayout->addSpacing(KDialog::spacingHint()); - TQGridLayout* lay = new TQGridLayout(layout, 2, 4, KDialog::spacingHint()); + TQGridLayout* lay = new TQGridLayout(tqlayout, 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 ); - layout->addStretch(1); + tqlayout->addStretch(1); aaSettings=new FontAASettings(this); diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp index 682672a7a..4718e8fd7 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.replace(0, len, TQString::fromLatin1("~")); + return path.tqreplace(0, len, TQString::tqfromLatin1("~")); } } @@ -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.replace(0, 1, TQDir::homeDirPath()); + return 1==path.length() ? TQDir::homeDirPath() : path.tqreplace(0, 1, TQDir::homeDirPath()); return path; } @@ -88,7 +88,7 @@ static TQString dirSyntax(const TQString &d) { TQString ds(d); - ds.replace("//", "/"); + ds.tqreplace("//", "/"); int slashPos=ds.findRev('/'); @@ -648,10 +648,10 @@ bool KXftConfig::apply() if(0!=str.find("add(base); + tqlayout->add(base); setRootOnlyMsg(i18n("The global ICC color profile is a system wide setting, and requires administrator access
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 c9be0818f..4823fab37 100644 --- a/kcontrol/iccconfig/iccconfigbase.ui +++ b/kcontrol/iccconfig/iccconfigbase.ui @@ -4,7 +4,7 @@ ICCConfigBase - + 0 0 @@ -168,7 +168,7 @@ Expanding - + 20 20 @@ -197,6 +197,6 @@ kdialog.h - - + + diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index d1454171e..a12bbed36 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->sizeHint()); + lbl->setFixedSize(lbl->tqsizeHint()); 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::fromLatin1( "systemtray_panelappletrc" )); - mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); + mpSystrayConfig = new KSimpleConfig( TQString::tqfromLatin1( "systemtray_panelappletrc" )); + mpKickerConfig = new KSimpleConfig( TQString::tqfromLatin1( "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]->setAlignment(AlignCenter); + mpPreview[i]->tqsetAlignment(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->sizeHint()); + lbl->setFixedSize(lbl->tqsizeHint()); 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->setAlignment(AlignCenter); + mpPreview->tqsetAlignment(AlignCenter); mpPreview->setMinimumSize(105, 105); grid->addWidget(mpPreview, 1, 0); diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 5d7f924a9..ad84e9e10 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 contains the name of the downloaded file + // themeTmpFile tqcontains 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 396a6ee4f..c16a8db0b 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 *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - layout->addWidget(tab); + tqlayout->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 770b2cdf3..d5cc677d3 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::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); + hexstr = TQString::tqfromLatin1("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::fromLatin1(", "); + txt = txt + TQString::tqfromLatin1(", "); } 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, CursorShape, RootWindow(dpy,scr), 65535, 65535, + XQueryBestSize (dpy, tqCursorShape, RootWindow(dpy,scr), 65535, 65535, &width, &height); last = new TQListViewItem(item, last, i18n("Largest Cursor"), (width == 65535 && height == 65535) - ? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height)); + ? i18n("unlimited") : TQString::tqfromLatin1("%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::fromLatin1(ServerVendor(dpy))); + last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::tqfromLatin1(ServerVendor(dpy))); last = new TQListViewItem(next, last, i18n("Vendor Release Number"), Value((int)VendorRelease(dpy))); last = new TQListViewItem(next, last, i18n("Version Number"), - TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) + TQString::tqfromLatin1("%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::fromLatin1( extensions[i] ) ); + item = new TQListViewItem( last, item, TQString::tqfromLatin1( 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::fromLatin1("\n\n") + DEFAULT_ERRORSTRING; + + TQString::tqfromLatin1("\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 *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); widgetStack = new TQWidgetStack(this); - layout->addWidget(widgetStack); + tqlayout->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->setAlignment(AlignCenter | WordBreak); + NoInfoText->tqsetAlignment(AlignCenter | WordBreak); widgetStack->raiseWidget(NoInfoText); load(); } diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp index 9aa0d3767..de7c3a095 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("Status")); + lBox->addColumn(i18n("tqStatus")); lBox->addColumn(i18n("Location")); lBox->addColumn(i18n("Description")); diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp index 18287c45f..74bb08258 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.contains(FS_NAME) > 0); + found_in_List = (Mounted_Partitions.tqcontains(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.contains('#')) { + if (!text.tqcontains('#')) { 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 02fd98b1d..d9857af28 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.contains("cpu")) + if (s.tqcontains("cpu")) seencpu = true; else continue; } - if (s.contains("boot device") || - s.contains("WARNING: old BSD partition ID!")) + if (s.tqcontains("boot device") || + s.tqcontains("WARNING: old BSD partition ID!")) break; if (!filter || (filter[0] == '^' && s.find(&filter[1]) == 0) - || (filter[0] != '^' && s.contains(filter))) { + || (filter[0] != '^' && s.tqcontains(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.contains("seconds for devices to settle")) { + if (s.tqcontains("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::fromLatin1("%1 (%2%%)") + vv[1] = TQString::tqfromLatin1("%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::fromLatin1("%1 (%2%%) ") + vv[3] = TQString::tqfromLatin1("%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::fromLatin1(#x " "); +#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::tqfromLatin1(#x " "); MNTF(ASYNC) MNTF(DEFEXPORTED) MNTF(EXKERB) diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp index 12ec8ee2d..22b6c8426 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.contains("cpu")) + if (s.tqcontains("cpu")) seencpu = true; else continue; } - if (s.contains("boot device") || - s.contains("WARNING: old BSD partition ID!")) + if (s.tqcontains("boot device") || + s.tqcontains("WARNING: old BSD partition ID!")) break; - if (!filter || s.contains(filter)) { + if (!filter || s.tqcontains(filter)) { if (func) { func(lBox, s, &opaque, false); } diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp index 5f18aebea..1b457f18a 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 - OSStatus status; + OStqStatus status; AudioDeviceID gOutputDeviceID; unsigned long propertySize; char deviceName[kMaxStringSize]; diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp index 9f2b17e1b..6dd215f55 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 alignment correctly? + // XXX: FIXME: how do I set column tqalignment correctly? lBox->setColumnAlignment( 3, 2 ); lBox->addColumn( i18n( "Free Size" )); - // XXX: FIXME: how do I set column alignment correctly? + // XXX: FIXME: how do I set column tqalignment 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 7bfe52948..0720f32a6 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->setAlignment(AlignLeft); + Widget->tqsetAlignment(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->setAlignment(AlignRight); + Widget->tqsetAlignment(AlignRight); MemSizeLabel[i][j] = Widget; vbox->addWidget(Widget, 1); } @@ -228,7 +228,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) hint = "" + hint + ""; Widget = new TQLabel("" + title + "", this); - Widget->setAlignment(AlignCenter); + Widget->tqsetAlignment(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->setAlignment(AlignCenter); + Widget->tqsetAlignment(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 contains the amount of used swap */ + /* used[0] already tqcontains 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 061e368e6..49b29f953 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::fromLatin1(ext); + TQString qext = TQString::tqfromLatin1(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 mask; + unsigned long tqmask; 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; - mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; + tqmask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; win = XCreateWindow(dpy, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, - visinfo->visual, mask, &attr); + visinfo->visual, tqmask, &attr); ctx = glXCreateContext( dpy, visinfo, NULL, allowDirect ); if (!ctx) { diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop index 4451c5167..fa38a0db3 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,maskinvareakselerasjon,bilde,X,X11,X-tenar,XFree86,skjerm +Keywords[nb]=OpenGL,DRI,GLX,3D,skjermkort,tqmaskinvareakselerasjon,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,maskinvareakselerasjon,grafikk,X,X11,X-tenar,XFree86,skjerm +Keywords[nn]=OpenGL,DRI,GLX,3D,skjermkort,tqmaskinvareakselerasjon,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 a2b5f1b86..90afbbdfd 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 *layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setMargin( KDialog::marginHint() ); - layout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setMargin( KDialog::marginHint() ); + tqlayout->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 01ba9966f..53353c3f6 100644 --- a/kcontrol/input/kmousedlg.ui +++ b/kcontrol/input/kmousedlg.ui @@ -4,7 +4,7 @@ KMouseDlg - + 0 0 @@ -57,7 +57,7 @@ Expanding - + 20 20 @@ -74,7 +74,7 @@ Expanding - + 20 20 @@ -112,7 +112,7 @@ 0 - + 150 115 @@ -181,10 +181,10 @@ - cb_pointershape + cb_pointertqshape - Cha&nge pointer shape over icons + Cha&nge pointer tqshape over icons true @@ -208,7 +208,7 @@ Fixed - + 20 60 @@ -217,7 +217,7 @@ - layout7 + tqlayout7 @@ -235,7 +235,7 @@ slAutoSelect - + 250 0 @@ -258,7 +258,7 @@ Expanding - + 230 20 @@ -283,7 +283,7 @@ Long - + AlignVCenter|AlignRight @@ -301,7 +301,7 @@ Fixed - + 20 21 @@ -331,7 +331,7 @@ Expanding - + 20 16 @@ -344,7 +344,7 @@ singleClick toggled(bool) - cb_pointershape + cb_pointertqshape setEnabled(bool) @@ -364,7 +364,7 @@ rightHanded leftHanded singleClick - cb_pointershape + cb_pointertqshape cbAutoSelect slAutoSelect doubleClick @@ -373,6 +373,6 @@ kdialog.h - - + + diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index 9fc8daf32..ee0c31b06 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 ) { - initCordlessStatusReporting(); + initCordlesstqStatusReporting(); // Do a name cordlessNameLabel->setText( i18n("Mouse type: %1").arg( cordlessName() ) ); @@ -118,15 +118,15 @@ LogitechMouse::~LogitechMouse() usb_close( m_usbDeviceHandle ); } -void LogitechMouse::initCordlessStatusReporting() +void LogitechMouse::initCordlesstqStatusReporting() { - updateCordlessStatus(); + updateCordlesstqStatus(); doUpdate = new TQTimer( this ); // will be automatically deleted connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) ); doUpdate->start( 20000 ); } -void LogitechMouse::updateCordlessStatus() +void LogitechMouse::updateCordlesstqStatus() { TQByteArray status(8); @@ -147,7 +147,7 @@ void LogitechMouse::updateCordlessStatus() } else { // kdDebug() << "P6 (connect status): " << (status[0] & 0xFF) << endl; if ( status[0] & 0x20 ) { // mouse is talking - m_connectStatus = ( status[0] & 0x80 ); + m_connecttqStatus = ( status[0] & 0x80 ); m_mousePowerup = ( status[0] & 0x40 ); m_receiverUnlock = ( status[0] & 0x10 ); m_waitLock = ( status[0] & 0x08 ); @@ -188,7 +188,7 @@ void LogitechMouse::updateCordlessStatus() void LogitechMouse::updateGUI() { - updateCordlessStatus(); + updateCordlesstqStatus(); 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") ); } - initCordlessStatusReporting(); + initCordlesstqStatusReporting(); } } @@ -238,7 +238,7 @@ void LogitechMouse::save(KConfig * /*config*/) kdDebug() << "Logitech mouse settings not saved - not implemented yet" << endl; } -Q_UINT8 LogitechMouse::resolution() +TQ_UINT8 LogitechMouse::resolution() { // kdDebug() << "resolution: " << m_resolution << endl; if ( 0 == m_resolution ) { @@ -299,13 +299,13 @@ void LogitechMouse::setLogitechTo400() } } -Q_UINT8 LogitechMouse::batteryLevel() +TQ_UINT8 LogitechMouse::batteryLevel() { return m_batteryLevel; } -Q_UINT8 LogitechMouse::channel() +TQ_UINT8 LogitechMouse::channel() { return m_channel; } diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h index 4ea296725..20e7400c2 100644 --- a/kcontrol/input/logitechmouse.h +++ b/kcontrol/input/logitechmouse.h @@ -61,36 +61,36 @@ protected slots: void stopTimerForNow(); private: - void initCordlessStatusReporting(); - void updateCordlessStatus(); + void initCordlesstqStatusReporting(); + void updateCordlesstqStatus(); void setLogitechTo400(); void setLogitechTo800(); TQString cordlessName(); - Q_UINT8 resolution(); + TQ_UINT8 resolution(); void updateResolution(); - Q_UINT8 batteryLevel(); - Q_UINT8 channel(); + TQ_UINT8 batteryLevel(); + TQ_UINT8 channel(); bool isDualChannelCapable(); TQTimer *doUpdate; struct usb_dev_handle *m_usbDeviceHandle; - bool m_connectStatus; // true if the CONNECT button on the mouse is pressed + bool m_connecttqStatus; // 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 - 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; + 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; 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 5c9c1cd9a..3b12782dc 100644 --- a/kcontrol/input/logitechmouse_base.ui +++ b/kcontrol/input/logitechmouse_base.ui @@ -4,7 +4,7 @@ LogitechMouseBase - + 0 0 @@ -31,7 +31,7 @@ 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. - + WordBreak|AlignVCenter @@ -149,5 +149,5 @@ - + diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 68f376474..1b64dbb9c 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_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->cb_pointertqshape, 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->layout(), KDialog::spacingHint()); + TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->tqlayout(), 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_pointershape->setChecked(settings->changeCursor); + tab1->cb_pointertqshape->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_pointershape->isChecked(); + settings->changeCursor = tab1->cb_pointertqshape->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(qRound(accelRate*10)), 10, thresholdMove); + true, true, int(tqRound(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 fe0f30281..8560e6453 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,CursorShape,Input ਜੰਤਰ,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,righthanded,left handed,ਕਲਿੱਕ,ਆਈਕਾਨ +Keywords[pa]=ਮਾਊਸ,ਮਾਊਸ ਪ੍ਰਵੇਸ਼,ਮਾਊਸ threshold,ਮਾਊਸ buttons,Selection,tqCursorShape,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 bee04d5ea..8d6bba1df 100644 --- a/kcontrol/input/mouse.h +++ b/kcontrol/input/mouse.h @@ -84,7 +84,7 @@ public: bool reverseScrollPolarity; #ifdef HAVE_LIBUSB - // TODO: In Qt4, replace with a better container. + // TODO: In Qt4, tqreplace with a better container. TQPtrList logitechMouseList; #endif }; diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index ceb399648..a7a35687c 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -68,8 +68,8 @@ namespace { "center_ptr", "circle", "dot", - "dot_box_mask", - "dot_box_mask", + "dot_box_tqmask", + "dot_box_tqmask", "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 ); - repaint( false ); + tqrepaint( false ); } @@ -311,7 +311,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * ) { TQPixmap buffer( size() ); TQPainter p( &buffer ); - p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) ); + p.fillRect( rect(), tqcolorGroup().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 7caf18c3f..38d41fff1 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 *layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setMargin( KDialog::marginHint() ); - layout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setMargin( KDialog::marginHint() ); + tqlayout->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.contains( path ) ) + if ( !themeDirs.tqcontains( 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 replace it with this one?" ).arg( *it ); + "theme folder. Do you want tqreplace 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 replaced is the current theme, it + // ### If the theme that's being tqreplaced 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 replace it, even though the global theme + // If that's the case it will effectively tqreplace 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.replace( "~/", TQDir::homeDirPath() + '/' ); + path.tqreplace( "~/", 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.contains( theme ) ) + if ( subdirs.tqcontains( 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 contains + // An icon theme is considered to be a cursor theme if it tqcontains // 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 - Q_UINT32 *dst = reinterpret_cast( image.bits() ); + TQ_UINT32 *dst = reinterpret_cast( 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( image.scanLine(dstOffset.y()) ) + dstOffset.x(); - src = reinterpret_cast( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x(); + dst = reinterpret_cast( image.scanLine(dstOffset.y()) ) + dstOffset.x(); + src = reinterpret_cast( 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 Q_UINT32 pixel = *src; + const TQ_UINT32 pixel = *src; - const Q_UINT8 a = qAlpha( pixel ); - const Q_UINT8 r = qRed( pixel ); - const Q_UINT8 g = qGreen( pixel ); - const Q_UINT8 b = qBlue( pixel ); + const TQ_UINT8 a = tqAlpha( pixel ); + const TQ_UINT8 r = tqRed( pixel ); + const TQ_UINT8 g = tqGreen( pixel ); + const TQ_UINT8 b = tqBlue( pixel ); if ( !a || a == 255 ) { *dst = pixel; } else { float alpha = a / 255.0; - *dst = qRgba( int(r / alpha), int(g / alpha), int(b / alpha), a ); + *dst = tqRgba( 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 ); - Q_UINT32 *data = reinterpret_cast< Q_UINT32* >( image.bits() ); + TQ_UINT32 *data = reinterpret_cast< TQ_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 e2014a1ca..647b67621 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 *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); setQuickHelp( i18n("

IO slaves

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()); - layout->addWidget(label); - layout->addWidget(hbox); + tqlayout->addWidget(label); + tqlayout->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 095f18f41..84135bb66 100644 --- a/kcontrol/joystick/caldialog.cpp +++ b/kcontrol/joystick/caldialog.cpp @@ -65,7 +65,7 @@ void CalDialog::calibrate() do { - qApp->processEvents(2000); + tqApp->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 { - qApp->processEvents(100); + tqApp->processEvents(100); if ( joydev->getEvent(type, number, value) ) { diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index 3ffc0e1d7..87b6f4e05 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->minimumSize()); + setMinimumSize(joyWidget->tqminimumSize()); setButtons(KCModule::Default); } diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index cfc293b89..d460eaf3c 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->sizeHint()); + icon->setFixedSize(icon->tqsizeHint()); message = new TQLabel(messageBox); messageBox->hide(); } diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index f25eae002..9c7d25898 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()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); + _viewer->widget()->tqsetSizePolicy( 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 598807a2d..4f0b14f4d 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("Loading..."), this); - _busyw->setAlignment(AlignCenter); + _busyw->tqsetAlignment(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( topLevelWidget() ); + KCGlobal::repairAccels( tqtopLevelWidget() ); return ( widget!=0 ); } diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index 0a409b7e0..ed892ac70 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::fromLatin1("Settings/Information/"); + _baseGroup = TQString::tqfromLatin1("Settings/Information/"); } else { kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl; - _baseGroup = TQString::fromLatin1("Settings/"); + _baseGroup = TQString::tqfromLatin1("Settings/"); } } } diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp index 723895de3..237cbdfe9 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 *layout=new TQVBoxLayout(this); + TQVBoxLayout *tqlayout=new TQVBoxLayout(this); TQLabel *label = new TQLabel(i18n("You need super user privileges to run this control module.
" "Click on the \"Administrator Mode\" button below."), this); - layout->addWidget(label); - label->setAlignment(AlignCenter); + tqlayout->addWidget(label); + label->tqsetAlignment(AlignCenter); label->setTextFormat(RichText); - label->setMinimumSize(label->sizeHint()); + label->setMinimumSize(label->tqsizeHint()); } diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 758b742fd..67ffdaa46 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::fromLatin1("InitialWidth %1").arg(desk.width()), + int x = config->readNumEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk.width()), QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) ); - int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()), + int y = config->readNumEntry(TQString::tqfromLatin1("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::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); - config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); + config->writeEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); + config->writeEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); config->sync(); } delete toplevel; diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index ad60eda5a..6ab262508 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, replace them with two ampersands. + // accelators, tqreplace them with two ampersands. TQString name = group->caption(); - name.replace("&", "&&"); + name.tqreplace("&", "&&"); 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, replace them with two ampersands. + // accelators, tqreplace them with two ampersands. TQString name = module->moduleName(); - name.replace("&", "&&"); + name.tqreplace("&", "&&"); 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 cc8c63af4..14b75c780 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->parentWidget()); - _embedFrame = new TQVBox( _module->parentWidget() ); + _embedLayout = new TQVBoxLayout(_module->tqparentWidget()); + _embedFrame = new TQVBox( _module->tqparentWidget() ); _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised ); TQPalette pal( red ); pal.setColor( TQColorGroup::Background, - _module->parentWidget()->colorGroup().background() ); + _module->tqparentWidget()->tqcolorGroup().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("Loading..."), _embedStack); - _busy->setAlignment(AlignCenter); + _busy->tqsetAlignment(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.containsRef(module)) + if (menu->modules.tqcontainsRef(module)) return it.currentKey(); } return TQString::null; diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index 6f767ab20..b15f0ccd6 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::sizeHint() const +TQSize ModuleTreeView::tqsizeHint() const { - return TQListView::sizeHint().boundedTo( + return TQListView::tqsizeHint().boundedTo( TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) ); } @@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList { while (item) { - setOpen(item, parentList->contains(item)); + setOpen(item, parentList->tqcontains(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 mask( pixmap.size(), true ); - pixmap.setMask( mask ); + TQBitmap tqmask( pixmap.size(), true ); + pixmap.setMask( tqmask ); TQListViewItem::setPixmap(0, pixmap); } } diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h index ede3c8a52..448251a6f 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 sizeHint() const; + TQSize tqsizeHint() const; signals: void moduleSelected(ConfigModule*); diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index b8f83c5fc..e50b67fa5 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -120,7 +120,7 @@ public: ~ProxyContentWidget(){} // this should be really done by qscrollview in AutoOneFit mode! - TQSize sizeHint() const { return minimumSizeHint(); } + TQSize tqsizeHint() const { return tqminimumSizeHint(); } }; @@ -144,7 +144,7 @@ ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool } client->reparent(contentWidget,0,TQPoint(0,0),true); vbox->addWidget( client ); - vbox->activate(); // make sure we have a proper minimumSizeHint + vbox->activate(); // make sure we have a proper tqminimumSizeHint addChild(contentWidget); } diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index aac3427ff..e4fa10d5b 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -85,7 +85,7 @@ TopLevel::TopLevel(const char* name) connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) ); } - // create the layout box + // create the tqlayout box _splitter = new TQSplitter( TQSplitter::Horizontal, this ); TQFrame* leftFrame = new TQFrame ( _splitter ); @@ -142,7 +142,7 @@ TopLevel::TopLevel(const char* name) // help widget _help = new HelpWidget(_dock); - _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + _stack->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // Restore sizes config->setGroup("General"); @@ -514,7 +514,7 @@ void TopLevel::aboutModule() TQString TopLevel::handleAmpersand( TQString modulename ) const { - if( modulename.contains( '&' )) // double it + if( modulename.tqcontains( '&' )) // double it { for( int i = modulename.length(); i >= 0; diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index f24af2c1e..461aeab22 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -78,7 +78,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) _lvLoD = new KListView( gb ); _lvLoD->addColumn(i18n("Service")); _lvLoD->addColumn(i18n("Description")); - _lvLoD->addColumn(i18n("Status")); + _lvLoD->addColumn(i18n("tqStatus")); _lvLoD->setAllColumnsShowFocus(true); _lvLoD->header()->setStretchEnabled(true, 1); @@ -92,7 +92,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) _lvStartup->addColumn(i18n("Use")); _lvStartup->addColumn(i18n("Service")); _lvStartup->addColumn(i18n("Description")); - _lvStartup->addColumn(i18n("Status")); + _lvStartup->addColumn(i18n("tqStatus")); _lvStartup->setAllColumnsShowFocus(true); _lvStartup->header()->setStretchEnabled(true, 2); @@ -149,7 +149,7 @@ void KDEDConfig::load( bool useDefaults ) { TQStringList files; KGlobal::dirs()->findAllResources( "services", - TQString::fromLatin1( "kded/*.desktop" ), + TQString::tqfromLatin1( "kded/*.desktop" ), true, true, files ); TQListViewItem* item = 0L; @@ -178,7 +178,7 @@ void KDEDConfig::load( bool useDefaults ) { } } - getServiceStatus(); + getServicetqStatus(); emit changed( useDefaults ); } @@ -187,7 +187,7 @@ void KDEDConfig::save() { TQStringList files; KGlobal::dirs()->findAllResources( "services", - TQString::fromLatin1( "kded/*.desktop" ), + TQString::tqfromLatin1( "kded/*.desktop" ), true, true, files ); KConfig kdedrc("kdedrc", false, false); @@ -222,7 +222,7 @@ void KDEDConfig::defaults() } -void KDEDConfig::getServiceStatus() +void KDEDConfig::getServicetqStatus() { QCStringList modules; TQCString replyType; @@ -293,12 +293,12 @@ void KDEDConfig::slotEvalItem(TQListViewItem * item) _pbStop->setEnabled( false ); } - getServiceStatus(); + getServicetqStatus(); } void KDEDConfig::slotServiceRunningToggled() { - getServiceStatus(); + getServicetqStatus(); slotEvalItem(_lvStartup->currentItem()); } diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h index 8e6ff8d9a..1548f2b47 100644 --- a/kcontrol/kded/kcmkded.h +++ b/kcontrol/kded/kcmkded.h @@ -47,7 +47,7 @@ protected slots: void slotServiceRunningToggled(); void slotEvalItem(TQListViewItem *item); void slotItemChecked(TQCheckListItem *item); - void getServiceStatus(); + void getServicetqStatus(); bool autoloadEnabled(KConfig *config, const TQString &filename); void setAutoloadEnabled(KConfig *config, const TQString &filename, bool b); diff --git a/kcontrol/kdm/ChangeLog b/kcontrol/kdm/ChangeLog index d49bb2548..167e413a6 100644 --- a/kcontrol/kdm/ChangeLog +++ b/kcontrol/kdm/ChangeLog @@ -10,7 +10,7 @@ * Few bug fixes 1998-04-28 Thomas Tanghus - * Improved geometry management. + * Improved tqgeometry management. 1998-05-14 Thomas Tanghus * Fixed bug with "ShutDownButton=...". diff --git a/kcontrol/kdm/background.cpp b/kcontrol/kdm/background.cpp index b5ce18ff5..80879fe8c 100644 --- a/kcontrol/kdm/background.cpp +++ b/kcontrol/kdm/background.cpp @@ -4,7 +4,7 @@ * Copyright (C) 1999 Geert Jansen * * Modified 2000.07.14 by Brad Hughes - * Improve layout and consistency with KDesktop's background selection + * Improve tqlayout and consistency with KDesktop's background selection * * Based on old backgnd.cpp: * @@ -56,7 +56,7 @@ KBackground::KBackground(TQWidget *parent, const char *name) connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - // Top layout + // Top tqlayout TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() ); top->addWidget(m_pCBEnable); top->addWidget(m_background); diff --git a/kcontrol/kdm/kbackedcombobox.cpp b/kcontrol/kdm/kbackedcombobox.cpp index 1ba598e49..9f651b433 100644 --- a/kcontrol/kdm/kbackedcombobox.cpp +++ b/kcontrol/kdm/kbackedcombobox.cpp @@ -28,7 +28,7 @@ void KBackedComboBox::insertItem( const TQString &id, const TQString &name ) void KBackedComboBox::setCurrentId( const TQString &id ) { - if (id2name.contains( id )) + if (id2name.tqcontains( id )) setCurrentItem( id2name[id] ); else setCurrentItem( 0 ); diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp index 58696902b..7f68deb3b 100644 --- a/kcontrol/kdm/kdm-appear.cpp +++ b/kcontrol/kdm/kdm-appear.cpp @@ -216,7 +216,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) loadLanguageList(langcombo); connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); label = new TQLabel(langcombo, i18n("Languag&e:"), group); - TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); + TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); hbox->setColStretch(1, 1); hbox->addWidget(label, 1, 0); hbox->addWidget(langcombo, 1, 1); @@ -250,7 +250,7 @@ void KDMAppearanceWidget::makeReadOnly() void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) { TQStringList langlist = KGlobal::dirs()->findAllResources("locale", - TQString::fromLatin1("*/entry.desktop")); + TQString::tqfromLatin1("*/entry.desktop")); langlist.sort(); for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) @@ -260,9 +260,9 @@ void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) TQString nid = fpath.mid(index + 1); KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); - combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString::null); } } @@ -316,7 +316,7 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) bool KDMAppearanceWidget::setLogo(TQString logo) { TQString flogo = logo.isEmpty() ? - locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) : + locate("data", TQString::tqfromLatin1("kdm/pics/kdelogo.png") ) : logo; TQImage p(flogo); if (p.isNull()) @@ -324,7 +324,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo) if (p.width() > 100 || p.height() > 100) p = p.smoothScale(100, 100, TQImage::ScaleMin); logobutton->setPixmap(p); - uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; + uint bd = style().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2; logobutton->setFixedSize(p.width() + bd, p.height() + bd); logopath = logo; return true; @@ -334,7 +334,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo) void KDMAppearanceWidget::slotLogoButtonClicked() { KImageIO::registerFormats(); - KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")), + KFileDialog dialogue(locate("data", TQString::tqfromLatin1("kdm/pics/")), KImageIO::pattern( KImageIO::Reading ), this, 0, true); dialogue.setOperationMode( KFileDialog::Opening ); @@ -392,7 +392,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) if(!url->isLocalFile()) { pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() + "kdm/pics/" + url->fileName()); - KIO::NetAccess::copy(*url, pixurl, parentWidget()); + KIO::NetAccess::copy(*url, pixurl, tqparentWidget()); istmp = true; } else { pixurl = *url; @@ -401,7 +401,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) // By now url should be "file:/..." if (!setLogo(pixurl.path())) { - KIO::NetAccess::del(pixurl, parentWidget()); + KIO::NetAccess::del(pixurl, tqparentWidget()); TQString msg = i18n("There was an error loading the image:\n" "%1\n" "It will not be saved.") diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp index 155d5b380..e7f267ce3 100644 --- a/kcontrol/kdm/kdm-conv.cpp +++ b/kcontrol/kdm/kdm-conv.cpp @@ -50,7 +50,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this ); alGroup->setCheckable( true ); - alGroup->setSizePolicy( vpref ); + alGroup->tqsetSizePolicy( vpref ); TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." " This applies only to KDM's graphical login." @@ -92,7 +92,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) puGroup = new TQVButtonGroup(i18n("Preselect User"), this ); - puGroup->setSizePolicy( vpref ); + puGroup->tqsetSizePolicy( vpref ); connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged())); connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged())); diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp index ce27f6498..d6c1eaf7d 100644 --- a/kcontrol/kdm/kdm-users.cpp +++ b/kcontrol/kdm/kdm-users.cpp @@ -94,14 +94,14 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup ); leminuid = new KLineEdit( minGroup ); minlab->setBuddy( leminuid ); - leminuid->setSizePolicy( sp_ign_fix ); + leminuid->tqsetSizePolicy( sp_ign_fix ); leminuid->setValidator( valid ); connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup ); lemaxuid = new KLineEdit( minGroup ); maxlab->setBuddy( lemaxuid ); - lemaxuid->setSizePolicy( sp_ign_fix ); + lemaxuid->tqsetSizePolicy( sp_ign_fix ); lemaxuid->setValidator( valid ); connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); @@ -168,7 +168,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) userbutton = new TQPushButton( hlpw ); userbutton->setAcceptDrops( true ); userbutton->installEventFilter( this ); // for drag and drop - uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; + uint sz = style().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; userbutton->setFixedSize( sz, sz ); connect( userbutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotUserButtonClicked()) ); @@ -346,7 +346,7 @@ void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e) KURL *url = decodeImgDrop(e, this); if (url) { TQString pixpath; - KIO::NetAccess::download(*url, pixpath, parentWidget()); + KIO::NetAccess::download(*url, pixpath, tqparentWidget()); changeUserPix( pixpath ); KIO::NetAccess::removeTempFile(pixpath); delete url; @@ -457,11 +457,11 @@ void KDMUsersWidget::load() cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true)); TQString ps = config->readEntry( "FaceSource" ); - if (ps == TQString::fromLatin1("UserOnly")) + if (ps == TQString::tqfromLatin1("UserOnly")) rbusronly->setChecked(true); - else if (ps == TQString::fromLatin1("PreferUser")) + else if (ps == TQString::tqfromLatin1("PreferUser")) rbprefusr->setChecked(true); - else if (ps == TQString::fromLatin1("PreferAdmin")) + else if (ps == TQString::tqfromLatin1("PreferAdmin")) rbprefadm->setChecked(true); else rbadmonly->setChecked(true); diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp index ae99b51f5..f342985aa 100644 --- a/kcontrol/kdm/main.cpp +++ b/kcontrol/kdm/main.cpp @@ -164,7 +164,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) if ((*umapi).second.find( gn ) == (*umapi).second.end()) (*umapi).second.append( gn ); } else - kdWarning() << "group '" << gn << "' contains unknown user '" << un << "'" << endl; + kdWarning() << "group '" << gn << "' tqcontains unknown user '" << un << "'" << endl; } while (*++grp->gr_mem); } endgrent(); @@ -173,7 +173,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) kdWarning() << "user(s) '" << tgmapci.data().join(",") << "' have unknown GID " << tgmapci.key() << endl; - config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); + config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); TQVBoxLayout *top = new TQVBoxLayout(this); tab = new TQTabWidget(this); diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index a38f46f29..edf285a5b 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -83,13 +83,13 @@ void CommandShortcutsModule::initGUI() label->setText(i18n("Below is a list of known commands which you may assign keyboard shortcuts to. " "To edit, add or remove entries from this list use the " "KDE menu editor.")); - label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + label->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &))); connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor())); mainLayout->addWidget(label); m_tree = new AppTreeView(this, "appTreeView"); - m_tree->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + m_tree->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mainLayout->setStretchFactor(m_tree, 10); mainLayout->addWidget(m_tree); TQWhatsThis::add(m_tree, diff --git a/kcontrol/keys/convertShortcuts.pl b/kcontrol/keys/convertShortcuts.pl index 9dc216ac6..fa189c810 100755 --- a/kcontrol/keys/convertShortcuts.pl +++ b/kcontrol/keys/convertShortcuts.pl @@ -9,7 +9,7 @@ foreach (<>) { s/^Lock screen/Lock Session/; s/^Lock Screen/Lock Session/; s/^Mouse emulation/Mouse Emulation/; - s/^Next keyboard layout/Switch to Next Keyboard Layout/; + s/^Next keyboard tqlayout/Switch to Next Keyboard Layout/; s/Switch To Next Keyboard Layout/Switch to Next Keyboard Layout/; s/^Screenshot of desktop/Desktop Screenshot/; s/^Pop-up window operations menu/Window Operations Menu/; diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h index 144427d9c..faf6b6bd3 100644 --- a/kcontrol/keys/kaccelaction.h +++ b/kcontrol/keys/kaccelaction.h @@ -58,7 +58,7 @@ class KConfigBase; 1) KKey = "Meta+X" 1) Meta+X 2) KKey = "Asterisk" - 1) Shift+8 (English layout) + 1) Shift+8 (English tqlayout) 2) Keypad_Asterisk */ @@ -111,7 +111,7 @@ class KAccelAction bool setKeySequence( uint i, const KKeySequence& ); void clearShortcut(); - bool contains( const KKeySequence& ); + bool tqcontains( const KKeySequence& ); TQString toString() const; TQString toStringInternal() const; diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 09726de63..a49eea231 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -83,7 +83,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) kdDebug(125) << "sConfigKey: " << sConfigKey << " bIsNum: " << bIsNum << " bSeriesOnly: " << bSeriesOnly << endl; - if( ((bSeriesOnly && !bIsNum) || (bSeriesNone && bIsNum)) && !sConfigKey.contains( ':' ) ) { + if( ((bSeriesOnly && !bIsNum) || (bSeriesNone && bIsNum)) && !sConfigKey.tqcontains( ':' ) ) { actions.removeAction( sConfigKey ); i--; } @@ -170,7 +170,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) topLayout->addRowSpacing(3, 15); topLayout->addMultiCellWidget(kc, 5, 5, 0, 1); - setMinimumSize(topLayout->sizeHint()); + setMinimumSize(topLayout->tqsizeHint()); } KKeyModule::~KKeyModule (){ @@ -332,7 +332,7 @@ void KKeyModule::readScheme( int index ) TQString s = sFile.mid( ind, 1 ); s = s.upper(); - sFile.replace( ind, 1, s ); + sFile.tqreplace( ind, 1, s ); } @@ -416,8 +416,8 @@ void KKeyModule::readScheme( int index ) // Set various appropriate for the scheme if ( indx < nSysSchemes || - (*sFileList->at(indx)).contains( "/global-" ) || - (*sFileList->at(indx)).contains( "/app-" ) ) { + (*sFileList->at(indx)).tqcontains( "/global-" ) || + (*sFileList->at(indx)).tqcontains( "/app-" ) ) { removeBt->setEnabled( FALSE ); } else { removeBt->setEnabled( TRUE ); diff --git a/kcontrol/keys/keys.desktop b/kcontrol/keys/keys.desktop index b39bab385..9594b832a 100644 --- a/kcontrol/keys/keys.desktop +++ b/kcontrol/keys/keys.desktop @@ -179,7 +179,7 @@ Keywords[cs]=Klávesy,Globální klávesové zkratky,Schéma kláves,Klávesové Keywords[csb]=Klawisze,globalné klawiszowé skrodzënë,schematë skrodzënów,sparłączenia klawiszów,skrodzënë dlô programów Keywords[cy]=Bysell,Rhwymiadau bysell eang,Cynllun bysell,Llwybrau byr,Llwybrau byr y rhaglen Keywords[da]=Taster,Globale tastebindinger,Tastesystem,Tastebindinger,genveje,programgenveje -Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturlayout +Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturtqlayout Keywords[el]=Πλήκτρα,Καθολικοί συνδυασμοί πλήκτρων,Θέμα πλήκτρων,Συνδυασμοί πλήκτρων,συντομεύσεις,συντομεύσεις εφαρμογών Keywords[eo]=klavoj,malloka,signifoj,asocioj,kombinoj,klavkombinoj Keywords[es]=Teclas,Asociaciones de teclas globales,Esquema de teclas,Asociaciones de teclas,accesos directos,accesos directos de aplicaciones diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index d17e1619e..41e792d6f 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -341,7 +341,7 @@ void ModifiersModule::slotMacSwapClicked() if( m_pchkMacKeyboard->isChecked() && !KKeyNative::keyboardHasWinKey() ) { KMessageBox::sorry( this, i18n("You can only activate this option if your " - "X keyboard layout has the 'Super' or 'Meta' keys " + "X keyboard tqlayout has the 'Super' or 'Meta' keys " "properly configured as modifier keys."), "Incompatibility" ); m_pchkMacSwap->setChecked( false ); diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 9f997b7e5..5db554ca6 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -145,7 +145,7 @@ void ShortcutsModule::initGUI() m_pcbSchemes = new KComboBox( this ); m_pcbSchemes->setMinimumWidth( 100 ); - m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); + m_pcbSchemes->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); pHLayout->addWidget( m_pcbSchemes ); @@ -190,10 +190,10 @@ void ShortcutsModule::initGUI() m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true ); m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false ); - m_pkcGeneral->resize (m_pkcGeneral->sizeHint() ); + m_pkcGeneral->resize (m_pkcGeneral->tqsizeHint() ); if (system("xmodmap 1> /dev/null 2> /dev/null") == 0) { m_useRmWinKeys = new TQCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this ); - m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() ); + m_useRmWinKeys->resize( m_useRmWinKeys->tqsizeHint() ); m_useRmWinKeys->setChecked( m_bUseRmWinKeys ); pVLayout->addWidget( m_useRmWinKeys, 1, 0 ); connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) ); @@ -234,7 +234,7 @@ void ShortcutsModule::createActionsGeneral() //kdDebug(125) << "sConfigKey: " << sConfigKey // << " bIsNum: " << bIsNum << endl; - if( bIsNum && !sConfigKey.contains( ':' ) ) { + if( bIsNum && !sConfigKey.tqcontains( ':' ) ) { actions[i].setConfigurable( false ); actions[i].setName( TQString::null ); } @@ -255,7 +255,7 @@ void ShortcutsModule::createActionsSequence() //kdDebug(125) << "sConfigKey: " << sConfigKey // << " bIsNum: " << bIsNum << endl; - if( !bIsNum && !sConfigKey.contains( ':' ) ) { + if( !bIsNum && !sConfigKey.tqcontains( ':' ) ) { actions[i].setConfigurable( false ); actions[i].setName( TQString::null ); } @@ -327,14 +327,14 @@ void ShortcutsModule::slotSelectScheme( int ) config.setGroup( "Settings" ); //m_sBaseSchemeFile = config.readEntry( "Name" ); - // If the user's keyboard layout doesn't support the Win key, - // but this layout scheme requires it, + // If the user's keyboard tqlayout doesn't support the Win key, + // but this tqlayout scheme requires it, if( !KKeyNative::keyboardHasWinKey() && config.readBoolEntry( "Uses Win Modifier", false ) ) { // TODO: change "Win" to Win's label. int ret = KMessageBox::warningContinueCancel( this, i18n("This scheme requires the \"%1\" modifier key, which is not " - "available on your keyboard layout. Do you wish to view it anyway?" ) + "available on your keyboard tqlayout. Do you wish to view it anyway?" ) .arg(i18n("Win")) ); if( ret == KMessageBox::Cancel ) return; @@ -384,7 +384,7 @@ void ShortcutsModule::slotSaveSchemeAs() // Make the next letter upper case TQString s = sFile.mid( ind, 1 ); s = s.upper(); - sFile.replace( ind, 1, s ); + sFile.tqreplace( ind, 1, s ); } iScheme = -1; diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 58de8a1f5..0d1ddc3cc 100644 --- a/kcontrol/keys/treeview.cpp +++ b/kcontrol/keys/treeview.cpp @@ -156,8 +156,8 @@ void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent) TQString groupCaption = g->caption(); // Item names may contain ampersands. To avoid them being converted - // to accelerators, replace them with two ampersands. - groupCaption.replace("&", "&&"); + // to accelerators, tqreplace them with two ampersands. + groupCaption.tqreplace("&", "&&"); AppTreeItem *item; if (parent == 0) @@ -177,8 +177,8 @@ void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent) TQString serviceCaption = s->name(); // Item names may contain ampersands. To avoid them being converted - // to accelerators, replace them with two ampersands. - serviceCaption.replace("&", "&&"); + // to accelerators, tqreplace them with two ampersands. + serviceCaption.tqreplace("&", "&&"); AppTreeItem* item; if (parent == 0) @@ -228,7 +228,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath) TQStringList files = dir.entryList(); for (TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { // does not work?! - //if (filelist.contains(*it)) continue; + //if (filelist.tqcontains(*it)) continue; if (relativePath.isEmpty()) { filelist.remove(*it); // hack @@ -266,7 +266,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath) for (TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) { if ((*it) == "." || (*it) == "..") continue; // does not work?! - // if (dirlist.contains(*it)) continue; + // if (dirlist.tqcontains(*it)) continue; if (relativePath.isEmpty()) { dirlist.remove(*it); //hack diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog index b00a53f1e..fd6995a9c 100644 --- a/kcontrol/kfontinst/ChangeLog +++ b/kcontrol/kfontinst/ChangeLog @@ -5,7 +5,7 @@ KDE3.4 -> KDE3.5 e.g. Times New Roman -> times.ttf Helvetica, Bold Oblique-> Hevetica, Bold Oblique.fonts.tar.gz - Which contains: + Which tqcontains: 75dpi_helvBO10.pcf.gz 75dpi_helvBO12.pcf.gz 100dpi_helvBO10.pcf.gz @@ -336,9 +336,9 @@ KDE3.1 -> KDE3.2 2. Rearranged this file! 3. Removed command line interface - KDE2's command line stuff is way different! 4. Re-created dialogs with Qt designer. -5. Removed ProgressDialog, and replaced with a progress bar on a new statusbar. +5. Removed ProgressDialog, and tqreplaced with a progress bar on a new statusbar. 6. Modified configure script to check for FreeType & t1lib. -7. If an encoding (not unicode) is selected, then the .enc file is copied to the X11 fonts directory. +7. If an encoding (not tqunicode) is selected, then the .enc file is copied to the X11 fonts directory. 8. As with the .enc files, the StarOffice .xpp files are also copied, and no longer just sym linked. 9. Removed enabling/disabing of Configure System button. 10. Fontmap.X11 is no longer created, instead the real Fontmap file itself is modified. diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index c525cd337..3e7c699e2 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -97,10 +97,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) && KCmdLineArgs::parsedArgs()->isSet("embed")); - itsStatusLabel = new TQLabel(this); - itsStatusLabel->setFrameShape(TQFrame::Panel); - itsStatusLabel->setFrameShadow(TQFrame::Sunken); - itsStatusLabel->setLineWidth(1); + itstqStatusLabel = new TQLabel(this); + itstqStatusLabel->setFrameShape(TQFrame::Panel); + itstqStatusLabel->setFrameShadow(TQFrame::Sunken); + itstqStatusLabel->setLineWidth(1); itsConfig.setGroup(CFG_GROUP); @@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsSplitter=new TQSplitter(this); fontsFrame=new TQFrame(itsSplitter), itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart"); - itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsSplitter->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); TQValueList sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); @@ -129,18 +129,18 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) { #endif fontsFrame=new TQFrame(this); - fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifdef HAVE_XFT } #endif TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1); - TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); KToolBar *toolbar=new KToolBar(this); bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false)); fontsFrame->setLineWidth(0); - toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); + toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); toolbar->setMovingEnabled(false); TQString previousPath=itsConfig.readEntry(CFG_PATH); @@ -151,22 +151,22 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsDirOp->setMinimumSize(TQSize(96, 64)); setMimeTypes(showBitmap); itsDirOp->dirLister()->setMainWindow(this); - itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsDirOp->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1); KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); - button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + button->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); fontsLayout->addWidget(button, 1, 0); fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); - layout->addWidget(toolbar); + tqlayout->addWidget(toolbar); #ifdef HAVE_XFT - layout->addWidget(itsPreview ? itsSplitter : fontsFrame); + tqlayout->addWidget(itsPreview ? itsSplitter : fontsFrame); #else - layout->addWidget(fontsFrame); + tqlayout->addWidget(fontsFrame); #endif - layout->addWidget(itsStatusLabel); + tqlayout->addWidget(itstqStatusLabel); setButtons(0); setRootOnlyMsg(i18n("The fonts shown are your personal fonts.
To see (and install) " @@ -390,7 +390,7 @@ void CKCmFontInst::fileHighlighted(const KFileItem *item) ? list->getFirst() : NULL; - if(previewItem && list && list->contains(previewItem)) // OK, check its been selected - not deselected!!! + if(previewItem && list && list->tqcontains(previewItem)) // OK, check its been selected - not deselected!!! itsPreview->openURL(previewItem->url()); } #endif @@ -545,7 +545,7 @@ void CKCmFontInst::dropped(const KFileItem *i, TQDropEvent *, const KURL::List & void CKCmFontInst::infoMessage(const TQString &msg) { - itsStatusLabel->setText(msg); + itstqStatusLabel->setText(msg); } static TQString family(const TQString &name) @@ -582,7 +582,7 @@ void CKCmFontInst::updateInformation(int, int fonts) } text+=" - "; text+=i18n("One Family", "%n Families", families.count()); - itsStatusLabel->setText(text); + itstqStatusLabel->setText(text); } void CKCmFontInst::delResult(KIO::Job *job) diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index b304e0a1a..8f655f2a4 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -108,7 +108,7 @@ class CKCmFontInst : public KCModule TQSplitter *itsSplitter; KConfig itsConfig; bool itsEmbeddedAdmin; - TQLabel *itsStatusLabel; + TQLabel *itstqStatusLabel; }; } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index b4766c5c4..b1bb35e88 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -88,7 +88,7 @@ class CFontListViewItem : public KListViewItem TQRect rect() const { - TQRect r = listView()->itemRect(this); + TQRect r = listView()->tqitemRect(this); return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height())); } diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp index afd9fa204..11f1cdebe 100644 --- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp @@ -39,14 +39,14 @@ CPrintDialog::CPrintDialog(TQWidget *parent) : KDialogBase(Plain, i18n("Print Font Samples"), Ok|Cancel, Ok, parent, NULL, true, false) { TQFrame *page=plainPage(); - TQGridLayout *layout=new TQGridLayout(page, 1, 1, 0, spacingHint()); + TQGridLayout *tqlayout=new TQGridLayout(page, 1, 1, 0, spacingHint()); - layout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0); + tqlayout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0); itsOutput=new TQComboBox(page); itsOutput->insertItem(i18n("All Fonts"), 0); itsOutput->insertItem(i18n("Selected Fonts"), 1); - layout->addWidget(itsOutput, 0, 1); - layout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0); + tqlayout->addWidget(itsOutput, 0, 1); + tqlayout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0); itsSize=new TQComboBox(page); itsSize->insertItem(i18n("Waterfall"), 0); itsSize->insertItem(i18n("12pt"), 1); @@ -54,8 +54,8 @@ CPrintDialog::CPrintDialog(TQWidget *parent) itsSize->insertItem(i18n("24pt"), 3); itsSize->insertItem(i18n("36pt"), 4); itsSize->insertItem(i18n("48pt"), 5); - layout->addWidget(itsSize, 1, 1); - layout->addItem(new TQSpacerItem(2, 2), 2, 1); + tqlayout->addWidget(itsSize, 1, 1); + tqlayout->addItem(new TQSpacerItem(2, 2), 2, 1); } bool CPrintDialog::exec(bool select, int size) diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp index 112e3562b..55ab5773a 100644 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp +++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp @@ -44,35 +44,35 @@ static int strToWeight(const TQString &str) { if(NULL==str) return FC_WEIGHT_MEDIUM; - else if(str.contains("Bold", false)) + else if(str.tqcontains("Bold", false)) return FC_WEIGHT_BOLD; - else if(str.contains("Heavy", false)) + else if(str.tqcontains("Heavy", false)) return FC_WEIGHT_HEAVY; - else if(str.contains("Black", false)) + else if(str.tqcontains("Black", false)) return FC_WEIGHT_BLACK; - else if(str.contains("ExtraBold", false)) + else if(str.tqcontains("ExtraBold", false)) return FC_WEIGHT_EXTRABOLD; - else if(str.contains("UltraBold", false)) + else if(str.tqcontains("UltraBold", false)) return FC_WEIGHT_ULTRABOLD; - else if(str.contains("ExtraLight", false)) + else if(str.tqcontains("ExtraLight", false)) return FC_WEIGHT_EXTRALIGHT; - else if(str.contains("UltraLight", false)) + else if(str.tqcontains("UltraLight", false)) return FC_WEIGHT_ULTRALIGHT; - else if(str.contains("Light", false)) + else if(str.tqcontains("Light", false)) return FC_WEIGHT_LIGHT; - else if(str.contains("Medium", false) || str.contains("Normal", false) || str.contains("Roman", false)) + else if(str.tqcontains("Medium", false) || str.tqcontains("Normal", false) || str.tqcontains("Roman", false)) return FC_WEIGHT_MEDIUM; - else if(str.contains("Regular", false)) + else if(str.tqcontains("Regular", false)) return FC_WEIGHT_REGULAR; - else if(str.contains("SemiBold", false)) + else if(str.tqcontains("SemiBold", false)) return FC_WEIGHT_SEMIBOLD; - else if(str.contains("DemiBold", false)) + else if(str.tqcontains("DemiBold", false)) return FC_WEIGHT_DEMIBOLD; - else if(str.contains("Thin", false)) + else if(str.tqcontains("Thin", false)) return FC_WEIGHT_THIN; - else if(str.contains("Book", false)) + else if(str.tqcontains("Book", false)) return FC_WEIGHT_NORMAL; - else if(str.contains("Demi", false)) + else if(str.tqcontains("Demi", false)) return FC_WEIGHT_NORMAL; else return FC_WEIGHT_MEDIUM; @@ -83,21 +83,21 @@ static int strToWidth(const TQString &str) { if(str.isEmpty()) return FC_WIDTH_NORMAL; - else if(str.contains("UltraCondensed", false)) + else if(str.tqcontains("UltraCondensed", false)) return FC_WIDTH_ULTRACONDENSED; - else if(str.contains("ExtraCondensed", false)) + else if(str.tqcontains("ExtraCondensed", false)) return FC_WIDTH_EXTRACONDENSED; - else if(str.contains("SemiCondensed", false)) + else if(str.tqcontains("SemiCondensed", false)) return FC_WIDTH_SEMICONDENSED; - else if(str.contains("Condensed", false)) + else if(str.tqcontains("Condensed", false)) return FC_WIDTH_CONDENSED; - else if(str.contains("SemiExpanded", false)) + else if(str.tqcontains("SemiExpanded", false)) return FC_WIDTH_SEMIEXPANDED; - else if(str.contains("UltraExpanded", false)) + else if(str.tqcontains("UltraExpanded", false)) return FC_WIDTH_ULTRAEXPANDED; - else if(str.contains("ExtraExpanded", false)) + else if(str.tqcontains("ExtraExpanded", false)) return FC_WIDTH_EXTRAEXPANDED; - else if(str.contains("Expanded", false)) + else if(str.tqcontains("Expanded", false)) return FC_WIDTH_EXPANDED; else return FC_WIDTH_NORMAL; @@ -372,7 +372,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what) const FoundryMap *entry; for(entry=map; NULL!=entry->foundry; entry++) - if(foundryAll.length()==entry->len && foundryAll.contains(entry->foundry, false)) + if(foundryAll.length()==entry->len && foundryAll.tqcontains(entry->foundry, false)) { foundryAll=entry->foundry; break; diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/kfontinst/kfontinst/FontEngine.cpp index 4fe823c23..7f14d556f 100644 --- a/kcontrol/kfontinst/kfontinst/FontEngine.cpp +++ b/kcontrol/kfontinst/kfontinst/FontEngine.cpp @@ -157,13 +157,13 @@ CFontEngine::EWeight CFontEngine::strToWeight(const char *str) static void removeSymbols(TQString &str) { - str.replace(TQRegExp("[\\-\\[\\]()]"), " "); + str.tqreplace(TQRegExp("[\\-\\[\\]()]"), " "); int len=str.length(); TQChar space(' '); for(int c=0; c0x7E) + if(str[c].tqunicode()<0x20 || str[c].tqunicode()>0x7E) str[c]=space; str=str.simplifyWhiteSpace(); diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/kfontinst/kfontinst/Fontmap.cpp index 476b422bd..a63efeb5d 100644 --- a/kcontrol/kfontinst/kfontinst/Fontmap.cpp +++ b/kcontrol/kfontinst/kfontinst/Fontmap.cpp @@ -113,7 +113,7 @@ static TQString createX11PsName(const TQString &font) unsigned int ch; bool newWord=true; - newName.replace(TQRegExp("\\-"), "_"); + newName.tqreplace(TQRegExp("\\-"), "_"); for(ch=0; chgr_name : TQString::number(buff.st_gid).latin1()); addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name()); + addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::tqfindByPath(path, 0, true)->name()); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); + TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/")); if(!Misc::root()) { url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER); - url+=TQString::fromLatin1("/"); + url+=TQString::tqfromLatin1("/"); } if(multiple) - url+=name+TQString::fromLatin1(constMultipleExtension); + url+=name+TQString::tqfromLatin1(constMultipleExtension); else url+=Misc::getFile(path); addAtom(entry, KIO::UDS_URL, 0, url); @@ -411,7 +411,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal return false; } -enum EUrlStatus +enum EUrltqStatus { BAD_URL, URL_OK, @@ -427,7 +427,7 @@ static KURL getRedirect(const KURL &u) sect(CKioFonts::getSect(path)); path.remove(sect); - path.replace("//", "/"); + path.tqreplace("//", "/"); redirect.setPath(path); KFI_DBUG << "Redirect from " << u.path() << " to " << redirect.path() << endl; @@ -441,7 +441,7 @@ static bool nonRootSys(const KURL &u) static TQString getFontFolder(const TQString &defaultDir, const TQString &root, TQStringList &dirs) { - if(dirs.contains(defaultDir)) + if(dirs.tqcontains(defaultDir)) return defaultDir; else { @@ -494,7 +494,7 @@ static bool isAAfm(const TQString &fname) { line=stream.readLine(); - if(line.contains("StartFontMetrics")) + if(line.tqcontains("StartFontMetrics")) { file.close(); return true; @@ -650,7 +650,7 @@ static bool getFontList(const TQStringList &files, TQMap &ma if(entry!=list.end()) { - if(!(*entry).paths.contains(path)) + if(!(*entry).paths.tqcontains(path)) (*entry).paths.append(path); } else @@ -670,7 +670,7 @@ static bool getFontList(const TQStringList &files, TQMap &ma if((*fIt).paths.count()>1) { // There's more than 1 file with the same name, but in a different locations - // therefore, take the unique part of the path, and replace / with _ + // therefore, take the unique part of the path, and tqreplace / with _ // e.g. // /usr/X11R6/lib/X11/fonts/75dpi/times.pcf.gz // /usr/X11R6/lib/X11/fonts/100dpi/times.pcf.gz @@ -688,11 +688,11 @@ static bool getFontList(const TQStringList &files, TQMap &ma if((*pIt).orig[i]!=(*pBegin).orig[i]) { (*pIt).modified=(*pIt).orig.mid(i); - (*pIt).modified=(*pIt).modified.replace('/', '_'); + (*pIt).modified=(*pIt).modified.tqreplace('/', '_'); if((*pBegin).modified.isEmpty()) { (*pBegin).modified=(*pBegin).orig.mid(i); - (*pBegin).modified=(*pBegin).modified.replace('/', '_'); + (*pBegin).modified=(*pBegin).modified.tqreplace('/', '_'); } break; } @@ -806,7 +806,7 @@ CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app) { TQString str(paths[path]); - str.replace(TQRegExp("\\s*"), ""); + str.tqreplace(TQRegExp("\\s*"), ""); if(0==str.find("unix/:")) itsUsingXfsFpe=true; @@ -1018,7 +1018,7 @@ void CKioFonts::get(const KURL &url) { // Determine the mimetype of the file to be retrieved, and emit it. // This is mandatory in all slaves (for KRun/BrowserRun to work). - emit mimeType(useMime.isEmpty() ? KMimeType::findByPath(realPathC, buff.st_mode, true)->name() : useMime); + emit mimeType(useMime.isEmpty() ? KMimeType::tqfindByPath(realPathC, buff.st_mode, true)->name() : useMime); totalSize(buff.st_size); @@ -1185,7 +1185,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo if (markPartial) { - TQString destPart(destOrig+TQString::fromLatin1(".part")); + TQString destPart(destOrig+TQString::tqfromLatin1(".part")); TQCString destPartC(TQFile::encodeName(destPart)); dest = destPart; @@ -1751,9 +1751,9 @@ void CKioFonts::special(const TQByteArray &a) finished(); break; case SPECIAL_RECONFIG: // Only itended to be called from kcmfontinst - when a user has re-enabled doX or doGs - if(itsRoot && !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) + if(itsRoot && !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)) itsFolders[FOLDER_SYS].modified.add(itsFolders[FOLDER_SYS].location); - else if(!itsRoot && !itsFolders[FOLDER_USER].modified.contains(itsFolders[FOLDER_USER].location)) + else if(!itsRoot && !itsFolders[FOLDER_USER].modified.tqcontains(itsFolders[FOLDER_USER].location)) itsFolders[FOLDER_USER].modified.add(itsFolders[FOLDER_USER].location); doModified(); @@ -1831,7 +1831,7 @@ void CKioFonts::doModified() // // If a non-default folder has been modified, always configure X if(NULL==strchr(itsKfiParams, 'x') && - (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))) + (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))) { if(0==itsKfiParams[0]) strcpy(itsKfiParams, "-x"); @@ -1850,7 +1850,7 @@ void CKioFonts::doModified() KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl; } - if(itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) + if(itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)) { itsHasSys=true; itsAddToSysFc=false; @@ -1862,7 +1862,7 @@ void CKioFonts::doModified() TQCString cmd; createRootRefreshCmd(cmd, itsFolders[FOLDER_SYS].modified, false); - if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) + if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)) { itsHasSys=true; itsAddToSysFc=false; @@ -2385,8 +2385,8 @@ bool CKioFonts::checkAllowed(const KURL &u) if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) || ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) || - ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || - ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) + ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || + ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) { error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".") .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \ diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h index 57dc8516a..802d16eaf 100644 --- a/kcontrol/kfontinst/kio/KioFonts.h +++ b/kcontrol/kfontinst/kio/KioFonts.h @@ -82,7 +82,7 @@ class CKioFonts : public KIO::SlaveBase CDirList() { } CDirList(const TQString &str) : TQStringList(str) { } - void add(const TQString &d) { if (!contains(d)) append(d); } + void add(const TQString &d) { if (!tqcontains(d)) append(d); } }; struct TFolder diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index 44d180fd2..2b3d40737 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -439,7 +439,7 @@ static bool hasStr(XftFont *font, TQString &str) ch; for(ch=0; chcharset, str[ch].unicode())) + if(!FcCharSetHasChar(font->charset, str[ch].tqunicode())) return false; return true; } diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index 1e779b514..a3c77526a 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -65,7 +65,7 @@ TQString dirSyntax(const TQString &d) { TQString ds(d); - ds.replace("//", "/"); + ds.tqreplace("//", "/"); int slashPos=ds.findRev('/'); @@ -84,7 +84,7 @@ TQString xDirSyntax(const TQString &d) { TQString ds(d); - ds.replace("//", "/"); + ds.tqreplace("//", "/"); int slashPos=ds.findRev('/'); diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp index 3679be252..bded4fad4 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.cpp +++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp @@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *) } } -TQSize CFontPreview::sizeHint() const +TQSize CFontPreview::tqsizeHint() const { return TQSize(132, 132); } -TQSize CFontPreview::minimumSizeHint() const +TQSize CFontPreview::tqminimumSizeHint() const { return TQSize(32, 32); } diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h index a57e9b9c9..6ef34f5bc 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.h +++ b/kcontrol/kfontinst/viewpart/FontPreview.h @@ -50,8 +50,8 @@ class CFontPreview : public QWidget virtual ~CFontPreview() {} void paintEvent(TQPaintEvent *); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; void showFont(const KURL &url); void showFont(); diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 14bda4024..a560d2968 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -76,7 +76,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) itsToolsFrame=new TQFrame(itsFrame); - TQVBoxLayout *layout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint()); + TQVBoxLayout *tqlayout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint()); TQGridLayout *previewLayout=new TQGridLayout(previewFrame, 1, 1, 1, 1); TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint()); @@ -88,14 +88,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) setInstance(new KInstance("kfontview")); itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview"); - itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame); itsFaceSelector=new KIntNumInput(1, itsToolsFrame); itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button"); itsInstallButton->hide(); previewLayout->addWidget(itsPreview, 0, 0); - layout->addWidget(previewFrame); - layout->addWidget(itsToolsFrame); + tqlayout->addWidget(previewFrame); + tqlayout->addWidget(itsToolsFrame); toolsLayout->addWidget(itsFaceLabel); toolsLayout->addWidget(itsFaceSelector); itsFaceLabel->hide(); @@ -103,7 +103,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum)); toolsLayout->addWidget(itsInstallButton); itsToolsFrame->hide(); - connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool))); + connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewtqStatus(bool))); connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install())); connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int))); @@ -165,17 +165,17 @@ void CFontViewPart::timeout() if(Misc::root()) { destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url); - itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); + itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()); } else { destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url); - if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget())) + if(KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget())) itsShowInstallButton=false; else { destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url); - itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); + itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()); } } } @@ -193,7 +193,7 @@ void CFontViewPart::timeout() itsToolsFrame->hide(); } -void CFontViewPart::previewStatus(bool st) +void CFontViewPart::previewtqStatus(bool st) { itsInstallButton->setShown(st && itsShowInstallButton); itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown()); @@ -220,7 +220,7 @@ void CFontViewPart::install() { KURL destUrl(getDest(m_url, KMessageBox::No==resp)); - if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget())) + if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->tqparentWidget())) { // // OK file copied, now look for any AFM or PFM file... @@ -236,7 +236,7 @@ void CFontViewPart::install() for(it=urls.begin(); it!=end; ++it) { destUrl=getDest(*it, KMessageBox::No==resp); - KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget()); + KIO::NetAccess::copy(*it, destUrl, itsFrame->tqparentWidget()); } } @@ -274,7 +274,7 @@ void CFontViewPart::print() items.append(itsPreview->engine().getName(m_url)); - Print::printItems(items, 0, itsFrame->parentWidget(), itsPreview->engine()); + Print::printItems(items, 0, itsFrame->tqparentWidget(), itsPreview->engine()); } } diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h index 21de2e074..79d5c4743 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.h +++ b/kcontrol/kfontinst/viewpart/FontViewPart.h @@ -60,7 +60,7 @@ class CFontViewPart : public KParts::ReadOnlyPart private slots: - void previewStatus(bool st); + void previewtqStatus(bool st); void timeout(); void install(); void changeText(); diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index 372104c4a..2d1f392cf 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -46,12 +46,12 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name) this, TQT_SLOT(save())); TQFrame* page = plainPage(); - TQVBoxLayout* layout = new TQVBoxLayout(page); + TQVBoxLayout* tqlayout = new TQVBoxLayout(page); m_advancedWidget = new advancedKickerOptions(page); - layout->addWidget(m_advancedWidget); - layout->addStretch(); + tqlayout->addWidget(m_advancedWidget); + tqlayout->addStretch(); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); @@ -86,7 +86,7 @@ void advancedDialog::load() int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14); m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize); - TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() ); + TQColor color = c.readColorEntry( "TintColor", &tqcolorGroup().mid() ); m_advancedWidget->tintColorB->setColor( color ); int tintValue = c.readNumEntry( "TintValue", 33 ); m_advancedWidget->tintSlider->setValue( tintValue ); @@ -123,7 +123,7 @@ void advancedDialog::save() // is there a config group for this extension? if(!c.hasGroup(group) || - group.contains("Extension") < 1) + group.tqcontains("Extension") < 1) { continue; } diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui index 215ef7e8b..f88303414 100644 --- a/kcontrol/kicker/advancedOptions.ui +++ b/kcontrol/kicker/advancedOptions.ui @@ -4,7 +4,7 @@ advancedKickerOptions - + 0 0 @@ -71,7 +71,7 @@ Expanding - + 101 20 @@ -145,7 +145,7 @@ Expanding - + 21 20 @@ -194,7 +194,7 @@ Expanding - + 20 21 @@ -208,7 +208,7 @@ Min - + AlignVCenter|AlignLeft @@ -225,7 +225,7 @@ Expanding - + 81 20 @@ -250,7 +250,7 @@ Max - + AlignVCenter|AlignRight @@ -312,8 +312,8 @@ knuminput.h kdialog.h - - + + knuminput.h kcolorbutton.h diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui index 6ebfa2c88..e5120f9a6 100644 --- a/kcontrol/kicker/applettab.ui +++ b/kcontrol/kicker/applettab.ui @@ -4,7 +4,7 @@ AppletTabBase - + 0 0 @@ -112,7 +112,7 @@ Expanding - + 20 20 @@ -123,7 +123,7 @@ pb_add - + 0 0 @@ -143,7 +143,7 @@ Minimum - + 20 20 @@ -162,7 +162,7 @@ 0 - + 0 0 @@ -182,7 +182,7 @@ Expanding - + 20 20 @@ -219,8 +219,8 @@ kdialog.h - - + + qwidget.h diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index a8b7cdb20..534f2cbdb 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -132,7 +132,7 @@ void AppletTab::load( bool useDefaults ) TQStringList list = c.readListEntry("TrustedApplets"); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - if(available.contains(*it)) + if(available.tqcontains(*it)) l_trusted << (*it); } } @@ -142,7 +142,7 @@ void AppletTab::load( bool useDefaults ) for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it ) { - if(!l_trusted.contains(*it)) + if(!l_trusted.tqcontains(*it)) l_available << (*it); } diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index d1a0b2766..89f000410 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -125,7 +125,7 @@ void ExtensionInfo::load() c.setGroup("General"); _position = c.readNumEntry ("Position", _position); - _alignment = c.readNumEntry ("Alignment", _alignment); + _tqalignment = c.readNumEntry ("Alignment", _tqalignment); _xineramaScreen = c.readNumEntry ("XineramaScreen", _xineramaScreen); _showLeftHB = c.readBoolEntry("ShowLeftHideButton", _showLeftHB); _showRightHB = c.readBoolEntry("ShowRightHideButton", _showRightHB); @@ -147,7 +147,7 @@ void ExtensionInfo::load() } _orig_position = _position; - _orig_alignment = _alignment; + _orig_tqalignment = _tqalignment; _orig_size = _size; _orig_customSize = _customSize; @@ -170,10 +170,10 @@ void ExtensionInfo::configChanged() _orig_position = _position = position; } - int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0); - if (alignment != _alignment && alignment != _orig_alignment) + int tqalignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0); + if (tqalignment != _tqalignment && tqalignment != _orig_tqalignment) { - _orig_alignment = _alignment = alignment; + _orig_tqalignment = _tqalignment = tqalignment; } if (_resizeable) @@ -197,7 +197,7 @@ void ExtensionInfo::setDefaults() { // defaults _position = 3; - _alignment = TQApplication::reverseLayout() ? 2 : 0; + _tqalignment = TQApplication::reverseLayout() ? 2 : 0; _xineramaScreen = TQApplication::desktop()->primaryScreen(); _size = 2; _showLeftHB = false; @@ -225,7 +225,7 @@ void ExtensionInfo::save() c.setGroup("General"); c.writeEntry("Position", _position); - c.writeEntry("Alignment", _alignment); + c.writeEntry("Alignment", _tqalignment); c.writeEntry("XineramaScreen", _xineramaScreen); c.writeEntry("ShowLeftHideButton", _showLeftHB); c.writeEntry("ShowRightHideButton", _showRightHB); @@ -251,7 +251,7 @@ void ExtensionInfo::save() } _orig_position = _position; - _orig_alignment = _alignment; + _orig_tqalignment = _tqalignment; _orig_size = _size; _orig_customSize = _customSize; diff --git a/kcontrol/kicker/extensionInfo.h b/kcontrol/kicker/extensionInfo.h index 169322aa4..5b890d324 100644 --- a/kcontrol/kicker/extensionInfo.h +++ b/kcontrol/kicker/extensionInfo.h @@ -47,7 +47,7 @@ class ExtensionInfo // Configuration settings TQString _name; int _position; - int _alignment; + int _tqalignment; int _xineramaScreen; int _size; int _customSize; @@ -67,7 +67,7 @@ class ExtensionInfo // Original settings to ensure that we can figure out // what has changed externally to the panel vs within the panel int _orig_position; - int _orig_alignment; + int _orig_tqalignment; int _orig_size; int _orig_customSize; diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp index 935fa5902..27e40a5fc 100644 --- a/kcontrol/kicker/hidingconfig.cpp +++ b/kcontrol/kicker/hidingconfig.cpp @@ -31,10 +31,10 @@ HidingConfig::HidingConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); m_widget = new HidingTab(this); - layout->addWidget(m_widget); - layout->addStretch(); + tqlayout->addWidget(m_widget); + tqlayout->addStretch(); setQuickHelp(KickerConfig::the()->quickHelp()); setAboutData(KickerConfig::the()->aboutData()); diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui index 8d7b0b254..6bc618591 100644 --- a/kcontrol/kicker/hidingtab.ui +++ b/kcontrol/kicker/hidingtab.ui @@ -4,7 +4,7 @@ HidingTabBase - + 0 0 @@ -62,7 +62,7 @@ Expanding - + 342 20 @@ -92,7 +92,7 @@ Fixed - + 30 20 @@ -115,7 +115,7 @@ - layout5 + tqlayout5 @@ -179,7 +179,7 @@ Expanding - + 20 20 @@ -218,7 +218,7 @@ - layout6 + tqlayout6 @@ -299,7 +299,7 @@ Expanding - + 20 20 @@ -332,7 +332,7 @@ Fixed - + 50 10 @@ -401,7 +401,7 @@ Expanding - + 20 20 @@ -439,7 +439,7 @@ Expanding - + 20 20 @@ -467,7 +467,7 @@ Fixed - + 30 20 @@ -532,7 +532,7 @@ Expanding - + 20 20 @@ -557,7 +557,7 @@ Fast - + AlignVCenter|AlignRight @@ -573,7 +573,7 @@ Expanding - + 20 20 @@ -598,7 +598,7 @@ Medium - + AlignCenter @@ -637,7 +637,7 @@ Expanding - + 20 16 @@ -753,8 +753,8 @@ switchPanel(int) - - + + knuminput.h diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp index 7475ad7b0..2c490f6dc 100644 --- a/kcontrol/kicker/lookandfeelconfig.cpp +++ b/kcontrol/kicker/lookandfeelconfig.cpp @@ -31,10 +31,10 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); m_widget = new LookAndFeelTab(this); - layout->addWidget(m_widget); - layout->addStretch(); + tqlayout->addWidget(m_widget); + tqlayout->addStretch(); setQuickHelp(KickerConfig::the()->quickHelp()); setAboutData(KickerConfig::the()->aboutData()); diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui index 87f87cfc7..8a802a369 100644 --- a/kcontrol/kicker/lookandfeeltab.ui +++ b/kcontrol/kicker/lookandfeeltab.ui @@ -4,7 +4,7 @@ LookAndFeelTabBase - + 0 0 @@ -359,7 +359,7 @@ Expanding - + 66 130 @@ -389,7 +389,7 @@ Fixed - + 20 20 @@ -428,13 +428,13 @@ 0 - + 50 50 - + 50 50 @@ -449,7 +449,7 @@ true - + AlignCenter @@ -500,7 +500,7 @@ This option is only active if 'Enable background image' is selected. - layout3 + tqlayout3 @@ -527,7 +527,7 @@ This option is only active if 'Enable background image' is selected. Expanding - + 289 20 @@ -546,7 +546,7 @@ This option is only active if 'Enable background image' is selected. Expanding - + 20 0 @@ -626,8 +626,8 @@ This option is only active if 'Enable background image' is selected. browseTheme(const QString&) enableTransparency(bool) - - + + kcombobox.h kcombobox.h diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp index bfdb3a491..ac977b676 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.cpp +++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp @@ -42,11 +42,11 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) setAboutData( about ); KickerConfig::initScreenNumber(); - TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lookandfeeltab = new LookAndFeelTab(this); - layout->addWidget(lookandfeeltab); - layout->addStretch(); + tqlayout->addWidget(lookandfeeltab); + tqlayout->addStretch(); connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged())); diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index e60746db8..10fc45699 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -187,7 +187,7 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re TQString group(*it); // is there a config group for this extension? - if (!config.hasGroup(group) || group.contains("Extension") < 1) + if (!config.hasGroup(group) || group.tqcontains("Extension") < 1) { continue; } diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp index 03ca57582..4b6c6c6ff 100644 --- a/kcontrol/kicker/menuconfig.cpp +++ b/kcontrol/kicker/menuconfig.cpp @@ -31,10 +31,10 @@ MenuConfig::MenuConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); m_widget = new MenuTab(this); - layout->addWidget(m_widget); - layout->addStretch(); + tqlayout->addWidget(m_widget); + tqlayout->addStretch(); setQuickHelp(KickerConfig::the()->quickHelp()); setAboutData(KickerConfig::the()->aboutData()); diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index 7d3a3d460..ac2b8fe0f 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -4,7 +4,7 @@ MenuTabBase - + 0 0 @@ -21,7 +21,7 @@ - layout5 + tqlayout5 @@ -63,7 +63,7 @@ Expanding - + 40 20 @@ -85,7 +85,7 @@ - layout7 + tqlayout7 @@ -197,7 +197,7 @@ MinimumExpanding - + 20 0 @@ -261,13 +261,13 @@ 0 - + 26 26 - + 26 26 @@ -327,7 +327,7 @@ Expanding - + 20 20 @@ -345,7 +345,7 @@ MinimumExpanding - + 20 0 @@ -389,7 +389,7 @@ 1 - + 0 0 @@ -487,7 +487,7 @@ Expanding - + 20 0 @@ -558,7 +558,7 @@ Expanding - + 20 0 @@ -654,7 +654,7 @@ Expanding - + 20 0 @@ -698,7 +698,7 @@ Expanding - + 20 0 @@ -730,8 +730,8 @@ knuminput.h kdialog.h - - + + klistview.h knuminput.h diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index 970aa10a1..cd1d27fa9 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -93,9 +93,9 @@ MenuTab::MenuTab( TQWidget *parent, const char* name ) btnCustomKMenuIcon->setPixmap(kmenu_icon); KConfig *config; - config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); - config->setGroup(TQString::fromLatin1("RecentDocuments")); - maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10)); + config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); + config->setGroup(TQString::tqfromLatin1("RecentDocuments")); + maxrecentdocs->setValue(config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10)); m_browserGroupLayout->setColStretch( 1, 1 ); m_pRecentOrderGroupLayout->setColStretch( 1, 1 ); @@ -148,7 +148,7 @@ void MenuTab::load( bool useDefaults ) df.readName(), *it, SmallIcon(df.readIcon()), - qFind(ext.begin(), ext.end(), *it) != ext.end()); + tqFind(ext.begin(), ext.end(), *it) != ext.end()); connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); } } @@ -247,8 +247,8 @@ void MenuTab::save() // Save recent documents KConfig *config; - config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); - config->setGroup(TQString::fromLatin1("RecentDocuments")); + config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); + config->setGroup(TQString::tqfromLatin1("RecentDocuments")); config->writeEntry("MaxEntries", maxrecentdocs->value()); config->sync(); diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp index 6e5dcdeb2..2367f2317 100644 --- a/kcontrol/kicker/positionconfig.cpp +++ b/kcontrol/kicker/positionconfig.cpp @@ -31,10 +31,10 @@ PositionConfig::PositionConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); m_widget = new PositionTab(this); - layout->addWidget(m_widget); - layout->addStretch(); + tqlayout->addWidget(m_widget); + tqlayout->addStretch(); setQuickHelp(KickerConfig::the()->quickHelp()); setAboutData(KickerConfig::the()->aboutData()); diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui index b0566f5dc..90217d5e4 100644 --- a/kcontrol/kicker/positiontab.ui +++ b/kcontrol/kicker/positiontab.ui @@ -5,7 +5,7 @@ PositionTabBase - + 0 0 @@ -66,7 +66,7 @@ Expanding - + 342 20 @@ -104,7 +104,7 @@ Expanding - + 20 0 @@ -123,7 +123,7 @@ 0 - + 151 115 @@ -132,7 +132,7 @@ true - + AlignCenter @@ -149,7 +149,7 @@ Expanding - + 20 0 @@ -176,7 +176,7 @@ Expanding - + 20 0 @@ -235,7 +235,7 @@ Expanding - + 0 101 @@ -357,7 +357,7 @@ how it is positioned on the screen and how much of the screen it should use. Expanding - + 16 16 @@ -426,7 +426,7 @@ how it is positioned on the screen and how much of the screen it should use. Fixed - + 30 40 @@ -538,7 +538,7 @@ how it is positioned on the screen and how much of the screen it should use. Expanding - + 20 0 @@ -555,7 +555,7 @@ how it is positioned on the screen and how much of the screen it should use. Expanding - + 21 0 @@ -590,13 +590,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -624,13 +624,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -658,13 +658,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -702,13 +702,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -736,13 +736,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -770,13 +770,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -814,13 +814,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -848,13 +848,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -882,13 +882,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 32 16 - + 32 16 @@ -926,13 +926,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -960,13 +960,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -994,13 +994,13 @@ how it is positioned on the screen and how much of the screen it should use.0 - + 16 24 - + 16 24 @@ -1118,8 +1118,8 @@ how it is positioned on the screen and how much of the screen it should use.panelDimensionsChanged() switchPanel( int ) - - + + knuminput.h knuminput.h diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index d65498430..b5c4c0ac7 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -43,7 +43,7 @@ #include "positiontab_impl.moc" -// magic numbers for the preview widget layout +// magic numbers for the preview widget tqlayout extern const int offsetX = 23; extern const int offsetY = 14; extern const int maxX = 150; @@ -60,7 +60,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) { TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png")); m_monitorImage->setPixmap(monitor); - m_monitorImage->setFixedSize(m_monitorImage->sizeHint()); + m_monitorImage->setFixedSize(m_monitorImage->tqsizeHint()); m_pretendDesktop = new TQWidget(m_monitorImage, "pretendBG"); m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY); @@ -558,7 +558,7 @@ void PositionTab::switchPanel(int panelItem) m_customSpinbox->setValue(m_panelInfo->_customSize); m_sizeGroup->setEnabled(m_panelInfo->_resizeable); m_panelPos = m_panelInfo->_position; - m_panelAlign = m_panelInfo->_alignment; + m_panelAlign = m_panelInfo->_tqalignment; if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < TQApplication::desktop()->numScreens()) m_xineramaScreenComboBox->setCurrentItem(m_panelInfo->_xineramaScreen); else if(m_panelInfo->_xineramaScreen == -2) /* the All Screens option: qt uses -1 for default, so -2 for all */ @@ -672,7 +672,7 @@ void PositionTab::storeInfo() } m_panelInfo->_position = m_panelPos; - m_panelInfo->_alignment = m_panelAlign; + m_panelInfo->_tqalignment = m_panelAlign; if(m_xineramaScreenComboBox->currentItem() == m_xineramaScreenComboBox->count()-1) m_panelInfo->_xineramaScreen = -2; /* all screens */ else @@ -696,14 +696,14 @@ void PositionTab::showIdentify() screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameShadow(TQFrame::Plain); - screenLabel->setAlignment(Qt::AlignCenter); + screenLabel->tqsetAlignment(Qt::AlignCenter); screenLabel->setNum(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->sizeHint()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); diff --git a/kcontrol/kio/UA-DESKTOP-FILE-HOWTO b/kcontrol/kio/UA-DESKTOP-FILE-HOWTO index 8d67d9a37..b0b32404e 100644 --- a/kcontrol/kio/UA-DESKTOP-FILE-HOWTO +++ b/kcontrol/kio/UA-DESKTOP-FILE-HOWTO @@ -37,7 +37,7 @@ to group the entries whenever necessary. Currently there are 5 approximations: IE, NN, MOZ, OP, MISC. These represent Internet Explorer, Netscape Navigator, Mozilla, Opera and Miscellaneous respectively. NOTE: you can enter any value here as it is just -a place holder that would be automatically replaced with the +a place holder that would be automatically tqreplaced with the actual user-agent name (X-KDE-UA-NAME). X-KDE-UA-FULL @@ -46,7 +46,7 @@ TYPE: QString TRANSLATE: NO DESCRIPTION: The full user-agent description that will be sent to the remote -site. It can contain the following keywords that would be replaced +site. It can contain the following keywords that would be tqreplaced with the appropriate value as defined by "uname": appSysName the name of the operating system (ex: Linux). @@ -56,7 +56,7 @@ appSysRelease the version of the operating system (ex: 2.2.18). appKDERelease the current release number as set by KDE (ex: 2.1.9 >=20010310). appMachineType the processor or machine type (ex: i686). -NOTE: if you use any of these values and want them to be replaced +NOTE: if you use any of these values and want them to be tqreplaced automatically, make sure you include the X-KDE-UA-DYNAMIC-ENTRY field and set its value to 1 (for true). @@ -98,7 +98,7 @@ DESCRIPTION: A boolean that indicates whether the keywords described under X-KDE-UA-FULL should be translated. Make sure this field is there with its value set to "1" if you want the keywords to -be replaced appropriately. +be tqreplaced appropriately. EXAMPLES: @@ -127,7 +127,7 @@ X-KDE-UA-DYNAMIC-ENTRY=1 The first entry is a description file for Internet Explorer running on a Windows 98 machine while the second one is an example of a description file for Netscape browser using the "keyword" based approach to describe -the fields that should be replaced dynamically based on the current system +the fields that should be tqreplaced dynamically based on the current system settings. Note that all "keyword" based desktop files should always set X-KDE-UA-DYNAMIC-ENTRY to 1. diff --git a/kcontrol/kio/cache_ui.ui b/kcontrol/kio/cache_ui.ui index c0e504057..20368e748 100644 --- a/kcontrol/kio/cache_ui.ui +++ b/kcontrol/kio/cache_ui.ui @@ -4,7 +4,7 @@ CacheDlgUI - + 0 0 @@ -29,7 +29,7 @@ Fixed - + 16 21 @@ -88,7 +88,7 @@ MinimumExpanding - + 0 21 @@ -183,5 +183,5 @@ setEnabled(bool) - + diff --git a/kcontrol/kio/envvarproxy_ui.ui b/kcontrol/kio/envvarproxy_ui.ui index 471b9f868..4a0130f46 100644 --- a/kcontrol/kio/envvarproxy_ui.ui +++ b/kcontrol/kio/envvarproxy_ui.ui @@ -4,7 +4,7 @@ EnvVarProxyDlgUI - + 0 0 @@ -171,5 +171,5 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a pbVerify pbDetect - + diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp index 00a87567e..1920ddad9 100644 --- a/kcontrol/kio/fakeuaprovider.cpp +++ b/kcontrol/kio/fakeuaprovider.cpp @@ -27,14 +27,14 @@ #include "fakeuaprovider.h" #define UA_PTOS(x) (*it)->property(x).toString() -#define QFL(x) TQString::fromLatin1(x) +#define QFL(x) TQString::tqfromLatin1(x) FakeUASProvider::FakeUASProvider() { m_bIsDirty = true; } -FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr ) +FakeUASProvider::tqStatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr ) { TQStringList split; int pos = (uaStr).find("::"); @@ -53,7 +53,7 @@ FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString split = TQStringList::split("::", uaStr); } - if ( m_lstIdentity.contains(split[1]) ) + if ( m_lstIdentity.tqcontains(split[1]) ) return DUPLICATE_ENTRY; else { @@ -90,29 +90,29 @@ void FakeUASProvider::parseDescription() struct utsname utsn; uname( &utsn ); - tmp.replace( QFL("appSysName"), TQString(utsn.sysname) ); - tmp.replace( QFL("appSysRelease"), TQString(utsn.release) ); - tmp.replace( QFL("appMachineType"), TQString(utsn.machine) ); + tmp.tqreplace( QFL("appSysName"), TQString(utsn.sysname) ); + tmp.tqreplace( QFL("appSysRelease"), TQString(utsn.release) ); + tmp.tqreplace( QFL("appMachineType"), TQString(utsn.machine) ); TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); + TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.contains( TQString::fromLatin1("en") ) > 0 ) + if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 ) languageList.remove( it ); else - (*it) = TQString::fromLatin1("en"); + (*it) = TQString::tqfromLatin1("en"); } } - tmp.replace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) ); - tmp.replace( QFL("appPlatform"), QFL("X11") ); + tmp.tqreplace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) ); + tmp.tqreplace( QFL("appPlatform"), QFL("X11") ); } // Ignore dups... - if ( m_lstIdentity.contains(tmp) ) + if ( m_lstIdentity.tqcontains(tmp) ) continue; m_lstIdentity << tmp; diff --git a/kcontrol/kio/fakeuaprovider.h b/kcontrol/kio/fakeuaprovider.h index 8aedb639d..01a6aeae5 100644 --- a/kcontrol/kio/fakeuaprovider.h +++ b/kcontrol/kio/fakeuaprovider.h @@ -27,7 +27,7 @@ class TQStringList; class FakeUASProvider { public: - enum StatusCode { + enum tqStatusCode { SUCCEEDED=0, ALREADY_EXISTS, DUPLICATE_ENTRY @@ -36,7 +36,7 @@ public: FakeUASProvider(); ~FakeUASProvider(){}; - StatusCode createNewUAProvider( const TQString& ); + tqStatusCode createNewUAProvider( const TQString& ); TQString aliasStr( const TQString& ); TQString agentStr( const TQString& ); TQStringList userAgentStringList(); diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/kio/kcookiesmain.cpp index 8233f0d20..d8639d1be 100644 --- a/kcontrol/kio/kcookiesmain.cpp +++ b/kcontrol/kio/kcookiesmain.cpp @@ -34,9 +34,9 @@ KCookiesMain::KCookiesMain(TQWidget *parent) "are stored on your computer.")); } - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - layout->addWidget(tab); + tqlayout->addWidget(tab); policies = new KCookiesPolicies(this); tab->addTab(policies, i18n("&Policy")); diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp index f2cd45c42..85a16edd5 100644 --- a/kcontrol/kio/kcookiesmanagement.cpp +++ b/kcontrol/kio/kcookiesmanagement.cpp @@ -102,7 +102,7 @@ TQString CookieListViewItem::text(int f) const KCookiesManagement::KCookiesManagement(TQWidget *parent) : KCModule(parent, "kcmkio") { - // Toplevel layout + // Toplevel tqlayout TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); diff --git a/kcontrol/kio/kcookiesmanagementdlg_ui.ui b/kcontrol/kio/kcookiesmanagementdlg_ui.ui index f36c0a707..63f9a2008 100644 --- a/kcontrol/kio/kcookiesmanagementdlg_ui.ui +++ b/kcontrol/kio/kcookiesmanagementdlg_ui.ui @@ -4,7 +4,7 @@ KCookiesManagementDlgUI - + 0 0 @@ -21,7 +21,7 @@ - layout6 + tqlayout6 @@ -71,7 +71,7 @@ - layout4 + tqlayout4 @@ -119,7 +119,7 @@ MinimumExpanding - + 21 62 @@ -130,7 +130,7 @@ - layout3 + tqlayout3 @@ -315,8 +315,8 @@ kdialog.h - - + + klistviewsearchline.h diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp index 63f4dd21a..00d2b9860 100644 --- a/kcontrol/kio/kcookiespolicies.cpp +++ b/kcontrol/kio/kcookiespolicies.cpp @@ -175,7 +175,7 @@ bool KCookiesPolicies::handleDuplicate( const TQString& domain, int advice ) { TQString msg = i18n("A policy already exists for" "
%1
" - "Do you want to replace it?").arg(domain); + "Do you want to tqreplace it?").arg(domain); int res = KMessageBox::warningContinueCancel(this, msg, i18n("Duplicate Policy"), i18n("Replace")); @@ -392,7 +392,7 @@ void KCookiesPolicies::save() while( at ) { - domainConfig.append(TQString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); + domainConfig.append(TQString::tqfromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); at = at->nextSibling(); } diff --git a/kcontrol/kio/kcookiespoliciesdlg_ui.ui b/kcontrol/kio/kcookiespoliciesdlg_ui.ui index 435ca8640..50b6805b4 100644 --- a/kcontrol/kio/kcookiespoliciesdlg_ui.ui +++ b/kcontrol/kio/kcookiespoliciesdlg_ui.ui @@ -4,7 +4,7 @@ KCookiesPolicyDlgUI - + 0 0 @@ -161,7 +161,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su MinimumExpanding - + 20 16 @@ -170,7 +170,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su - layout3 + tqlayout3 @@ -256,7 +256,7 @@ List of sites for which you have set a specific cookie policy. Specific policies - layout2 + tqlayout2 @@ -314,8 +314,8 @@ List of sites for which you have set a specific cookie policy. Specific policies kdialog.h - - + + klistview.h klistviewsearchline.h diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp index 22accb4e9..8d21c7a5b 100644 --- a/kcontrol/kio/kenvvarproxydlg.cpp +++ b/kcontrol/kio/kenvvarproxydlg.cpp @@ -163,16 +163,16 @@ void KEnvVarProxyDlg::autoDetectPressed() setHighLight (mDlg->lbNoProxy, false); // Detect HTTP proxy settings... - found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); // Detect HTTPS proxy settings... - found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); // Detect FTP proxy settings... - found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); // Detect the NO_PROXY settings... - found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); if ( !found ) { diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp index 92e8a98e6..3b0745961 100644 --- a/kcontrol/kio/kmanualproxydlg.cpp +++ b/kcontrol/kio/kmanualproxydlg.cpp @@ -52,7 +52,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name ) mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) ); TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() ); - mDlg->pbCopyDown->setSizePolicy( sizePolicy ); + mDlg->pbCopyDown->tqsetSizePolicy( sizePolicy ); init(); } @@ -423,7 +423,7 @@ bool KManualProxyDlg::isValidURL( const TQString& _url, KURL* result ) const // We only check for a relevant subset of characters that are // not allowed in component of a URL. - if ( host.contains ('*') || host.contains (' ') || host.contains ('?') ) + if ( host.tqcontains ('*') || host.tqcontains (' ') || host.tqcontains ('?') ) return false; if ( result ) diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/kio/kproxydlg.cpp index bbe7a76bd..5f43afce2 100644 --- a/kcontrol/kio/kproxydlg.cpp +++ b/kcontrol/kio/kproxydlg.cpp @@ -43,10 +43,10 @@ KProxyOptions::KProxyOptions (TQWidget* parent ) :KCModule (parent, "kcmkio") { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); mTab = new TQTabWidget(this); - layout->addWidget(mTab); + tqlayout->addWidget(mTab); mProxy = new KProxyDialog(mTab); mSocks = new KSocksConfig(mTab); diff --git a/kcontrol/kio/kproxydlg_ui.ui b/kcontrol/kio/kproxydlg_ui.ui index 1a6b5d6e2..c2f654358 100644 --- a/kcontrol/kio/kproxydlg_ui.ui +++ b/kcontrol/kio/kproxydlg_ui.ui @@ -4,7 +4,7 @@ ProxyDlgUI - + 0 0 @@ -99,7 +99,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro - layout5 + tqlayout5 @@ -115,7 +115,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro Fixed - + 16 20 @@ -145,7 +145,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro - layout7 + tqlayout7 @@ -194,7 +194,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX - layout6 + tqlayout6 @@ -284,7 +284,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX - layout5 + tqlayout5 @@ -300,7 +300,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX Fixed - + 16 20 @@ -433,8 +433,8 @@ Although a persistent proxy connection is faster, note that it only works correc kdialog.h - - + + kpushbutton.h diff --git a/kcontrol/kio/lanbrowser.desktop b/kcontrol/kio/lanbrowser.desktop index 5d3965667..6959cba35 100644 --- a/kcontrol/kio/lanbrowser.desktop +++ b/kcontrol/kio/lanbrowser.desktop @@ -96,7 +96,7 @@ Comment[bn]=lisa, reslisa এবং ioslaves সেট-আপ Comment[br]=Kefluniadur lisa, reslisa and skalvoù IO Comment[bs]=Podesite lisa, reslisa i ioslaves Comment[ca]=Arranja lisa, reslisa i els ioslaves -Comment[cs]=Nastavení Lisa, ResLisa a pomocných zařízení +Comment[cs]=Nastavení Lisa, ResLisa a potqmocných zařízení Comment[csb]=Ùstôw lisa, reslisa ë procedurów wé/wi Comment[cy]=Gosodiad lisa,reslisa a'r gweision-io Comment[da]=Opsætning af lisa, reslisa og ioslaverne diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp index 96821defa..fb2c0edfd 100644 --- a/kcontrol/kio/main.cpp +++ b/kcontrol/kio/main.cpp @@ -79,7 +79,7 @@ extern "C" LanBrowser::LanBrowser(TQWidget *parent) :KCModule(parent,"kcmkio") -,layout(this) +,tqlayout(this) ,tabs(this) { setQuickHelp( i18n("

Local Network Browsing

Here you setup your " @@ -99,7 +99,7 @@ LanBrowser::LanBrowser(TQWidget *parent) "the LISa Homepage or contact Alexander Neundorf " "<neundorf@kde.org>.")); - layout.addWidget(&tabs); + tqlayout.addWidget(&tabs); smbPage = create_smb(&tabs, 0); tabs.addTab(smbPage, i18n("&Windows Shares")); diff --git a/kcontrol/kio/main.h b/kcontrol/kio/main.h index 5c6d35ef9..9d3609924 100644 --- a/kcontrol/kio/main.h +++ b/kcontrol/kio/main.h @@ -35,7 +35,7 @@ class LanBrowser:public KCModule virtual void save(); private: - TQVBoxLayout layout; + TQVBoxLayout tqlayout; TQTabWidget tabs; KCModule *smbPage; KCModule *lisaPage; diff --git a/kcontrol/kio/manualproxy_ui.ui b/kcontrol/kio/manualproxy_ui.ui index 1c8ef8634..6202a78ab 100644 --- a/kcontrol/kio/manualproxy_ui.ui +++ b/kcontrol/kio/manualproxy_ui.ui @@ -4,7 +4,7 @@ ManualProxyDlgUI - + 0 0 @@ -137,7 +137,7 @@ sbHttp - + 32767 32767 @@ -160,7 +160,7 @@ Minimum - + 51 20 @@ -211,7 +211,7 @@ Reverse the use of the exception list. Checking this box will result in the prox - layout2 + tqlayout2 @@ -280,7 +280,7 @@ Reverse the use of the exception list. Checking this box will result in the prox Expanding - + 20 114 @@ -313,5 +313,5 @@ Reverse the use of the exception list. Checking this box will result in the prox pbDelete pbDeleteAll - + diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp index 463806266..19cccaf22 100644 --- a/kcontrol/kio/policydlg.cpp +++ b/kcontrol/kio/policydlg.cpp @@ -70,7 +70,7 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); - setFixedSize (sizeHint()); + setFixedSize (tqsizeHint()); m_dlgUI->leDomain->setFocus (); } diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h index 2bf7a4c99..a67bfccaa 100644 --- a/kcontrol/kio/policydlg.h +++ b/kcontrol/kio/policydlg.h @@ -52,11 +52,11 @@ public: if (advice.isEmpty()) return KCookieAdvice::Dunno; - if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0) + if (advice.find (TQString::tqfromLatin1("accept"), 0, false) == 0) return KCookieAdvice::Accept; - else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0) + else if (advice.find (TQString::tqfromLatin1("reject"), 0, false) == 0) return KCookieAdvice::Reject; - else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0) + else if (advice.find (TQString::tqfromLatin1("ask"), 0, false) == 0) return KCookieAdvice::Ask; return KCookieAdvice::Dunno; diff --git a/kcontrol/kio/policydlg_ui.ui b/kcontrol/kio/policydlg_ui.ui index 1bae63208..627a985cf 100644 --- a/kcontrol/kio/policydlg_ui.ui +++ b/kcontrol/kio/policydlg_ui.ui @@ -4,7 +4,7 @@ PolicyDlgUI - + 0 0 @@ -101,6 +101,6 @@ Select the desired policy: kdialog.h - - + + diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 90dfd9170..93267c0e2 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -38,40 +38,40 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent) : KCModule(parent, "kcmkio") { - TQGridLayout *layout = new TQGridLayout(this,2,-1,KDialog::marginHint(), + TQGridLayout *tqlayout = new TQGridLayout(this,2,-1,KDialog::marginHint(), KDialog::spacingHint()); TQLabel *label=new TQLabel(i18n("This is the configuration for the samba client only, not the server."),this); - layout->addMultiCellWidget(label,0,0,0,1); + tqlayout->addMultiCellWidget(label,0,0,0,1); m_userLe=new TQLineEdit(this); label=new TQLabel(m_userLe,i18n("Default user name:"),this); - layout->addWidget(label,1,0); - layout->addWidget(m_userLe,1,1); + tqlayout->addWidget(label,1,0); + tqlayout->addWidget(m_userLe,1,1); m_passwordLe=new TQLineEdit(this); m_passwordLe->setEchoMode(TQLineEdit::Password); label=new TQLabel(m_passwordLe,i18n("Default password:"),this); - layout->addWidget(label,2,0); - layout->addWidget(m_passwordLe,2,1); + tqlayout->addWidget(label,2,0); + tqlayout->addWidget(m_passwordLe,2,1); /* m_workgroupLe=new TQLineEdit(this); label=new TQLabel(m_workgroupLe,i18n("Workgroup:"),this); - layout->addWidget(label,3,0); - layout->addWidget(m_workgroupLe,3,1); + tqlayout->addWidget(label,3,0); + tqlayout->addWidget(m_workgroupLe,3,1); m_showHiddenShares=new TQCheckBox(i18n("Show hidden shares"),this); - layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1); + tqlayout->addMultiCellWidget(m_showHiddenShares,4,4,0,1); m_encodingList = new KComboBox( false, this ); TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); m_encodingList->insertStringList( _strList ); label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this ); - layout->addWidget( label, 3, 0 ); - layout->addWidget( m_encodingList, 3, 1 ); + tqlayout->addWidget( label, 3, 0 ); + tqlayout->addWidget( m_encodingList, 3, 1 ); */ - layout->addWidget(new TQWidget(this),4,0); + tqlayout->addWidget(new TQWidget(this),4,0); // connect(m_showHiddenShares, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); connect(m_userLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); @@ -79,7 +79,7 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent) // connect(m_workgroupLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); // connect( m_encodingList, TQT_SIGNAL( activated( const TQString & ) ), this , TQT_SLOT( changed() ) ); - layout->setRowStretch(4, 1); + tqlayout->setRowStretch(4, 1); // finaly read the options load(); @@ -140,7 +140,7 @@ void SMBRoOptions::save() for (uint i=0; i> 10; unsigned int a2 = (num & 0x3E0) >> 5; unsigned int a3 = (num & 0x1F); diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp index fd1ce7d8e..3a322ab29 100644 --- a/kcontrol/kio/socks.cpp +++ b/kcontrol/kio/socks.cpp @@ -48,9 +48,9 @@ KSocksConfig::KSocksConfig(TQWidget *parent) setAboutData( about ); - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); base = new SocksBase(this); - layout->add(base); + tqlayout->add(base); connect(base->_c_enableSocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); connect(base->bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(methodChanged(int))); diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/kio/socksbase.ui index 5def84076..03adb5202 100644 --- a/kcontrol/kio/socksbase.ui +++ b/kcontrol/kio/socksbase.ui @@ -4,7 +4,7 @@ SocksBase - + 0 0 @@ -15,9 +15,9 @@ SOCKS - + - + @@ -127,7 +127,7 @@ _c_customPath - + 0 20 @@ -211,7 +211,7 @@ _c_newPath - + 0 25 @@ -236,7 +236,7 @@ MinimumExpanding - + 20 20 @@ -281,7 +281,7 @@ Expanding - + 20 0 @@ -330,6 +330,6 @@ kurlrequester.h kdialog.h - - + + diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp index 9e945948d..5bf92cdb7 100644 --- a/kcontrol/kio/uagentproviderdlg.cpp +++ b/kcontrol/kio/uagentproviderdlg.cpp @@ -47,7 +47,7 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e ) TQString keycode = e->text(); if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period || (cursorPosition() > 0 && key == Qt::Key_Minus) || - (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) ) + (!keycode.isEmpty() && keycode.tqunicode()->isLetterOrNumber()) ) { KLineEdit::keyPressEvent(e); return; diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/kio/uagentproviderdlg_ui.ui index 6f2a006ec..add8356d7 100644 --- a/kcontrol/kio/uagentproviderdlg_ui.ui +++ b/kcontrol/kio/uagentproviderdlg_ui.ui @@ -4,7 +4,7 @@ UAProviderDlgUI - + 0 0 @@ -117,7 +117,7 @@ The actual browser identification text that will be sent to the remote machine. MinimumExpanding - + 21 16 @@ -126,7 +126,7 @@ The actual browser identification text that will be sent to the remote machine. - layout3 + tqlayout3 @@ -142,7 +142,7 @@ The actual browser identification text that will be sent to the remote machine. MinimumExpanding - + 29 20 @@ -197,8 +197,8 @@ The actual browser identification text that will be sent to the remote machine. kdialog.h - - + + klineedit.h kcombobox.h diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp index c34d5cadc..09ebe351f 100644 --- a/kcontrol/kio/useragentdlg.cpp +++ b/kcontrol/kio/useragentdlg.cpp @@ -111,12 +111,12 @@ void UserAgentDlg::load() dlg->cbSendUAString->setChecked( b ); m_ua_keys = m_config->readEntry("UserAgentKeys", DEFAULT_USER_AGENT_KEYS).lower(); dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent( m_ua_keys ) ); - dlg->cbOS->setChecked( m_ua_keys.contains('o') ); - dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') ); - dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') ); - dlg->cbPlatform->setChecked( m_ua_keys.contains('p') ); - dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') ); - dlg->cbLanguage->setChecked( m_ua_keys.contains('l') ); + dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') ); + dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') ); + dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') ); + dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') ); + dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') ); + dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') ); updateButtons(); emit changed( false ); } @@ -135,12 +135,12 @@ void UserAgentDlg::defaults() dlg->lvDomainPolicyList->clear(); m_ua_keys = DEFAULT_USER_AGENT_KEYS; dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent(m_ua_keys) ); - dlg->cbOS->setChecked( m_ua_keys.contains('o') ); - dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') ); - dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') ); - dlg->cbPlatform->setChecked( m_ua_keys.contains('p') ); - dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') ); - dlg->cbLanguage->setChecked( m_ua_keys.contains('l') ); + dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') ); + dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') ); + dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') ); + dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') ); + dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') ); + dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') ); dlg->cbSendUAString->setChecked( true ); updateButtons(); configChanged(); @@ -224,7 +224,7 @@ bool UserAgentDlg::handleDuplicate( const TQString& site, { TQString msg = i18n("
Found an existing identification for" "
%1
" - "Do you want to replace it?
" + "Do you want to tqreplace it?" "").arg(site); int res = KMessageBox::warningContinueCancel(this, msg, i18n("Duplicate Identification"), @@ -351,7 +351,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int ) if ( dlg->cbLanguage->isChecked() ) m_ua_keys += 'l'; - dlg->cbOSVersion->setEnabled(m_ua_keys.contains('o')); + dlg->cbOSVersion->setEnabled(m_ua_keys.tqcontains('o')); TQString modVal = KProtocolManager::defaultUserAgent( m_ua_keys ); if ( dlg->leDefaultId->text() != modVal ) diff --git a/kcontrol/kio/useragentdlg_ui.ui b/kcontrol/kio/useragentdlg_ui.ui index 0db2a2440..2beb0beb1 100644 --- a/kcontrol/kio/useragentdlg_ui.ui +++ b/kcontrol/kio/useragentdlg_ui.ui @@ -4,7 +4,7 @@ UserAgentDlgUI - + 0 0 @@ -101,7 +101,7 @@ By default, only minimal identification information is sent to remote sites. The - layout2 + tqlayout2 @@ -117,7 +117,7 @@ By default, only minimal identification information is sent to remote sites. The Fixed - + 16 20 @@ -250,7 +250,7 @@ By default, only minimal identification information is sent to remote sites. The - layout1 + tqlayout1 @@ -310,7 +310,7 @@ By default, only minimal identification information is sent to remote sites. The Expanding - + 21 16 @@ -346,8 +346,8 @@ By default, only minimal identification information is sent to remote sites. The kdialog.h - - + + klineedit.h klistview.h diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index edfa28e48..9baa6fdba 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -64,19 +64,19 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & "any additional visual or audible alert." "")); - TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Event source:" ), this ); m_appCombo = new KComboBox( false, this, "app combo" ); - TQHBoxLayout *hbox = new TQHBoxLayout( layout ); + TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout ); hbox->addWidget( label ); hbox->addWidget( m_appCombo, 10 ); m_notifyWidget = new KNotifyWidget( this, "knotify widget", true ); connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool))); - layout->addWidget( m_notifyWidget ); + tqlayout->addWidget( m_notifyWidget ); connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ), TQT_SLOT( slotAppActivated( const TQString& )) ); diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui index f990fc995..81e0ff8a0 100644 --- a/kcontrol/knotify/playersettings.ui +++ b/kcontrol/knotify/playersettings.ui @@ -4,7 +4,7 @@ PlayerSettingsUI - + 0 0 @@ -84,7 +84,7 @@ Fixed - + 20 20 @@ -93,7 +93,7 @@ - layout5 + tqlayout5 @@ -109,7 +109,7 @@ Expanding - + 20 20 @@ -118,7 +118,7 @@ - layout4 + tqlayout4 @@ -140,7 +140,7 @@ Expanding - + 233 20 @@ -205,7 +205,7 @@ Fixed - + 20 20 @@ -265,7 +265,7 @@ Expanding - + 20 16 @@ -321,7 +321,7 @@ cbExternal cbNone - + kurlrequester.h klineedit.h diff --git a/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg b/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg index daa451531..321b35b8d 100644 Binary files a/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg and b/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg differ diff --git a/kcontrol/knotify/sounds/KDE_Startup_1.ogg b/kcontrol/knotify/sounds/KDE_Startup_1.ogg index 2fca9715b..251683347 100644 Binary files a/kcontrol/knotify/sounds/KDE_Startup_1.ogg and b/kcontrol/knotify/sounds/KDE_Startup_1.ogg differ diff --git a/kcontrol/knotify/sounds/KDE_Window_Iconify.wav b/kcontrol/knotify/sounds/KDE_Window_Iconify.wav index 55b4e4598..52bc44bf1 100644 Binary files a/kcontrol/knotify/sounds/KDE_Window_Iconify.wav and b/kcontrol/knotify/sounds/KDE_Window_Iconify.wav differ diff --git a/kcontrol/konq/README b/kcontrol/konq/README index 11ad5c7b5..22d05d7ff 100644 --- a/kcontrol/konq/README +++ b/kcontrol/konq/README @@ -1,7 +1,7 @@ -This module contains a combination of configuration items which at first +This module tqcontains a combination of configuration items which at first sight seem to be a rather weird combination. -It contains configuration for: +It tqcontains configuration for: * KDesktop * Konqueror * Number of virtual desktops. (Handled by KWin via NETWM) diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index af6c12cc4..75a46c717 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -58,7 +58,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/onlyone.png"))); - winPixmap->setFixedSize( winPixmap->sizeHint() ); + winPixmap->setFixedSize( winPixmap->tqsizeHint() ); // ---- @@ -103,7 +103,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * TQHBox *hboxpreview = new TQHBox(vbox); TQWidget* spacer = new TQWidget( hboxpreview ); spacer->setMinimumSize( 20, 0 ); - spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); @@ -146,7 +146,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * "while calling 'Move to Trash'.")); TQButtonGroup *bg = new TQVButtonGroup( i18n("Ask Confirmation For"), this ); - bg->layout()->setSpacing( KDialog::spacingHint() ); + bg->tqlayout()->setSpacing( KDialog::spacingHint() ); TQWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask" " for a confirmation when you \"delete\" a file." "
  • Move To Trash: moves the file to your trash folder," diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index cb1b5c47e..a17631927 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -33,18 +33,18 @@ KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *parent, const char *name) : KCModule( parent, "kcmkonq" ) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); TQTabWidget *tab = new TQTabWidget(this); - layout->addWidget(tab); + tqlayout->addWidget(tab); appearance = new KonqFontOptions(config, group, false, tab, name); - appearance->layout()->setMargin( KDialog::marginHint() ); + appearance->tqlayout()->setMargin( KDialog::marginHint() ); behavior = new KBehaviourOptions(config, group, tab, name); - behavior->layout()->setMargin( KDialog::marginHint() ); + behavior->tqlayout()->setMargin( KDialog::marginHint() ); previews = new KPreviewOptions(tab, name); - previews->layout()->setMargin( KDialog::marginHint() ); + previews->tqlayout()->setMargin( KDialog::marginHint() ); kuick = KCModuleLoader::loadModule("kcmkuick", tab); @@ -53,7 +53,7 @@ KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *pare tab->addTab(previews, i18n("&Previews && Meta-Data")); if (kuick) { - kuick->layout()->setMargin( KDialog::marginHint() ); + kuick->tqlayout()->setMargin( KDialog::marginHint() ); tab->addTab(kuick, i18n("&Quick Copy && Move")); } diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index 98275995c..f0f922845 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -59,7 +59,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) Q_ASSERT(maxDesktops % 2 == 0); - TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); // number group TQGroupBox *number_group = new TQGroupBox(this); @@ -82,7 +82,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) lay->addWidget(_numInput); lay->setStretchFactor( _numInput, 2 ); - layout->addWidget(number_group); + tqlayout->addWidget(number_group); // name group TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this); @@ -109,13 +109,13 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) for(int i = 1; i < maxDesktops; i++) setTabOrder( _nameInput[i-1], _nameInput[i] ); - layout->addWidget(name_group); + tqlayout->addWidget(name_group); _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this); connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - layout->addWidget(_wheelOption); - layout->addStretch(1); + tqlayout->addWidget(_wheelOption); + tqlayout->addStretch(1); load(); } diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui index 6e614b022..30da90234 100644 --- a/kcontrol/konq/desktopbehavior.ui +++ b/kcontrol/konq/desktopbehavior.ui @@ -4,7 +4,7 @@ DesktopBehaviorBase - + 0 0 @@ -58,7 +58,7 @@ - layout1 + tqlayout1 @@ -74,7 +74,7 @@ Fixed - + 20 0 @@ -268,7 +268,7 @@ Expanding - + 191 80 @@ -287,7 +287,7 @@ Expanding - + 20 16 @@ -410,7 +410,7 @@ enableMediaBox mediaListView - + klistview.h klistview.h diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 6b4aaadb0..a48550628 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -49,9 +49,9 @@ const int customMenu2ID = 6; DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * ) : KCModule( parent, "kcmkonq" ) { - TQVBoxLayout* layout = new TQVBoxLayout(this); + TQVBoxLayout* tqlayout = new TQVBoxLayout(this); m_behavior = new DesktopBehavior(config, this); - layout->addWidget(m_behavior); + tqlayout->addWidget(m_behavior); connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); } @@ -124,7 +124,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * */ bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); - m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")); + m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media")); connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed())); connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); @@ -144,8 +144,8 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * if ( leftHandedMouse ) { - qSwap(strMouseButton1, strMouseButton3); - qSwap(strButtonTxt1, strButtonTxt3); + tqSwap(strMouseButton1, strMouseButton3); + tqSwap(strButtonTxt1, strButtonTxt3); } leftLabel->setText( strMouseButton1 ); @@ -259,7 +259,7 @@ void DesktopBehavior::fillMediaListView() for (; it2 != mimetypes.end(); ++it2) { if ( ((*it2)->name().startsWith("media/")) ) { - bool ok=excludedMedia.contains((*it2)->name())==0; + bool ok=excludedMedia.tqcontains((*it2)->name())==0; new DesktopBehaviorMediaItem (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok); } } @@ -309,8 +309,8 @@ void DesktopBehavior::load( bool useDefaults ) previewListView->clear(); TQStringList previews = g_pConfig->readListEntry("Preview"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) - new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName())); - new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/")); + new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.tqcontains((*it)->desktopEntryName())); + new DesktopBehaviorPreviewItem(this, previewListView, previews.tqcontains("audio/")); // g_pConfig->setGroup( "FMSettings" ); toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) ); diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 0e3ea0861..66a49309f 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -198,7 +198,7 @@ void KPreviewOptions::save() group.writeEntry( protocol, it.current()->isOn(), true, true ); } // config key is in bytes, numinput is in MB - group.writeEntry( "MaximumSize", qRound( m_maxSize->value() *1024*1024 ), true, true ); + group.writeEntry( "MaximumSize", tqRound( m_maxSize->value() *1024*1024 ), true, true ); group.writeEntry( "BoostSize", m_boostSize->isChecked(), true, true ); group.writeEntry( "UseFileThumbnails", m_useFileThumbnails->isChecked(), true, true ); group.sync(); diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h index 8cf3ceade..03c3a175e 100644 --- a/kcontrol/konq/previews.h +++ b/kcontrol/konq/previews.h @@ -24,7 +24,7 @@ /* -The "Previews" Tab contains : +The "Previews" Tab tqcontains : List of protocols that support listing, with a checkbox for each Configuration of the maximum image size diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index f4111cfda..c4e2c26d2 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) tmpLabel->setBuddy( urDesktop ); lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL); connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); - TQString wtstr = i18n("This folder contains all the files" + TQString wtstr = i18n("This folder tqcontains all the files" " which you see on your desktop. You can change the location of this" " folder if you want to, and the contents will move automatically" " to the new location as well."); @@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) tmpLabel->setBuddy( urAutostart ); lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL); connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); - wtstr = i18n("This folder contains applications or" + wtstr = i18n("This folder tqcontains applications or" " links to applications (shortcuts) that you want to have started" " automatically whenever KDE starts. You can change the location of this" " folder if you want to, and the contents will move automatically" @@ -286,7 +286,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt KIO::ListJob* job = KIO::listDir( src ); connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) ); - qApp->enter_loop(); + tqApp->enter_loop(); if (m_ok) { @@ -298,7 +298,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt KIO::Job * job = KIO::move( src, dest ); connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); // wait for job - qApp->enter_loop(); + tqApp->enter_loop(); } } kdDebug() << "DesktopPathConfig::slotResult returning " << m_ok << endl; @@ -325,9 +325,9 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest ); connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); - qApp->enter_loop(); + tqApp->enter_loop(); } - qApp->exit_loop(); + tqApp->exit_loop(); } void DesktopPathConfig::slotResult( KIO::Job * job ) @@ -341,7 +341,7 @@ void DesktopPathConfig::slotResult( KIO::Job * job ) job->showErrorDialog(this); } - qApp->exit_loop(); + tqApp->exit_loop(); } #include "rootopts.moc" diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h index 7af18f1ae..51737f8d0 100644 --- a/kcontrol/konq/rootopts.h +++ b/kcontrol/konq/rootopts.h @@ -30,7 +30,7 @@ class KURLRequester; namespace KIO { class Job; } //----------------------------------------------------------------------------- -// The "Path" Tab contains : +// The "Path" Tab tqcontains : // The paths for Desktop, Autostart and Documents class DesktopPathConfig : public KCModule diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp index 681863cb6..9c533c9e2 100644 --- a/kcontrol/konqhtml/advancedTabDialog.cpp +++ b/kcontrol/konqhtml/advancedTabDialog.cpp @@ -52,11 +52,11 @@ advancedTabDialog::advancedTabDialog(TQWidget* parent, KConfig* config, const ch this, TQT_SLOT(save())); actionButton(Apply)->setEnabled(false); TQFrame* page = plainPage(); - TQVBoxLayout* layout = new TQVBoxLayout(page); + TQVBoxLayout* tqlayout = new TQVBoxLayout(page); m_advancedWidget = new advancedTabOptions(page); - layout->addWidget(m_advancedWidget); - layout->addSpacing( 20 ); - layout->addStretch(); + tqlayout->addWidget(m_advancedWidget); + tqlayout->addSpacing( 20 ); + tqlayout->addStretch(); connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); diff --git a/kcontrol/konqhtml/advancedTabOptions.ui b/kcontrol/konqhtml/advancedTabOptions.ui index 7116bc1ee..886d602c5 100644 --- a/kcontrol/konqhtml/advancedTabOptions.ui +++ b/kcontrol/konqhtml/advancedTabOptions.ui @@ -4,7 +4,7 @@ advancedTabOptions - + 0 0 @@ -43,7 +43,7 @@ - layout + tqlayout @@ -138,7 +138,7 @@ Expanding - + 20 0 @@ -150,6 +150,6 @@ kdialog.h - - + + diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 29dccb14b..3eff2fd25 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -36,10 +36,10 @@ DomainListView::DomainListView(KConfig *config,const TQString &title, TQWidget *parent,const char *name) : TQGroupBox(title, parent, name), config(config) { setColumnLayout(0, Qt::Vertical); - layout()->setSpacing(0); - layout()->setMargin(0); - TQGridLayout* thisLayout = new TQGridLayout(layout()); - thisLayout->setAlignment(Qt::AlignTop); + tqlayout()->setSpacing(0); + tqlayout()->setMargin(0); + TQGridLayout* thisLayout = new TQGridLayout(tqlayout()); + thisLayout->tqsetAlignment(Qt::AlignTop); thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h index a8238bbb4..7d0d30b82 100644 --- a/kcontrol/konqhtml/domainlistview.h +++ b/kcontrol/konqhtml/domainlistview.h @@ -85,21 +85,21 @@ public: /** * returns the add push-button. * - * Note: The add button already contains a default "what's this" text. + * Note: The add button already tqcontains a default "what's this" text. */ TQPushButton *addButton() const { return addDomainPB; } /** * returns the change push-button. * - * Note: The change button already contains a default "what's this" text. + * Note: The change button already tqcontains a default "what's this" text. */ TQPushButton *changeButton() const { return changeDomainPB; } /** * returns the delete push-button. * - * Note: The delete button already contains a default "what's this" text. + * Note: The delete button already tqcontains a default "what's this" text. */ TQPushButton *deleteButton() const { return deleteDomainPB; } diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 79ab4d45a..e1fcb28c7 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -323,5 +323,5 @@ TQString KCMFilter::quickHelp() const { return i18n("

    Konqueror AdBlocK

    Konqueror AdBlocK allows you to create a list of filters" " that are checked against linked images and frames. URL's that match are either discarded or" - " replaced with a placeholder image. "); + " tqreplaced with a placeholder image. "); } diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 3cca58732..e6a6c59bb 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -81,7 +81,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa // Tabbed Browsing TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this ); - TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() ); + TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), KDialog::spacingHint() ); m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing ); TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, " @@ -108,7 +108,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this ); m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse ); - TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change " + TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the tqshape of the cursor will change " "(usually to a hand) if it is moved over a hyperlink.") ); connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h index 503eadfdd..3f19d3b98 100644 --- a/kcontrol/konqhtml/htmlopts.h +++ b/kcontrol/konqhtml/htmlopts.h @@ -15,7 +15,7 @@ //----------------------------------------------------------------------------- -// The "Misc Options" Tab for the HTML view contains : +// The "Misc Options" Tab for the HTML view tqcontains : // Change cursor over links // Underline links diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index af168ed1f..54186a6bb 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -123,14 +123,14 @@ KJavaOptions::KJavaOptions( KConfig* config, TQString group, TQWhatsThis::add( enableJavaGloballyCB, i18n("Enables the execution of scripts written in Java " "that can be contained in HTML pages. " "Note that, as with any browser, enabling active contents can be a security problem.") ); - TQString wtstr = i18n("This box contains the domains and hosts you have set " + TQString wtstr = i18n("This box tqcontains the domains and hosts you have set " "a specific Java policy for. This policy will be used " "instead of the default policy for enabling or disabling Java applets on pages sent by these " "domains or hosts.

    Select a policy and use the controls on " "the right to modify it."); TQWhatsThis::add( domainSpecific->listView(), wtstr ); #if 0 - TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " + TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains " "the Java policies. These policies will be merged " "with the existing ones. Duplicate entries are ignored.") ); TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the Java policy to a zipped " @@ -163,7 +163,7 @@ KJavaOptions::KJavaOptions( KConfig* config, TQString group, TQWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in " "your path, simply leave it as 'java'. If you need to use a different jre, " "enter the path to the java executable (e.g. /usr/lib/jdk/bin/java), " - "or the path to the directory that contains 'bin/java' (e.g. /opt/IBMJava2-13).") ); + "or the path to the directory that tqcontains 'bin/java' (e.g. /opt/IBMJava2-13).") ); TQWhatsThis::add( addArgED, i18n("If you want special arguments to be passed to the virtual machine, enter them here.") ); diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h index de8f7c7eb..fbced3897 100644 --- a/kcontrol/konqhtml/javaopts.h +++ b/kcontrol/konqhtml/javaopts.h @@ -41,10 +41,10 @@ public: /** * constructor * @param config configuration to initialize this instance from - * @param group config group to use if this instance contains the global + * @param group config group to use if this instance tqcontains the global * policies (global == true) - * @param global true if this instance contains the global policy settings, - * false if this instance contains policies specific for a domain. + * @param global true if this instance tqcontains the global policy settings, + * false if this instance tqcontains policies specific for a domain. * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index ae73fc686..cf0124395 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -79,14 +79,14 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidge "button allows you to easily share your policies with other people by allowing " "you to save and retrieve them from a zipped file.") ); - TQString wtstr = i18n("This box contains the domains and hosts you have set " + TQString wtstr = i18n("This box tqcontains the domains and hosts you have set " "a specific JavaScript policy for. This policy will be used " "instead of the default policy for enabling or disabling JavaScript on pages sent by these " "domains or hosts.

    Select a policy and use the controls on " "the right to modify it."); TQWhatsThis::add( domainSpecific->listView(), wtstr ); - TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " + TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains " "the JavaScript policies. These policies will be merged " "with the existing ones. Duplicate entries are ignored.") ); TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the JavaScript policy to a zipped " diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index 5196af8dd..0360f2bf8 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -68,9 +68,9 @@ void JSPolicies::load() { window_focus = config->readUnsignedNumEntry(key, is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY); - key = prefix + "WindowStatusPolicy"; + key = prefix + "WindowtqStatusPolicy"; window_status = config->readUnsignedNumEntry(key, - is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY); + is_global ? KHTMLSettings::KJSWindowtqStatusAllow : INHERIT_POLICY); } void JSPolicies::defaults() { @@ -83,7 +83,7 @@ void JSPolicies::defaults() { window_resize = is_global ? KHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY; window_move = is_global ? KHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY; window_focus = is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY; - window_status = is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY; + window_status = is_global ? KHTMLSettings::KJSWindowtqStatusAllow : INHERIT_POLICY; } void JSPolicies::save() { @@ -114,7 +114,7 @@ void JSPolicies::save() { else config->deleteEntry(key); - key = prefix + "WindowStatusPolicy"; + key = prefix + "WindowtqStatusPolicy"; if (window_status != INHERIT_POLICY) config->writeEntry(key, window_status); else @@ -133,12 +133,12 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, bool is_per_domain = !policies->isGlobal(); setColumnLayout(0, Qt::Vertical); - layout()->setSpacing(0); - layout()->setMargin(0); - TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2); - this_layout->setAlignment(Qt::AlignTop); - this_layout->setSpacing(3); - this_layout->setMargin(11); + tqlayout()->setSpacing(0); + tqlayout()->setMargin(0); + TQGridLayout *this_tqlayout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2); + this_tqlayout->tqsetAlignment(Qt::AlignTop); + this_tqlayout->setSpacing(3); + this_tqlayout->setMargin(11); TQString wtstr; // what's this description int colIdx; // column index @@ -146,7 +146,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, // === window.open ================================ colIdx = 0; TQLabel *label = new TQLabel(i18n("Open new windows:"),this); - this_layout->addWidget(label,0,colIdx++); + this_tqlayout->addWidget(label,0,colIdx++); js_popup = new TQButtonGroup(this); js_popup->setExclusive(true); @@ -157,35 +157,35 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, policy_btn = new TQRadioButton(i18n("Use global"), this); TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_popup->insert(policy_btn,INHERIT_POLICY); - this_layout->addWidget(policy_btn,0,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,0,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ policy_btn = new TQRadioButton(i18n("Allow"), this); TQWhatsThis::add(policy_btn,i18n("Accept all popup window requests.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAllow); - this_layout->addWidget(policy_btn,0,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,0,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Ask"), this); TQWhatsThis::add(policy_btn,i18n("Prompt every time a popup window is requested.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAsk); - this_layout->addWidget(policy_btn,0,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,0,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Deny"), this); TQWhatsThis::add(policy_btn,i18n("Reject all popup window requests.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenDeny); - this_layout->addWidget(policy_btn,0,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,0,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Smart"), this); TQWhatsThis::add(policy_btn, i18n("Accept popup window requests only when " "links are activated through an explicit " "mouse click or keyboard operation.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenSmart); - this_layout->addWidget(policy_btn,0,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,0,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("If you disable this, Konqueror will stop " "interpreting the window.open() " @@ -202,7 +202,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, // === window.resizeBy/resizeTo ================================ colIdx = 0; label = new TQLabel(i18n("Resize window:"),this); - this_layout->addWidget(label,1,colIdx++); + this_tqlayout->addWidget(label,1,colIdx++); js_resize = new TQButtonGroup(this); js_resize->setExclusive(true); @@ -212,23 +212,23 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, policy_btn = new TQRadioButton(i18n("Use global"), this); TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_resize->insert(policy_btn,INHERIT_POLICY); - this_layout->addWidget(policy_btn,1,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,1,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ policy_btn = new TQRadioButton(i18n("Allow"), this); TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window size.")); js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeAllow); - this_layout->addWidget(policy_btn,1,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,1,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Ignore"), this); TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the window size. " "The web page will think it changed the " "size but the actual window is not affected.")); js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeIgnore); - this_layout->addWidget(policy_btn,1,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,1,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites change the window size on their own by using " "window.resizeBy() or window.resizeTo(). " @@ -240,7 +240,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, // === window.moveBy/moveTo ================================ colIdx = 0; label = new TQLabel(i18n("Move window:"),this); - this_layout->addWidget(label,2,colIdx++); + this_tqlayout->addWidget(label,2,colIdx++); js_move = new TQButtonGroup(this); js_move->setExclusive(true); @@ -250,23 +250,23 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, policy_btn = new TQRadioButton(i18n("Use global"), this); TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_move->insert(policy_btn,INHERIT_POLICY); - this_layout->addWidget(policy_btn,2,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,2,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ policy_btn = new TQRadioButton(i18n("Allow"), this); TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window position.")); js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveAllow); - this_layout->addWidget(policy_btn,2,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,2,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Ignore"), this); TQWhatsThis::add(policy_btn,i18n("Ignore attempts of scripts to change the window position. " "The web page will think it moved the " "window but the actual position is not affected.")); js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveIgnore); - this_layout->addWidget(policy_btn,2,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,2,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites change the window position on their own by using " "window.moveBy() or window.moveTo(). " @@ -278,7 +278,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, // === window.focus ================================ colIdx = 0; label = new TQLabel(i18n("Focus window:"),this); - this_layout->addWidget(label,3,colIdx++); + this_tqlayout->addWidget(label,3,colIdx++); js_focus = new TQButtonGroup(this); js_focus->setExclusive(true); @@ -288,15 +288,15 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, policy_btn = new TQRadioButton(i18n("Use global"), this); TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_focus->insert(policy_btn,INHERIT_POLICY); - this_layout->addWidget(policy_btn,3,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,3,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ policy_btn = new TQRadioButton(i18n("Allow"), this); TQWhatsThis::add( policy_btn,i18n("Allow scripts to focus the window.") ); js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusAllow); - this_layout->addWidget(policy_btn,3,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,3,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Ignore"), this); TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to focus the window. " @@ -304,8 +304,8 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "the focus to the window but the actual " "focus will remain unchanged.") ); js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusIgnore); - this_layout->addWidget(policy_btn,3,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,3,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites set the focus to their browser window on their " "own by using window.focus(). This usually leads to " @@ -319,7 +319,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, // === window.status ================================ colIdx = 0; label = new TQLabel(i18n("Modify status bar text:"),this); - this_layout->addWidget(label,4,colIdx++); + this_tqlayout->addWidget(label,4,colIdx++); js_statusbar = new TQButtonGroup(this); js_statusbar->setExclusive(true); @@ -329,32 +329,32 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, policy_btn = new TQRadioButton(i18n("Use global"), this); TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_statusbar->insert(policy_btn,INHERIT_POLICY); - this_layout->addWidget(policy_btn,4,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_tqlayout->addWidget(policy_btn,4,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ policy_btn = new TQRadioButton(i18n("Allow"), this); TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the text of the status bar.")); - js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusAllow); - this_layout->addWidget(policy_btn,4,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowtqStatusAllow); + this_tqlayout->addWidget(policy_btn,4,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Ignore"), this); TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the status bar text. " "The web page will think it changed " "the text but the actual text will remain " "unchanged.") ); - js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusIgnore); - this_layout->addWidget(policy_btn,4,colIdx++); - this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); + js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowtqStatusIgnore); + this_tqlayout->addWidget(policy_btn,4,colIdx++); + this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites change the status bar text by setting " - "window.status or window.defaultStatus, " + "window.status or window.defaulttqStatus, " "thus sometimes preventing displaying the real URLs of hyperlinks. " "This option specifies the treatment of such " "attempts."); TQWhatsThis::add(label, wtstr); - connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int))); + connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowtqStatusPolicy(int))); } JSPoliciesFrame::~JSPoliciesFrame() { @@ -399,7 +399,7 @@ void JSPoliciesFrame::setWindowFocusPolicy(int id) { emit changed(); } -void JSPoliciesFrame::setWindowStatusPolicy(int id) { +void JSPoliciesFrame::setWindowtqStatusPolicy(int id) { policies->window_status = id; emit changed(); } diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h index 45352fbb9..b2d08c11d 100644 --- a/kcontrol/konqhtml/jspolicies.h +++ b/kcontrol/konqhtml/jspolicies.h @@ -50,16 +50,16 @@ public: * Enumeration for all policies */ enum Policies { JavaScriptEnabled = 0, WindowOpen, WindowResize, - WindowMove, WindowFocus, WindowStatus, NumPolicies }; + WindowMove, WindowFocus, WindowtqStatus, NumPolicies }; #endif /** * constructor * @param config configuration to initialize this instance from - * @param group config group to use if this instance contains the global + * @param group config group to use if this instance tqcontains the global * policies (global == true) - * @param global true if this instance contains the global policy settings, - * false if this instance contains policies specific for a domain. + * @param global true if this instance tqcontains the global policy settings, + * false if this instance tqcontains policies specific for a domain. * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ @@ -141,19 +141,19 @@ public: } /** - * Returns whether the WindowStatus policy is inherited. + * Returns whether the WindowtqStatus policy is inherited. */ - bool isWindowStatusPolicyInherited() const { + bool isWindowtqStatusPolicyInherited() const { return window_status == INHERIT_POLICY; } /** - * Returns the current value of the WindowStatus policy. + * Returns the current value of the WindowtqStatus policy. * - * This will return an illegal value if isWindowStatusPolicyInherited is + * This will return an illegal value if isWindowtqStatusPolicyInherited is * true. */ - KHTMLSettings::KJSWindowStatusPolicy windowStatusPolicy() const { - return (KHTMLSettings::KJSWindowStatusPolicy)window_status; + KHTMLSettings::KJSWindowtqStatusPolicy windowtqStatusPolicy() const { + return (KHTMLSettings::KJSWindowtqStatusPolicy)window_status; } /** @@ -178,7 +178,7 @@ private: unsigned int window_move; // one of KHTMLSettings::KJSWindowFocusPolicy or INHERIT_POLICY unsigned int window_focus; - // one of KHTMLSettings::KJSWindowStatusPolicy or INHERIT_POLICY + // one of KHTMLSettings::KJSWindowtqStatusPolicy or INHERIT_POLICY unsigned int window_status; friend class JSPoliciesFrame; // for changing policies @@ -187,7 +187,7 @@ private: /** * @short Provides a framed widget with controls for the JavaScript policy settings. * - * This widget contains controls for changing all JavaScript policies + * This widget tqcontains controls for changing all JavaScript policies * except the JavaScript enabled policy itself. The rationale behind this is * that the enabled policy be separate from the rest in a prominent * place. @@ -253,7 +253,7 @@ private slots: void setWindowResizePolicy(int id); void setWindowMovePolicy(int id); void setWindowFocusPolicy(int id); - void setWindowStatusPolicy(int id); + void setWindowtqStatusPolicy(int id); private: diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index 28654869e..de08bf995 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -97,9 +97,9 @@ KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name) setAboutData( about ); - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - layout->addWidget(tab); + tqlayout->addWidget(tab); // ### the groupname is duplicated in KJSParts::save java = new KJavaOptions( config, "Java/JavaScript Settings", this, name ); diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index d772595c2..3bbbe9f8e 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -5,7 +5,7 @@ NSConfigWidget - + 0 0 @@ -16,7 +16,7 @@ Netscape Plugin Config - + @@ -72,7 +72,7 @@ Expanding - + 20 20 @@ -96,7 +96,7 @@ GroupBox1 - + 300 0 @@ -184,7 +184,7 @@ Expanding - + 20 20 @@ -261,8 +261,8 @@ klistbox.h kdialog.h - - + + qwidget.h kurlrequester.h diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index d5cd4cc2b..ee434b710 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -72,14 +72,14 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren TQFrame *hrule = new TQFrame(globalGB); hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); + hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); /************************************************************************** ********************* Domain-specific Settings *************************** *************************************************************************/ TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"), globalGB); - domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg())); domainSpecificDlg = new KDialogBase(KDialogBase::Swallow, @@ -99,13 +99,13 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren "that can be contained in HTML pages, e.g. Macromedia Flash. " "Note that, as with any browser, enabling active contents can be a security problem.") ); - TQString wtstr = i18n("This box contains the domains and hosts you have set " + TQString wtstr = i18n("This box tqcontains the domains and hosts you have set " "a specific plugin policy for. This policy will be used " "instead of the default policy for enabling or disabling plugins on pages sent by these " "domains or hosts.

    Select a policy and use the controls on " "the right to modify it."); TQWhatsThis::add( domainSpecific->listView(), wtstr ); - TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " + TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains " "the plugin policies. These policies will be merged " "with the existing ones. Duplicate entries are ignored.") ); TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the plugin policy to a zipped " diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h index 8b61f8f16..c51ad5ffe 100644 --- a/kcontrol/konqhtml/pluginopts.h +++ b/kcontrol/konqhtml/pluginopts.h @@ -37,10 +37,10 @@ public: /** * constructor * @param config configuration to initialize this instance from - * @param group config group to use if this instance contains the global + * @param group config group to use if this instance tqcontains the global * policies (global == true) - * @param global true if this instance contains the global policy settings, - * false if this instance contains policies specific for a domain. + * @param global true if this instance tqcontains the global policy settings, + * false if this instance tqcontains policies specific for a domain. * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ diff --git a/kcontrol/konqhtml/policies.h b/kcontrol/konqhtml/policies.h index a9814396a..4943ac373 100644 --- a/kcontrol/konqhtml/policies.h +++ b/kcontrol/konqhtml/policies.h @@ -42,10 +42,10 @@ public: /** * constructor * @param config configuration to initialize this instance from - * @param group config group to use if this instance contains the global + * @param group config group to use if this instance tqcontains the global * policies (global == true) - * @param global true if this instance contains the global policy settings, - * false if it contains policies specific to a domain. + * @param global true if this instance tqcontains the global policy settings, + * false if it tqcontains policies specific to a domain. * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) * @param prefix prefix to use for configuration keys. The domain-specific diff --git a/kcontrol/konqhtml/policydlg.h b/kcontrol/konqhtml/policydlg.h index e4a176fb3..bc10b3b5c 100644 --- a/kcontrol/konqhtml/policydlg.h +++ b/kcontrol/konqhtml/policydlg.h @@ -99,7 +99,7 @@ public: void refresh(); /** - * Adds another panel which contains controls for more policies. + * Adds another panel which tqcontains controls for more policies. * * The widget is inserted between the "feature enabled" combo box and * the dialog buttons at the bottom. diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui index bb805ed4b..36c294b4a 100644 --- a/kcontrol/konsole/kcmkonsoledialog.ui +++ b/kcontrol/konsole/kcmkonsoledialog.ui @@ -4,7 +4,7 @@ KCMKonsoleDialog - + 0 0 @@ -12,9 +12,9 @@ 490 - + - + @@ -30,9 +30,9 @@ 0 - + - + @@ -55,7 +55,7 @@ Expanding - + 20 20 @@ -184,7 +184,7 @@ Expanding - + 20 20 @@ -282,7 +282,7 @@ Expanding - + 20 20 @@ -377,8 +377,8 @@ knuminput.h kdialog.h - - + + knuminput.h knuminput.h diff --git a/kcontrol/konsole/schemadialog.ui b/kcontrol/konsole/schemadialog.ui index 64fda6a49..62a4380e4 100644 --- a/kcontrol/konsole/schemadialog.ui +++ b/kcontrol/konsole/schemadialog.ui @@ -4,7 +4,7 @@ SchemaDialog - + 0 0 @@ -15,9 +15,9 @@ Konsole Schema Editor - + - + @@ -108,7 +108,7 @@ Expanding - + 20 20 @@ -158,7 +158,7 @@ Fixed - + 20 20 @@ -357,7 +357,7 @@ Expanding - + 20 20 @@ -389,7 +389,7 @@ Fixed - + 20 20 @@ -498,13 +498,13 @@ 0 - + 180 120 - + 180 120 @@ -540,7 +540,7 @@ Expanding - + 20 20 @@ -626,6 +626,6 @@ kcolorbutton.h kdialog.h - - + + diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui index a86a74077..fa3f89327 100644 --- a/kcontrol/konsole/sessiondialog.ui +++ b/kcontrol/konsole/sessiondialog.ui @@ -4,7 +4,7 @@ SessionDialog - + 0 0 @@ -15,9 +15,9 @@ Konsole Session Editor - + - + @@ -28,7 +28,7 @@ - layout8 + tqlayout8 @@ -184,13 +184,13 @@ previewIcon - + 100 100 - + 100 100 @@ -212,7 +212,7 @@ 0 - + 90 100 @@ -221,7 +221,7 @@ &Icon: - + AlignTop|AlignLeft @@ -280,7 +280,7 @@ Expanding - + 20 20 @@ -312,7 +312,7 @@ - layout6 + tqlayout6 @@ -320,7 +320,7 @@ - layout5 + tqlayout5 @@ -371,7 +371,7 @@ - layout4 + tqlayout4 @@ -435,8 +435,8 @@ kcolorbutton.h kdialog.h - - + + kicondialog.h kurlrequester.h diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index ccb906301..6cd4cc2d0 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -80,7 +80,7 @@ static void applyGtkStyles(bool active, int version) TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc)); if (list.count() == 0) { - list.append(TQString::fromLatin1(sysGtkrc(version))); + list.append(TQString::tqfromLatin1(sysGtkrc(version))); list.append(TQDir::homeDirPath()+userGtkrc(version)); } list.remove(gtkkde); @@ -174,9 +174,9 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified.. TQString qversion = qVersion(); - if ( qversion.contains( '.' ) > 1 ) + if ( qversion.tqcontains( '.' ) > 1 ) qversion.truncate( qversion.findRev( '.' ) ); - if ( qversion.contains( '-' ) ) + if ( qversion.tqcontains( '-' ) ) qversion.truncate( qversion.findRev( '-' ) ); TQStringList kdeAdded = @@ -220,8 +220,8 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) pathDb[path]=true; - if(path.contains("/lib64/")) - path.replace("/lib64/","/lib/"); + if(path.tqcontains("/lib64/")) + path.tqreplace("/lib64/","/lib/"); pathDb[path]=true; } @@ -347,7 +347,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n" "# \"Apply colors to non-KDE applications\"\n" "#\n" - "#\n").arg(TQDateTime::currentDateTime().toString()); + "#\n").arg(TQDateTime::tqcurrentDateTime().toString()); t << "style \"default\"" << endl; t << "{" << endl; @@ -590,7 +590,7 @@ void runRdb( uint flags ) // Qt-only apps without adversely affecting ourselves. // Cheat and use the current timestamp, since we just saved to qtrc. - TQDateTime settingsstamp = TQDateTime::currentDateTime(); + TQDateTime settingsstamp = TQDateTime::tqcurrentDateTime(); static Atom qt_settings_timestamp = 0; if (!qt_settings_timestamp) { diff --git a/kcontrol/kthememanager/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h index 5a0df045a..8ea226d8b 100644 --- a/kcontrol/kthememanager/knewthemedlg.h +++ b/kcontrol/kthememanager/knewthemedlg.h @@ -26,7 +26,7 @@ class NewThemeWidget; /** - * Dialog for creating new themes, contains just + * Dialog for creating new themes, tqcontains just * getters and setters used for the theme general properties * @author Lukas Tinkl */ diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index b78a354be..f2d0395ed 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -469,14 +469,14 @@ void KTheme::apply() iconConf->setGroup( "ToolbarIcons" ); TQString iconName = iconSubElem.tagName(); - if ( iconName.contains( "Color" ) ) + if ( iconName.tqcontains( "Color" ) ) { TQColor iconColor = TQColor( iconSubElem.attribute( "rgb" ) ); iconConf->writeEntry( iconName, iconColor, true, true ); } - else if ( iconName.contains( "Value" ) || iconName == "Size" ) + else if ( iconName.tqcontains( "Value" ) || iconName == "Size" ) iconConf->writeEntry( iconName, iconSubElem.attribute( "value" ).toUInt(), true, true ); - else if ( iconName.contains( "Effect" ) ) + else if ( iconName.tqcontains( "Effect" ) ) iconConf->writeEntry( iconName, iconSubElem.attribute( "name" ), true, true ); else iconConf->writeEntry( iconName, static_cast( iconSubElem.attribute( "value" ).toUInt() ), true, true ); @@ -738,18 +738,18 @@ void KTheme::createIconElems( const TQString & group, const TQString & object, << "DisabledColor" << "DisabledColor2" << "DisabledEffect" << "DisabledSemiTransparent" << "DisabledValue"; for ( TQStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) { - if ( (*it).contains( "Color" ) ) + if ( (*it).tqcontains( "Color" ) ) createColorElem( *it, object, parent, cfg ); else { TQDomElement tmpCol = m_dom.createElement( *it ); tmpCol.setAttribute( "object", object ); - if ( (*it).contains( "Value" ) || *it == "Size" ) + if ( (*it).tqcontains( "Value" ) || *it == "Size" ) tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) ); - else if ( (*it).contains( "DisabledEffect" ) ) + else if ( (*it).tqcontains( "DisabledEffect" ) ) tmpCol.setAttribute( "name", cfg->readEntry( *it, "togray" ) ); - else if ( (*it).contains( "Effect" ) ) + else if ( (*it).tqcontains( "Effect" ) ) tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) ); else tmpCol.setAttribute( "value", cfg->readBoolEntry( *it, false ) ); @@ -832,7 +832,7 @@ TQString KTheme::processFilePath( const TQString & section, const TQString & pat TQString KTheme::unprocessFilePath( const TQString & section, TQString path ) { if ( path.startsWith( "theme:/" ) ) - return path.replace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); + return path.tqreplace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); if ( TQFile::exists( path ) ) return path; diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui index 4b46fdc26..361ca5129 100644 --- a/kcontrol/kthememanager/kthemedlg.ui +++ b/kcontrol/kthememanager/kthemedlg.ui @@ -5,7 +5,7 @@ KThemeDlg - + 0 0 @@ -30,7 +30,7 @@ - layout2 + tqlayout2 @@ -60,7 +60,7 @@ MinimumExpanding - + 170 20 @@ -88,7 +88,7 @@ - layout1 + tqlayout1 @@ -109,7 +109,7 @@ Box - + AlignCenter @@ -193,7 +193,7 @@ - layout4 + tqlayout4 @@ -211,13 +211,13 @@ 0 - + 80 60 - + 32767 60 @@ -251,13 +251,13 @@ 0 - + 80 60 - + 32767 60 @@ -291,13 +291,13 @@ 0 - + 80 60 - + 32767 60 @@ -331,13 +331,13 @@ 0 - + 80 60 - + 32767 60 @@ -371,13 +371,13 @@ 0 - + 80 60 - + 32767 60 @@ -411,13 +411,13 @@ 0 - + 80 60 - + 32767 60 @@ -511,7 +511,7 @@ startFonts() startSaver() - + kurllabel.h diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 2668bd87c..e64642109 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -298,7 +298,7 @@ void kthememanager::slotCreateTheme() m_theme->setAuthor( dlg.getAuthor() ); m_theme->setEmail( dlg.getEmail() ); m_theme->setHomepage( dlg.getHomepage() ); - m_theme->setComment( dlg.getComment().replace( "\n", "" ) ); + m_theme->setComment( dlg.getComment().tqreplace( "\n", "" ) ); m_theme->setVersion( dlg.getVersion() ); TQString result = m_theme->createYourself( true ); diff --git a/kcontrol/kthememanager/newthemewidget.ui b/kcontrol/kthememanager/newthemewidget.ui index 905b0749a..ae9ef90d0 100644 --- a/kcontrol/kthememanager/newthemewidget.ui +++ b/kcontrol/kthememanager/newthemewidget.ui @@ -5,7 +5,7 @@ NewThemeWidget - + 0 0 @@ -88,7 +88,7 @@ Co&mment: - + AlignTop @@ -126,5 +126,5 @@ leVersion teComment - + diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index ba6193107..f73303bc0 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -57,10 +57,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL "given in the section 'Startup indication timeout'")); GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->layout()->setSpacing( 0 ); - GroupBox1->layout()->setMargin( 0 ); + GroupBox1->tqlayout()->setSpacing( 0 ); + GroupBox1->tqlayout()->setMargin( 0 ); Form1Layout->addWidget( GroupBox1 ); - TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->layout(), 3, 2 ); + TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->tqlayout(), 3, 2 ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); GroupBox1Layout->setColStretch( 1, 1 ); @@ -97,10 +97,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL "given in the section 'Startup indication timeout'")); GroupBox2->setColumnLayout( 0, Qt::Vertical ); - GroupBox2->layout()->setSpacing( 0 ); - GroupBox2->layout()->setMargin( 0 ); + GroupBox2->tqlayout()->setSpacing( 0 ); + GroupBox2->tqlayout()->setMargin( 0 ); Form1Layout->addWidget( GroupBox2 ); - TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->layout(), 2, 2 ); + TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->tqlayout(), 2, 2 ); GroupBox2Layout->setSpacing( 6 ); GroupBox2Layout->setMargin( 11 ); GroupBox2Layout->setColStretch( 1, 1 ); diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index baa127e2f..9b4ff303c 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -59,7 +59,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale, this, TQT_SLOT(changedCountry(const TQString &)) ); m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); - m_labLang->setAlignment( AlignTop ); + m_labLang->tqsetAlignment( AlignTop ); m_languages = new TQListBox(this); connect(m_languages, TQT_SIGNAL(selectionChanged()), @@ -270,7 +270,7 @@ void KLocaleConfig::loadLanguageList() it != first.end(); ++it ) { - TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop") + TQString str = locate("locale", TQString::tqfromLatin1("%1/entry.desktop") .arg(*it)); if (!str.isNull()) prilang << str; @@ -278,7 +278,7 @@ void KLocaleConfig::loadLanguageList() // add all languages to the list TQStringList alllang = KGlobal::dirs()->findAllResources("locale", - TQString::fromLatin1("*/entry.desktop"), + TQString::tqfromLatin1("*/entry.desktop"), false, true); TQStringList langlist = prilang; if (langlist.count() > 0) @@ -293,7 +293,7 @@ void KLocaleConfig::loadLanguageList() if ((*it).isNull()) { m_addLanguage->insertSeparator(); - submenu = TQString::fromLatin1("other"); + submenu = TQString::tqfromLatin1("other"); m_addLanguage->insertSubmenu(m_locale->translate("Other"), submenu, TQString::null, -1); menu_index = -2; // first entries should _not_ be sorted @@ -322,13 +322,13 @@ void KLocaleConfig::loadCountryList() KLocale *lsave = KGlobal::_locale; KGlobal::_locale = m_locale; - TQString sub = TQString::fromLatin1("l10n/"); + TQString sub = TQString::tqfromLatin1("l10n/"); // clear the list m_comboCountry->clear(); TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", - sub + TQString::fromLatin1("*.desktop"), + sub + TQString::tqfromLatin1("*.desktop"), false, true ); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -352,7 +352,7 @@ void KLocaleConfig::loadCountryList() m_locale->translate("without name")); TQString map( locate( "locale", - TQString::fromLatin1( "l10n/%1.png" ) + TQString::tqfromLatin1( "l10n/%1.png" ) .arg(tag) ) ); TQIconSet icon; if ( !map.isNull() ) @@ -362,7 +362,7 @@ void KLocaleConfig::loadCountryList() // add all languages to the list TQStringList countrylist = KGlobal::dirs()->findAllResources - ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true); + ("locale", sub + TQString::tqfromLatin1("*/entry.desktop"), false, true); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) @@ -381,7 +381,7 @@ void KLocaleConfig::loadCountryList() int menu_index = submenu.isEmpty() ? -1 : -2; TQString flag( locate( "locale", - TQString::fromLatin1( "l10n/%1/flag.png" ) + TQString::tqfromLatin1( "l10n/%1/flag.png" ) .arg(tag) ) ); TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); @@ -399,7 +399,7 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name, KGlobal::_locale = m_locale; // read the name - TQString filepath = TQString::fromLatin1("%1%2/entry.desktop") + TQString filepath = TQString::tqfromLatin1("%1%2/entry.desktop") .arg(sub) .arg(path); @@ -419,7 +419,7 @@ void KLocaleConfig::save() config->writeEntry("Country", m_locale->country(), true, true); if ( m_locale->languageList().isEmpty() ) - config->writeEntry("Language", TQString::fromLatin1(""), true, true); + config->writeEntry("Language", TQString::tqfromLatin1(""), true, true); else config->writeEntry("Language", m_locale->languageList(), ':', true, true); @@ -502,7 +502,7 @@ void KLocaleConfig::slotTranslate() TQStringList KLocaleConfig::languageList() const { TQString fileName = locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())); KSimpleConfig entry(fileName); diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index bf4cc8b32..b7dbe5088 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -88,7 +88,7 @@ KLocaleSample::~KLocaleSample() void KLocaleSample::slotUpdateTime() { - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); m_dateSample->setText(m_locale->formatDate(dt.date(), false)); m_dateShortSample->setText(m_locale->formatDate(dt.date(), true)); @@ -98,11 +98,11 @@ void KLocaleSample::slotUpdateTime() void KLocaleSample::slotLocaleChanged() { m_numberSample->setText(m_locale->formatNumber(1234567.89) + - TQString::fromLatin1(" / ") + + TQString::tqfromLatin1(" / ") + m_locale->formatNumber(-1234567.89)); m_moneySample->setText(m_locale->formatMoney(123456789.00) + - TQString::fromLatin1(" / ") + + TQString::tqfromLatin1(" / ") + m_locale->formatMoney(-123456789.00)); slotUpdateTime(); diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 9fa1ad708..b4c516ecf 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -131,7 +131,7 @@ void KLocaleConfigMoney::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); @@ -139,24 +139,24 @@ void KLocaleConfigMoney::save() int i; bool b; - str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$")); + str = ent.readEntry("CurrencySymbol", TQString::tqfromLatin1("$")); config->deleteEntry("CurrencySymbol", false, true); if (str != m_locale->currencySymbol()) config->writeEntry("CurrencySymbol", m_locale->currencySymbol(), true, true); - str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1(".")); + str = ent.readEntry("MonetaryDecimalSymbol", TQString::tqfromLatin1(".")); config->deleteEntry("MonetaryDecimalSymbol", false, true); if (str != m_locale->monetaryDecimalSymbol()) config->writeEntry("MonetaryDecimalSymbol", m_locale->monetaryDecimalSymbol(), true, true); - str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(",")); - str.replace(TQString::fromLatin1("$0"), TQString::null); + str = ent.readEntry("MonetaryThousandsSeparator", TQString::tqfromLatin1(",")); + str.tqreplace(TQString::tqfromLatin1("$0"), TQString::null); config->deleteEntry("MonetaryThousandsSeparator", false, true); if (str != m_locale->monetaryThousandsSeparator()) config->writeEntry("MonetaryThousandsSeparator", - TQString::fromLatin1("$0%1$0") + TQString::tqfromLatin1("$0%1$0") .arg(m_locale->monetaryThousandsSeparator()), true, true); diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index 537cc99ab..79ae74c67 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -89,26 +89,26 @@ void KLocaleConfigNumber::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); TQString str; str = ent.readEntry("DecimalSymbol", - TQString::fromLatin1(".")); + TQString::tqfromLatin1(".")); config->deleteEntry("DecimalSymbol", false, true); if (str != m_locale->decimalSymbol()) config->writeEntry("DecimalSymbol", m_locale->decimalSymbol(), true, true); str = ent.readEntry("ThousandsSeparator", - TQString::fromLatin1(",")); + TQString::tqfromLatin1(",")); config->deleteEntry("ThousandsSeparator", false, true); - str.replace(TQString::fromLatin1("$0"), TQString::null); + str.tqreplace(TQString::tqfromLatin1("$0"), TQString::null); if (str != m_locale->thousandsSeparator()) config->writeEntry("ThousandsSeparator", - TQString::fromLatin1("$0%1$0") + TQString::tqfromLatin1("$0%1$0") .arg(m_locale->thousandsSeparator()), true, true); str = ent.readEntry("PositiveSign"); @@ -116,7 +116,7 @@ void KLocaleConfigNumber::save() if (str != m_locale->positiveSign()) config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true); - str = ent.readEntry("NegativeSign", TQString::fromLatin1("-")); + str = ent.readEntry("NegativeSign", TQString::tqfromLatin1("-")); config->deleteEntry("NegativeSign", false, true); if (str != m_locale->negativeSign()) config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true); diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 1cf6b949b..33b039c6e 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -80,7 +80,7 @@ void KLocaleConfigOther::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index 2519ea794..17b78a79c 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -253,28 +253,28 @@ void KLocaleConfigTime::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); TQString str; - str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian")); + str = ent.readEntry("CalendarSystem", TQString::tqfromLatin1("gregorian")); config->deleteEntry("CalendarSystem", false, true); if (str != m_locale->calendarType()) config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true); - str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S")); + str = ent.readEntry("TimeFormat", TQString::tqfromLatin1("%H:%M:%S")); config->deleteEntry("TimeFormat", false, true); if (str != m_locale->timeFormat()) config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true); - str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y")); + str = ent.readEntry("DateFormat", TQString::tqfromLatin1("%A %d %B %Y")); config->deleteEntry("DateFormat", false, true); if (str != m_locale->dateFormat()) config->writeEntry("DateFormat", m_locale->dateFormat(), true, true); - str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d")); + str = ent.readEntry("DateFormatShort", TQString::tqfromLatin1("%Y-%m-%d")); config->deleteEntry("DateFormatShort", false, true); if (str != m_locale->dateFormatShort()) config->writeEntry("DateFormatShort", @@ -345,7 +345,7 @@ void KLocaleConfigTime::slotLocaleChanged() TQString calendarType = m_locale->calendarType(); int calendarSystem = 0; - CalendarVector::iterator it = qFind(calendars.begin(), calendars.end(), + CalendarVector::iterator it = tqFind(calendars.begin(), calendars.end(), calendarType); if ( it != calendars.end() ) calendarSystem = it - calendars.begin(); @@ -371,7 +371,7 @@ calendarType); kdDebug(173) << storeToUser(timeMap(), m_locale->timeFormat()) << endl; kdDebug(173) << userToStore(timeMap(), - TQString::fromLatin1("HH:MM:SS AMPM test")) << endl; + TQString::tqfromLatin1("HH:MM:SS AMPM test")) << endl; } @@ -416,7 +416,7 @@ void KLocaleConfigTime::slotTranslate() { TQString str; - TQString sep = TQString::fromLatin1("\n"); + TQString sep = TQString::tqfromLatin1("\n"); TQString old; @@ -462,7 +462,7 @@ void KLocaleConfigTime::slotTranslate() str = m_locale->translate ("

    The text in this textbox will be used to format " - "time strings. The sequences below will be replaced:

    " + "time strings. The sequences below will be tqreplaced:

    " "" "" @@ -506,14 +506,14 @@ void KLocaleConfigTime::slotTranslate() str = m_locale->translate ( "

    The text in this textbox will be used to format long " - "dates. The sequences below will be replaced:

    ") + datecodes; + "dates. The sequences below will be tqreplaced:

    ") + datecodes; TQWhatsThis::add( m_labDateFmt, str ); TQWhatsThis::add( m_comboDateFmt, str ); str = m_locale->translate ( "

    The text in this textbox will be used to format short " "dates. For instance, this is used when listing files. " - "The sequences below will be replaced:

    ") + datecodes; + "The sequences below will be tqreplaced:

    ") + datecodes; TQWhatsThis::add( m_labDateFmtShort, str ); TQWhatsThis::add( m_comboDateFmtShort, str ); diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index de47ce661..523fa50ea 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -62,7 +62,7 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, m_nullConfig = new KConfig(TQString::null, false, false); m_globalConfig = new KConfig(TQString::null, false, true); - m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); + m_locale = new KLocale(TQString::tqfromLatin1("kcmlocale"), m_nullConfig); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l->setAutoAdd(TRUE); @@ -162,7 +162,7 @@ void KLocaleApplication::load( bool useDefaults ) { m_globalConfig->setReadDefaults( useDefaults ); m_globalConfig->reparseConfiguration(); - *m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig); + *m_locale = KLocale(TQString::tqfromLatin1("kcmlocale"), m_globalConfig); emit localeChanged(); emit languageChanged(); @@ -180,7 +180,7 @@ void KLocaleApplication::save() "language of all programs, you will have to " "logout first."), m_locale->translate("Applying Language Settings"), - TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); + TQString::tqfromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); // restore the old global locale KGlobal::_locale = lsave; diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index 5bc340f7b..0e97bbf5e 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -74,7 +74,7 @@ struct MyNIC { TQString name; TQString addr; - TQString netmask; + TQString nettqmask; TQString state; TQString type; TQString HWaddr; @@ -123,7 +123,7 @@ void KCMNic::update() NICList *nics=findNICs(); nics->setAutoDelete(true); for (MyNIC* tmp=nics->first(); tmp!=0; tmp=nics->next()) - new TQListViewItem(m_list,tmp->name, tmp->addr, tmp->netmask, tmp->type, tmp->state, tmp->HWaddr); + new TQListViewItem(m_list,tmp->name, tmp->addr, tmp->nettqmask, tmp->type, tmp->state, tmp->HWaddr); delete nics; } @@ -211,10 +211,10 @@ NICList* findNICs() if (result==0) { sinptr = (struct sockaddr_in *) &ifcopy.ifr_addr; - tmp->netmask=inet_ntoa(sinptr->sin_addr); + tmp->nettqmask=inet_ntoa(sinptr->sin_addr); } else - tmp->netmask=i18n("Unknown"); + tmp->nettqmask=i18n("Unknown"); ifcopy=*ifr; result=-1; // if none of the two #ifs below matches, ensure that result!=0 so that "Unknown" is returned as result @@ -265,10 +265,10 @@ NICList* findNICs() getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); tmp->addr = buf; - if (ifa->ifa_netmask != NULL) { + if (ifa->ifa_nettqmask != NULL) { bzero(buf, 128); - getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); - tmp->netmask = buf; + getnameinfo(ifa->ifa_nettqmask, ifa->ifa_nettqmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); + tmp->nettqmask = buf; } tmp->state= (ifa->ifa_flags & IFF_UP) ? upMessage : downMessage; @@ -298,21 +298,21 @@ TQString flags_tos (unsigned int flags) if (flags & IFF_BROADCAST) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Broadcast"); } if (flags & IFF_MULTICAST) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Multicast"); } if (flags & IFF_LOOPBACK) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Loopback"); } diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp index b85dca5d8..afa6e4847 100644 --- a/kcontrol/performance/kcmperformance.cpp +++ b/kcontrol/performance/kcmperformance.cpp @@ -51,11 +51,11 @@ Config::Config( TQWidget* parent_P, const char* ) TQVBoxLayout *topLayout = new TQVBoxLayout( this ); TQTabWidget* tabs = new TQTabWidget( this ); konqueror_widget = new Konqueror( tabs ); - konqueror_widget->layout()->setMargin( KDialog::marginHint() ); + konqueror_widget->tqlayout()->setMargin( KDialog::marginHint() ); connect( konqueror_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); tabs->addTab( konqueror_widget, i18n( "Konqueror" )); system_widget = new SystemWidget( tabs ); - system_widget->layout()->setMargin( KDialog::marginHint() ); + system_widget->tqlayout()->setMargin( KDialog::marginHint() ); connect( system_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); tabs->addTab( system_widget, i18n( "System" )); topLayout->add( tabs ); diff --git a/kcontrol/performance/konqueror_ui.ui b/kcontrol/performance/konqueror_ui.ui index 3ace0b5db..ca92c6ad9 100644 --- a/kcontrol/performance/konqueror_ui.ui +++ b/kcontrol/performance/konqueror_ui.ui @@ -4,7 +4,7 @@ Konqueror_ui - + 0 0 @@ -69,7 +69,7 @@ - layout2 + tqlayout2 @@ -101,7 +101,7 @@ Expanding - + 40 20 @@ -138,7 +138,7 @@ Expanding - + 20 160 @@ -150,6 +150,6 @@ kdialog.h - - + + diff --git a/kcontrol/performance/system_ui.ui b/kcontrol/performance/system_ui.ui index a8d0e7956..f6e7e6a15 100644 --- a/kcontrol/performance/system_ui.ui +++ b/kcontrol/performance/system_ui.ui @@ -4,7 +4,7 @@ System_ui - + 0 0 @@ -55,7 +55,7 @@ Expanding - + 20 40 @@ -64,6 +64,6 @@ - - + + diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui index df79e2ec1..01cb00c21 100644 --- a/kcontrol/privacy/kcmprivacydialog.ui +++ b/kcontrol/privacy/kcmprivacydialog.ui @@ -5,7 +5,7 @@ KCMPrivacyDialog - + 0 0 @@ -79,13 +79,13 @@ 0 - + 0 50 - + 32767 200 @@ -104,7 +104,7 @@ - layout1 + tqlayout1 @@ -114,13 +114,13 @@ selectAllButton - + 80 0 - + 32767 32767 @@ -134,13 +134,13 @@ selectNoneButton - + 80 0 - + 32767 32767 @@ -160,7 +160,7 @@ Maximum - + 80 20 @@ -179,7 +179,7 @@ 0 - + 32767 32767 @@ -197,5 +197,5 @@ klistview.h ktextedit.h - + diff --git a/kcontrol/privacy/kprivacysettings.ui b/kcontrol/privacy/kprivacysettings.ui index 93afe5dff..686d0c2fe 100644 --- a/kcontrol/privacy/kprivacysettings.ui +++ b/kcontrol/privacy/kprivacysettings.ui @@ -9,7 +9,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. KPrivacySettings - + 0 0 @@ -246,7 +246,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - layout1 + tqlayout1 @@ -272,7 +272,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. - layout3 + tqlayout3 @@ -303,6 +303,6 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. kdialog.h - - + + diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index e97cf4836..f48d621cf 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -60,7 +60,7 @@ void ConfigDialog::show() { if ( !isVisible() ) { KWinModule module(0, KWinModule::INFO_DESKTOP); - TQSize s1 = sizeHint(); + TQSize s1 = tqsizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); int h = s1.height(); diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 584237975..615d9a2f5 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -62,11 +62,11 @@ public: ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) : KListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} - // TQListView has a weird idea of a sizeHint... - virtual TQSize sizeHint () const { - int w = minimumSizeHint().width(); + // TQListView has a weird idea of a tqsizeHint... + virtual TQSize tqsizeHint () const { + int w = tqminimumSizeHint().width(); int h = header()->height(); - h += viewport()->sizeHint().height(); + h += viewport()->tqsizeHint().height(); h += horizontalScrollBar()->height(); TQListViewItem *item = firstChild(); diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp index 087585d3f..4c918c583 100644 --- a/kcontrol/randr/krandrmodule.cpp +++ b/kcontrol/randr/krandrmodule.cpp @@ -131,7 +131,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged())); TQHBox* syncBox = new TQHBox(this); - syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum)); + syncBox->tqlayout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum)); m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox); topLayout->addWidget(syncBox); TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when KDE starts instead of being temporary.")); diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp index 5cf6fa6b2..98c6c0a18 100644 --- a/kcontrol/randr/krandrpassivepopup.cpp +++ b/kcontrol/randr/krandrpassivepopup.cpp @@ -94,14 +94,14 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Move && o->isWidgetType() - && watched_widgets.contains( static_cast< TQWidget* >( o ))) + && watched_widgets.tqcontains( static_cast< TQWidget* >( o ))) TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf())); return false; } bool KRandrPassivePopup::x11Event( XEvent* e ) { - if( e->type == ConfigureNotify && watched_windows.contains( e->xconfigure.window )) + if( e->type == ConfigureNotify && watched_windows.tqcontains( e->xconfigure.window )) { if( !update_timer.isActive()) update_timer.start( 10, true ); diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index e35fba9d2..e712b71d6 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -54,7 +54,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) , m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection())) { setPixmap(KSystemTray::loadSizedIcon("randr", width())); - setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + tqsetAlignment(Qt::AlignHCenter | Qt::AlignVCenter); connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); TQToolTip::add(this, i18n("Screen resize & rotate")); my_parent = parent; @@ -509,7 +509,7 @@ void KRandRSystemTray::slotCycleDisplays() int current_on_index = -1; int max_index = -1; int prev_on_index; - Status s; + tqStatus s; randr_screen_info = read_screen_info(randr_display); @@ -782,7 +782,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) char *output_name; RROutput output_id; int i; - Status s; + tqStatus s; int num_outputs_on; num_outputs_on = 0; diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp index 071088e9b..3af8fdf1c 100644 --- a/kcontrol/randr/ktimerdialog.cpp +++ b/kcontrol/randr/ktimerdialog.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include #include @@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent, if ( buttonMask & Cancel ) buttonOnTimeout = Cancel; - connect( totalTimer, SIGNAL( timeout() ), SLOT( slotInternalTimeout() ) ); - connect( updateTimer, SIGNAL( timeout() ), SLOT( slotUpdateTime() ) ); + connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) ); + connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) ); // create the widgets mainWidget = new QVBox( this, "mainWidget" ); @@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( QWidget *widget ) // yuck, here goes. QVBox *newWidget = new QVBox( this ); - if ( widget->parentWidget() != mainWidget ) { + if ( widget->tqparentWidget() != mainWidget ) { widget->reparent( newWidget, 0, QPoint(0,0) ); } else { newWidget->insertChild( widget ); diff --git a/kcontrol/randr/ktimerdialog.h b/kcontrol/randr/ktimerdialog.h index 23b4a92b0..c4037e389 100644 --- a/kcontrol/randr/ktimerdialog.h +++ b/kcontrol/randr/ktimerdialog.h @@ -144,7 +144,7 @@ class KTimerDialog : public KDialogBase private: /** - * Prepares the layout that manages the widgets of the dialog + * Prepares the tqlayout that manages the widgets of the dialog */ void setupLayout(); diff --git a/kcontrol/samba/AUTHORS b/kcontrol/samba/AUTHORS index 0bebeaa06..71854fa7a 100644 --- a/kcontrol/samba/AUTHORS +++ b/kcontrol/samba/AUTHORS @@ -1,4 +1,4 @@ -Samba Status Module: +Samba tqStatus Module: Michael Glauche diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp index fd31f7800..8540fc4b2 100644 --- a/kcontrol/samba/kcmsambaimports.cpp +++ b/kcontrol/samba/kcmsambaimports.cpp @@ -74,13 +74,13 @@ void ImportsView::updateList() if (e!=0) { s=buf; - if ((s.contains(" nfs ")) || (s.contains(" smbfs "))) + if ((s.tqcontains(" nfs ")) || (s.tqcontains(" smbfs "))) { strSource=s.left(s.find(" on /")); strMount=s.mid(s.find(" on /")+4,s.length()); - if ((s.contains(" nfs ")) || (s.contains("/remote on "))) + if ((s.tqcontains(" nfs ")) || (s.tqcontains("/remote on "))) strType="NFS"; - else if (s.contains(" smbfs ")) + else if (s.tqcontains(" smbfs ")) strType="SMB"; int pos(strMount.find(" type ")); if (pos==-1) pos=strMount.find(" read/"); diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index 224bc6fa2..935944ea5 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -62,7 +62,7 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name) mainLayout->addWidget(&updateButton,0,Qt::AlignLeft); TQWhatsThis::add( &logFileName, i18n("This page presents the contents of" - " your samba log file in a friendly layout. Check that the correct log" + " your samba log file in a friendly tqlayout. Check that the correct log" " file for your computer is listed here. If you need to, correct the name" " or location of the log file, and then click the \"Update\" button.") ); @@ -116,14 +116,14 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name) connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList())); emit contentsChanged(&viewHistory,0,0); - label.setMinimumSize(label.sizeHint()); - logFileName.setMinimumSize(250,logFileName.sizeHint().height()); + label.setMinimumSize(label.tqsizeHint()); + logFileName.setMinimumSize(250,logFileName.tqsizeHint().height()); viewHistory.setMinimumSize(425,200); - showConnOpen.setMinimumSize(showConnOpen.sizeHint()); - showConnClose.setMinimumSize(showConnClose.sizeHint()); - showFileOpen.setMinimumSize(showFileOpen.sizeHint()); - showFileClose.setMinimumSize(showFileClose.sizeHint()); - updateButton.setFixedSize(updateButton.sizeHint()); + showConnOpen.setMinimumSize(showConnOpen.tqsizeHint()); + showConnClose.setMinimumSize(showConnClose.tqsizeHint()); + showFileOpen.setMinimumSize(showFileOpen.tqsizeHint()); + showFileClose.setMinimumSize(showFileClose.tqsizeHint()); + updateButton.setFixedSize(updateButton.tqsizeHint()); } void LogView::loadSettings() diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index f75fd72e5..6fd788b2e 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -80,18 +80,18 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam hostLe->setText("*"); viewStatistics->setMinimumSize(375,200); - connectionsL->setMinimumSize(connectionsL->sizeHint()); - filesL->setMinimumSize(filesL->sizeHint()); - eventL->setMinimumSize(eventL->sizeHint()); - eventCb->setMinimumSize(eventCb->sizeHint()); - hostL->setMinimumSize(hostL->sizeHint()); - hostLe->setMinimumSize(120,hostLe->sizeHint().height()); - serviceL->setMinimumSize(serviceL->sizeHint()); - serviceLe->setMinimumSize(120,serviceLe->sizeHint().height()); - calcButton->setMinimumSize(calcButton->sizeHint()); - clearButton->setMinimumSize(clearButton->sizeHint()); - expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint()); - expandedUserCb->setMinimumSize(expandedUserCb->sizeHint()); + connectionsL->setMinimumSize(connectionsL->tqsizeHint()); + filesL->setMinimumSize(filesL->tqsizeHint()); + eventL->setMinimumSize(eventL->tqsizeHint()); + eventCb->setMinimumSize(eventCb->tqsizeHint()); + hostL->setMinimumSize(hostL->tqsizeHint()); + hostLe->setMinimumSize(120,hostLe->tqsizeHint().height()); + serviceL->setMinimumSize(serviceL->tqsizeHint()); + serviceLe->setMinimumSize(120,serviceLe->tqsizeHint().height()); + calcButton->setMinimumSize(calcButton->tqsizeHint()); + clearButton->setMinimumSize(clearButton->tqsizeHint()); + expandedInfoCb->setMinimumSize(expandedInfoCb->tqsizeHint()); + expandedUserCb->setMinimumSize(expandedUserCb->tqsizeHint()); TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -150,8 +150,8 @@ void StatisticsView::calculate() { if (connCount) { - if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) { if (expandedInfoCb->isChecked()) item2=item->text(2); else item2=serviceLe->text(); @@ -163,8 +163,8 @@ void StatisticsView::calculate() } else { - if ((TQString(item->text(1)).contains(i18n("FILE OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) { if (expandedInfoCb->isChecked()) item2=item->text(2); else item2=serviceLe->text(); @@ -201,14 +201,14 @@ void StatisticsView::calculate() { if (connCount) { - if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) count++; } else { - if ((TQString(item->text(1)).contains(i18n("FILE OPENED"))) - && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) + if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED"))) + && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) count++; }; item=item->nextSibling(); diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index c94bc5129..89263c2c6 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -32,7 +32,7 @@ #define Before(ttf,in) in.left(in.find(ttf)) -#define After(ttf,in) (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString("")) +#define After(ttf,in) (in.tqcontains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString("")) NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name ) : TQWidget(parent, name) @@ -77,7 +77,7 @@ NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name ) void NetMon::processNFSLine(char *bufline, int) { TQCString line(bufline); - if (line.contains(":/")) + if (line.tqcontains(":/")) new TQListViewItem(list,"NFS",After(":",line),Before(":/",line)); } @@ -87,14 +87,14 @@ void NetMon::processSambaLine(char *bufline, int) rownumber++; if (rownumber == 2) version->setText(bufline); // second line = samba version - if ((readingpart==header) && line.contains("Service")) + if ((readingpart==header) && line.tqcontains("Service")) { iUser=line.find("uid"); iGroup=line.find("gid"); iPid=line.find("pid"); iMachine=line.find("machine"); } - else if ((readingpart==header) && (line.contains("---"))) + else if ((readingpart==header) && (line.tqcontains("---"))) { readingpart=connexions; } diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp index 88d95680a..52669c2f8 100644 --- a/kcontrol/samba/main.cpp +++ b/kcontrol/samba/main.cpp @@ -58,8 +58,8 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin ,logView(&tabs,&config) ,statisticsView(&tabs,&config) { - TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - layout->addWidget(&tabs); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + tqlayout->addWidget(&tabs); tabs.addTab(&status,i18n("&Exports")); tabs.addTab(&imports,i18n("&Imports")); tabs.addTab(&logView,i18n("&Log")); @@ -68,7 +68,7 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin setButtons(Help); load(); - setQuickHelp( i18n("The Samba and NFS Status Monitor is a front end to the programs" + setQuickHelp( i18n("The Samba and NFS tqStatus Monitor is a front end to the programs" " smbstatus and showmount. Smbstatus reports on current" " Samba connections, and is part of the suite of Samba tools, which" " implements the SMB (Session Message Block) protocol, also called the" diff --git a/kcontrol/samba/smbstatus.desktop b/kcontrol/samba/smbstatus.desktop index 14b8425ed..02ab8aebf 100644 --- a/kcontrol/samba/smbstatus.desktop +++ b/kcontrol/samba/smbstatus.desktop @@ -9,20 +9,20 @@ X-KDE-Library=samba X-KDE-FactoryName=samba X-KDE-ParentApp=kinfocenter -Name=Samba Status +Name=Samba tqStatus Name[ar]=حالة Samba Name[az]=Samba'nın Vəziyyəti Name[be]=Стан Samba Name[bg]=Сървър Samba Name[bn]=সাম্বা স্ট্যাটাস Name[br]=Saviad Samba -Name[bs]=Status Sambe +Name[bs]=tqStatus Sambe Name[ca]=Estat de Samba Name[cs]=Stav Samby Name[csb]=Sztaus Samba Name[cy]=Cyflwr Samba Name[da]=Samba-status -Name[de]=Samba-Status +Name[de]=Samba-tqStatus Name[el]=Κατάσταση samba Name[eo]=Sambo-stato Name[es]=Estado de Samba @@ -38,7 +38,7 @@ Name[he]=מצב Samba Name[hi]=साम्बा स्थिति Name[hr]=Stanje Sambe Name[hu]=Samba -Name[id]=Status Samba +Name[id]=tqStatus Samba Name[is]=Staða Samba Name[it]=Stato di Samba Name[ja]=Samba の状態 @@ -48,13 +48,13 @@ Name[km]=ស្ថានភាព Samba Name[ko]=삼바 상태 Name[lo]=ສະຖານະຂອງ Samba Name[lt]=Samba būsena -Name[lv]=Samba Statuss +Name[lv]=Samba tqStatuss Name[mk]=Статус на Samba Name[mn]=Samba-Төлөв -Name[ms]=Status Samba +Name[ms]=tqStatus Samba Name[mt]=Stat tas-Samba Name[nb]=Samba-status -Name[nds]=Samba-Status +Name[nds]=Samba-tqStatus Name[ne]=साम्बा वस्तुस्थिति Name[nl]=Samba-status Name[nn]=Samba-status @@ -68,9 +68,9 @@ Name[ru]=Сервер Samba Name[rw]=Imimerere Samba Name[se]=Samba stáhtus Name[sk]=Stav systému Samba -Name[sl]=Status Sambe +Name[sl]=tqStatus Sambe Name[sr]=Статус Самбе -Name[sr@Latn]=Status Sambe +Name[sr@Latn]=tqStatus Sambe Name[ss]=Simo se Samba Name[sv]=Samba-status Name[ta]=சம்பா நிலை @@ -102,7 +102,7 @@ Comment[cs]=Monitor stavu Samby Comment[csb]=Mònitor stónu Sambë Comment[cy]=Monitr cyflwr samba Comment[da]=Overvågning af samba-status -Comment[de]=Samba-Statusmonitor +Comment[de]=Samba-tqStatusmonitor Comment[el]=Εποπτεία της Samba Comment[eo]=Rigardilo por la stato de Sambo Comment[es]=Monitor de estado de Samba @@ -133,7 +133,7 @@ Comment[mn]=Samba-Төлөв харуулагч Comment[ms]=Monitor status Samba Comment[mt]=Monitur tal-istat tas-Samba Comment[nb]=Overvåking av Samba-status -Comment[nds]=Statuskieker för Samba +Comment[nds]=tqStatuskieker för Samba Comment[ne]=साम्बा वस्तुस्थिति मोनिटर Comment[nl]=Sambastatusmonitor Comment[nn]=Overvaking av Samba-status diff --git a/kcontrol/screensaver/advanceddialogimpl.ui b/kcontrol/screensaver/advanceddialogimpl.ui index 814a3867c..fda54f257 100644 --- a/kcontrol/screensaver/advanceddialogimpl.ui +++ b/kcontrol/screensaver/advanceddialogimpl.ui @@ -4,7 +4,7 @@ Form1 - + 0 0 @@ -69,7 +69,7 @@ Expanding - + 31 20 @@ -99,7 +99,7 @@ - layout8 + tqlayout8 @@ -107,7 +107,7 @@ - layout1 + tqlayout1 @@ -153,7 +153,7 @@ Expanding - + 41 20 @@ -162,7 +162,7 @@ - layout3 + tqlayout3 @@ -202,7 +202,7 @@ - layout9 + tqlayout9 @@ -210,7 +210,7 @@ - layout4 + tqlayout4 @@ -256,7 +256,7 @@ Expanding - + 20 20 @@ -265,7 +265,7 @@ - layout2 + tqlayout2 @@ -305,7 +305,7 @@ - layout10 + tqlayout10 @@ -321,7 +321,7 @@ Expanding - + 21 20 @@ -346,7 +346,7 @@ Expanding - + 31 20 @@ -365,7 +365,7 @@ Expanding - + 20 20 @@ -382,7 +382,7 @@ Expanding - + 20 20 @@ -393,5 +393,5 @@ - + diff --git a/kcontrol/screensaver/category_list b/kcontrol/screensaver/category_list index 61115c0dc..c0b1d5687 100644 --- a/kcontrol/screensaver/category_list +++ b/kcontrol/screensaver/category_list @@ -1,4 +1,4 @@ -// This list contains all screen saver categories. +// This list tqcontains all screen saver categories. // The categories are extracted for translation (see Makefile.am). // To show a screen saver in the list under a category, add the diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp index d13d131dc..0f799c4a2 100644 --- a/kcontrol/screensaver/kswidget.cpp +++ b/kcontrol/screensaver/kswidget.cpp @@ -54,7 +54,7 @@ KSWidget::KSWidget( TQWidget* parent, const char* name, int f ) } } } - Window w = XCreateWindow( x11Display(), parentWidget() ? parentWidget()->winId() : RootWindow( x11Display(), x11Screen()), + Window w = XCreateWindow( x11Display(), tqparentWidget() ? tqparentWidget()->winId() : RootWindow( x11Display(), x11Screen()), x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs ); create( w ); #endif diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index f80cc19e9..5dd0ca5c3 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -50,7 +50,7 @@ template class TQPtrList; -const uint widgetEventMask = // X event mask +const uint widgetEventMask = // X event tqmask (uint)( ExposureMask | PropertyChangeMask | @@ -133,12 +133,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSaverGroup->setColumnLayout( 0, Qt::Horizontal ); vLayout->addWidget(mSaverGroup); vLayout->setStretchFactor( mSaverGroup, 10 ); - TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(), + TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(), KDialog::spacingHint() ); mSaverListView = new TQListView( mSaverGroup ); mSaverListView->setMinimumHeight( 120 ); - mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + mSaverListView->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mSaverListView->addColumn(""); mSaverListView->header()->hide(); mSelected = -1; @@ -162,7 +162,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSettingsGroup = new TQGroupBox( i18n("Settings"), this ); mSettingsGroup->setColumnLayout( 0, Qt::Vertical ); leftColumnLayout->addWidget( mSettingsGroup ); - groupLayout = new TQVBoxLayout( mSettingsGroup->layout(), + groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(), KDialog::spacingHint() ); mEnabledCheckBox = new TQCheckBox(i18n( @@ -221,14 +221,14 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mWaitLockEdit->setSuffix(i18n(" sec")); mWaitLockEdit->setValue(mLockTimeout/1000); mWaitLockEdit->setEnabled(mEnabled && mLock); - if ( mWaitLockEdit->sizeHint().width() < - mWaitEdit->sizeHint().width() ) { - mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); - mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); + if ( mWaitLockEdit->tqsizeHint().width() < + mWaitEdit->tqsizeHint().width() ) { + mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); } else { - mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); - mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); + mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); } connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int))); @@ -246,7 +246,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis new TQVBoxLayout(topLayout, KDialog::spacingHint()); mMonitorLabel = new TQLabel( this ); - mMonitorLabel->setAlignment( AlignCenter ); + mMonitorLabel->tqsetAlignment( AlignCenter ); mMonitorLabel->setPixmap( TQPixmap(locate("data", "kcontrol/pics/monitor.png"))); rightColumnLayout->addWidget(mMonitorLabel, 0); @@ -256,7 +256,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis advancedLayout->addWidget( new TQWidget( this ) ); TQPushButton* advancedBt = new TQPushButton( i18n( "Advanced &Options" ), this, "advancedBtn" ); - advancedBt->setSizePolicy( TQSizePolicy( + advancedBt->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); connect( advancedBt, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) ); @@ -739,7 +739,7 @@ void KScreenSaver::slotSetup() // void KScreenSaver::slotAdvanced() { - KScreenSaverAdvancedDialog dlg( topLevelWidget() ); + KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() ); if ( dlg.exec() ) { mChanged = true; emit changed(true); diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui index fe8c4fa06..44fdf064a 100644 --- a/kcontrol/smartcard/nosmartcardbase.ui +++ b/kcontrol/smartcard/nosmartcardbase.ui @@ -4,7 +4,7 @@ NoSmartcardBase - + 0 0 @@ -23,7 +23,7 @@ <b>Unable to contact the KDE smartcard service.</b> - + WordBreak|AlignVCenter @@ -48,7 +48,7 @@ 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed. - + WordBreak|AlignVCenter @@ -64,7 +64,7 @@ Expanding - + 20 20 @@ -76,6 +76,6 @@ kdialog.h - - + + diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index 0a1ea39ef..ce2a8027d 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -47,7 +47,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) : KCModule(parent, name),DCOPObject(name) { - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); config = new KConfig("ksmartcardrc", false, false); DCOPClient *dc = KApplication::kApplication()->dcopClient(); @@ -67,7 +67,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) base = new SmartcardBase(this); - layout->add(base); + tqlayout->add(base); _popUpKardChooser = new KPopupMenu(this,"KpopupKardChooser"); _popUpKardChooser->insertItem(i18n("Change Module..."), @@ -107,7 +107,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) _cardDB= new KCardDB(); load(); } else { - layout->add(new NoSmartcardBase(this)); + tqlayout->add(new NoSmartcardBase(this)); } } diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui index b5dda006b..c1fe3f0ed 100644 --- a/kcontrol/smartcard/smartcardbase.ui +++ b/kcontrol/smartcard/smartcardbase.ui @@ -4,7 +4,7 @@ SmartcardBase - + 0 0 @@ -74,7 +74,7 @@ Fixed - + 15 20 @@ -118,7 +118,7 @@ Expanding - + 20 20 @@ -231,7 +231,7 @@ TextLabel2 - + 10 20 @@ -250,7 +250,7 @@ To add new readers you have to modify /etc/readers.conf file and re-start pcscd - + WordBreak|AlignVCenter @@ -305,6 +305,6 @@ kdialog.h - - + + diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index 518052675..b4df94d96 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -4,7 +4,7 @@ SMServerConfigDlg - + 0 0 @@ -15,7 +15,7 @@ Session Manager - + @@ -190,7 +190,7 @@ Expanding - + 20 130 @@ -243,6 +243,6 @@ configChanged() - - + + diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index a7ed79b46..c0972f520 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/kcontrol/spellchecking/spellchecking.cpp @@ -34,13 +34,13 @@ K_EXPORT_COMPONENT_FACTORY (kcm_spellchecking, SpellFactory("kcmspellchecking") KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &): KCModule(SpellFactory::instance(), parent, name) { - TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQGroupBox *box = new TQVGroupBox( i18n("Spell Checking Settings"), this ); - box->layout()->setSpacing( KDialog::spacingHint() ); - layout->addWidget(box); + box->tqlayout()->setSpacing( KDialog::spacingHint() ); + tqlayout->addWidget(box); spellConfig = new KSpellConfig(box, 0L ,0L, false ); - layout->addStretch(1); + tqlayout->addStretch(1); connect(spellConfig,TQT_SIGNAL(configChanged()), TQT_SLOT( changed() )); setQuickHelp( i18n("

    Spell Checker

    This control module allows you to configure the KDE spell checking system. You can configure:

    • which spell checking program to use
    • which types of spelling errors are identified
    • which dictionary is used by default.

    The KDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between KDE applications and non-KDE applications.

    ")); diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index f351d3f2c..a9a3e00aa 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -157,11 +157,11 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) // ----------------- gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" ); gbWidgetStyle->setColumnLayout( 0, Qt::Vertical ); - gbWidgetStyle->layout()->setMargin( KDialog::marginHint() ); - gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() ); + gbWidgetStyle->tqlayout()->setMargin( KDialog::marginHint() ); + gbWidgetStyle->tqlayout()->setSpacing( KDialog::spacingHint() ); - gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() ); - gbWidgetStyleLayout->setAlignment( Qt::AlignTop ); + gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() ); + gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop ); hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" ); @@ -169,7 +169,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) hbLayout->addWidget( cbStyle ); pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle ); - pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); + pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); pbConfigStyle->setEnabled( FALSE ); hbLayout->addWidget( pbConfigStyle ); @@ -189,11 +189,11 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 ); gbPreview->setColumnLayout( 0, Vertical ); - gbPreview->layout()->setMargin( 0 ); - gbPreview->layout()->setSpacing( KDialog::spacingHint() ); + gbPreview->tqlayout()->setMargin( 0 ); + gbPreview->tqlayout()->setSpacing( KDialog::spacingHint() ); gbPreview->setFlat( true ); stylePreview = new StylePreview( gbPreview ); - gbPreview->layout()->add( stylePreview ); + gbPreview->tqlayout()->add( stylePreview ); page1Layout->addWidget( gbWidgetStyle ); page1Layout->addWidget( gbPreview ); @@ -294,16 +294,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) box1->setSpacing( KDialog::spacingHint() ); box1->setMargin( 0 ); TQLabel* lbl = new TQLabel( i18n("0%"), box1 ); - lbl->setAlignment( AlignLeft ); + lbl->tqsetAlignment( AlignLeft ); lbl = new TQLabel( i18n("50%"), box1 ); - lbl->setAlignment( AlignHCenter ); + lbl->tqsetAlignment( AlignHCenter ); lbl = new TQLabel( i18n("100%"), box1 ); - lbl->setAlignment( AlignRight ); + lbl->tqsetAlignment( AlignRight ); lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer ); - lblMenuEffectType->setAlignment( AlignBottom | AlignLeft ); + lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft ); lblMenuOpacity = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer ); - lblMenuOpacity->setAlignment( AlignBottom | AlignLeft ); + lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft ); menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 ); menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 ); @@ -795,9 +795,9 @@ void KCMStyle::loadStyle( KConfig& config ) item = i; if ( id == cfgStyle ) // ExactMatch break; - else if ( id.contains( cfgStyle ) ) + else if ( id.tqcontains( cfgStyle ) ) break; - else if ( id.contains( TQApplication::style().className() ) ) + else if ( id.tqcontains( TQApplication::style().className() ) ) break; item = 0; } @@ -837,7 +837,7 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force) setStyleRecursive( stylePreview, style ); // this flickers, but reliably draws the widgets correctly. - stylePreview->resize( stylePreview->sizeHint() ); + stylePreview->resize( stylePreview->tqsizeHint() ); delete appliedStyle; appliedStyle = style; diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp index 0350ab969..d238efab7 100644 --- a/kcontrol/style/keramik/keramikconf.cpp +++ b/kcontrol/style/keramik/keramikconf.cpp @@ -41,17 +41,17 @@ extern "C" KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent) { //Should have no margins here, the dialog provides them - TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); + TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 0); KGlobal::locale()->insertCatalogue("kstyle_keramik_config"); //highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this); highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this); animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this); - //layout->add(highlightLineEdits); - layout->add(highlightScrollBar); - layout->add(animateProgressBar); - layout->addStretch(1); + //tqlayout->add(highlightLineEdits); + tqlayout->add(highlightScrollBar); + tqlayout->add(animateProgressBar); + tqlayout->addStretch(1); TQSettings s; //origHlLineEdit = s.readBoolEntry("/keramik/Settings/highlightLineEdits", false); diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index 112f2c241..64ca00fff 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -68,7 +68,7 @@ void MenuPreview::createPixmaps() if (pixBlended) pixBlended->resize( w, h ); - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); TQColor c1 = cg.background(); TQColor c2 = cg.mid(); @@ -96,7 +96,7 @@ void MenuPreview::createPixmaps() void MenuPreview::blendPixmaps() { - // Rebuild pixmaps, and repaint + // Rebuild pixmaps, and tqrepaint if (pixBlended && pixBackground) { if (mode == Blend && pixOverlay) { @@ -105,7 +105,7 @@ void MenuPreview::blendPixmaps() KImageEffect::blend(src, dst, menuOpacity); pixBlended->convertFromImage( dst ); } else if (mode == Tint) { - TQColor clr = colorGroup().button(); + TQColor clr = tqcolorGroup().button(); TQImage dst = pixBackground->convertToImage(); KImageEffect::blend(clr, dst, menuOpacity); pixBlended->convertFromImage( dst ); @@ -121,7 +121,7 @@ void MenuPreview::setOpacity( int opacity ) if ((int)(menuOpacity*100) != opacity) { menuOpacity = opacity/100.0; blendPixmaps(); - repaint( false ); + tqrepaint( false ); } } @@ -130,14 +130,14 @@ void MenuPreview::setPreviewMode( PreviewMode pvm ) if (mode != pvm) { mode = pvm; blendPixmaps(); - repaint( false ); + tqrepaint( false ); } } void MenuPreview::paintEvent( TQPaintEvent* /* pe */ ) { // Paint the frame and blended pixmap - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); int x2 = width()-1; int y2 = height()-1; diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui index fbb4929f2..7dcee7930 100644 --- a/kcontrol/style/stylepreview.ui +++ b/kcontrol/style/stylepreview.ui @@ -4,7 +4,7 @@ StylePreview - + 0 0 @@ -29,7 +29,7 @@ Expanding - + 20 50 @@ -161,7 +161,7 @@ - layout3 + tqlayout3 @@ -177,7 +177,7 @@ Expanding - + 40 20 @@ -196,13 +196,13 @@ 0 - + 0 0 - + 200 32767 @@ -224,13 +224,13 @@ 0 - + 0 0 - + 200 32767 @@ -250,7 +250,7 @@ Expanding - + 30 20 @@ -280,6 +280,6 @@ init() eventFilter( QObject *, QEvent * ev ) - - + + diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index a13963e09..155865440 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -121,9 +121,9 @@ TQStringList TaskbarConfig::i18nGroupModeList() TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringList&) : KCModule(TaskBarFactory::instance(), parent, name) { - TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); m_widget = new TaskbarConfigUI(this); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // TODO: Load these from .desktop files? m_appearances.append(TaskbarAppearance(i18n("Elegant"), false, false, true)); diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui index d234683ca..dda71c6c3 100644 --- a/kcontrol/taskbar/kcmtaskbarui.ui +++ b/kcontrol/taskbar/kcmtaskbarui.ui @@ -4,7 +4,7 @@ TaskbarConfigUI - + 0 0 @@ -15,7 +15,7 @@ Taskbar - + @@ -31,9 +31,9 @@ Taskbar - + - + @@ -193,7 +193,7 @@ By default, this option is selected and all windows are shown. - layout9 + tqlayout9 @@ -209,7 +209,7 @@ By default, this option is selected and all windows are shown. Expanding - + 191 20 @@ -234,7 +234,7 @@ By default, this option is selected and all windows are shown. Expanding - + 191 20 @@ -300,7 +300,7 @@ By default, this option is selected and all windows are shown. Expanding - + 191 20 @@ -319,7 +319,7 @@ By default, this option is selected and all windows are shown. Fixed - + 20 20 @@ -434,7 +434,7 @@ By default, this option is selected and all windows are shown. Expanding - + 20 20 @@ -472,8 +472,8 @@ By default, this option is selected and all windows are shown. kdialog.h - - + + kcolorbutton.h kcolorbutton.h diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index f3a5a85df..5939e5997 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/kcontrol/usbview/kcmusb.cpp @@ -39,7 +39,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &) gbox->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(gbox); - TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint()); + TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->tqlayout(), KDialog::spacingHint()); TQSplitter *splitter = new TQSplitter(gbox); vvbox->addWidget(splitter); @@ -87,12 +87,12 @@ void USBViewer::load() refresh(); } -static Q_UINT32 key( USBDevice &dev ) +static TQ_UINT32 key( USBDevice &dev ) { return dev.bus()*256 + dev.device(); } -static Q_UINT32 key_parent( USBDevice &dev ) +static TQ_UINT32 key_parent( USBDevice &dev ) { return dev.bus()*256 + dev.parent(); } @@ -130,7 +130,7 @@ void USBViewer::refresh() for ( ; it.current(); ++it) if (it.current()->level() == level) { - Q_UINT32 k = key(*it.current()); + TQ_UINT32 k = key(*it.current()); if (level == 0) { TQListViewItem *item = _items.find(k); @@ -178,7 +178,7 @@ void USBViewer::selectionChanged(TQListViewItem *item) { if (item) { - Q_UINT32 busdev = item->text(1).toUInt(); + TQ_UINT32 busdev = item->text(1).toUInt(); USBDevice *dev = USBDevice::find(busdev>>8, busdev&255); if (dev) { diff --git a/kcontrol/usbview/kcmusb.desktop b/kcontrol/usbview/kcmusb.desktop index 76729bb5d..8a0f5afb9 100644 --- a/kcontrol/usbview/kcmusb.desktop +++ b/kcontrol/usbview/kcmusb.desktop @@ -132,11 +132,11 @@ Comment[mk]=Видете ги USB-уредите закачени на овој Comment[mn]=Энэ компьютерт залгагдсан USB-төхөөрөмж харуулах Comment[ms]=Papar peranti USB yang dilekapkan pada komputer Comment[mt]=Ara l-apparat USB imqabbad ma' dal-kompjuter -Comment[nb]=Se hvilke USB-enheter som er koblet til denne maskinen +Comment[nb]=Se hvilke USB-enheter som er koblet til denne tqmaskinen Comment[nds]=de USB-Reedschappen ankieken, de dissen Reekner tokoppelt sünd Comment[ne]=यो कम्प्युटरमा सङ्लग्न गरिएका USB यन्त्र देखाउनुहोस् Comment[nl]=Hier kunt u de USB-apparaten die op deze computer zijn aangesloten bekijken -Comment[nn]=Viser USB-einingane knytte til datamaskina +Comment[nn]=Viser USB-einingane knytte til datatqmaskina Comment[nso]=Bona maano a USB ao a kgwathisitswego go computer ye Comment[pa]=ਇਸ ਕੰਪਿਊਟਰ ਨਾਲ ਜੁੜੇ USB ਜੰਤਰ ਵੇਖੋ Comment[pl]=Informacja o urządzeniach USB podłączonych do tego komputera diff --git a/kcontrol/usbview/usb.ids b/kcontrol/usbview/usb.ids index c2d3e4da9..d05480250 100644 --- a/kcontrol/usbview/usb.ids +++ b/kcontrol/usbview/usb.ids @@ -1833,8 +1833,8 @@ 0202 Apple Keyboard [ALPS] 0205 Apple Extended Keyboard [Mitsumi] 0206 Apple Extended Keyboard [Mitsumi] - 020b Apple Pro Keyboard [Mitsumi, A1048/US layout] - 020d Apple Pro Keyboard [Mitsumi, A1048/JIS layout] + 020b Apple Pro Keyboard [Mitsumi, A1048/US tqlayout] + 020d Apple Pro Keyboard [Mitsumi, A1048/JIS tqlayout] 020e Apple Internal Keyboard/Trackpad 020f Apple Internal Keyboard/Trackpad 0301 Apple USB Mouse [Mitsumi, M4848] @@ -5895,7 +5895,7 @@ HUT 0f PID Page 087 Move Destination 088 Move Length 089 PID Block Load Report - 08B Block Load Status + 08B Block Load tqStatus 08C Block Load Success 08D Block Load Full 08E Block Load Error @@ -5940,7 +5940,7 @@ HUT 14 Alphanumeric Display 02a Horizontal Scroll 02b Character Report 02c Display Data - 02d Display Status + 02d Display tqStatus 02e Stat Not Ready 02f Stat Ready 030 Err Not a loadable Character @@ -6015,8 +6015,8 @@ HUT 82 Monitor VESA Virtual Controls HUT 84 Power Device Page 000 Undefined 001 iName - 002 Present Status - 003 Changed Status + 002 Present tqStatus + 003 Changed tqStatus 004 UPS 005 Power Supply 010 Battery System @@ -6095,10 +6095,10 @@ HUT 84 Power Device Page HUT 85 Battery System Page 000 Undefined 001 SMB Battery Mode - 002 SMB Battery Status + 002 SMB Battery tqStatus 003 SMB Alarm Warning 004 SMB Charger Mode - 005 SMB Charger Status + 005 SMB Charger tqStatus 006 SMB Charger Spec Info 007 SMB Selector State 008 SMB Selector Presets @@ -6195,7 +6195,7 @@ HUT f0 Cash Device 0f1 Cash Drawer 0f2 Cash Drawer Number 0f3 Cash Drawer Set - 0f4 Cash Drawer Status + 0f4 Cash Drawer tqStatus HUT ff Vendor Specific # List of Languages diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp index 466fd9a98..8c116eb16 100644 --- a/kcontrol/usbview/usbdevices.cpp +++ b/kcontrol/usbview/usbdevices.cpp @@ -103,7 +103,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, TQString dname) TQStringList list = dir.entryList(); for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - if ((*it).contains(':')) + if ((*it).tqcontains(':')) continue; USBDevice* dev = new USBDevice(); @@ -277,7 +277,7 @@ bool USBDevice::parse(TQString fname) // read in the device infos USBDevice *device = 0; int start=0, end; - result.replace(TQRegExp("^\n"),""); + result.tqreplace(TQRegExp("^\n"),""); while ((end = result.find('\n', start)) > 0) { TQString line = result.mid(start, end-start); @@ -332,10 +332,10 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent) _bus = di.udi_bus; _device = di.udi_addr; - _product = TQString::fromLatin1(di.udi_product); + _product = TQString::tqfromLatin1(di.udi_product); if ( _device == 1 ) _product += " " + TQString::number( _bus ); - _manufacturer = TQString::fromLatin1(di.udi_vendor); + _manufacturer = TQString::tqfromLatin1(di.udi_vendor); _prodID = di.udi_productNo; _vendorID = di.udi_vendorNo; _class = di.udi_class; diff --git a/kcontrol/view1394/kcmview1394.desktop b/kcontrol/view1394/kcmview1394.desktop index fb1b7ad79..ea0340e4a 100644 --- a/kcontrol/view1394/kcmview1394.desktop +++ b/kcontrol/view1394/kcmview1394.desktop @@ -122,11 +122,11 @@ Comment[mk]=Видете ги IEEE 1394 уредите закачени на о Comment[mn]=Энэ компьютерт залгагдсан IEEE 1394-төхөөрөмж харуулах Comment[ms]=Papar peranti IEEE 1394 yang dilekapkan pada komputer ini Comment[mt]=Ara l-apparat IEEE 1394 imqabbad ma' dal-kompjuter -Comment[nb]=Se hvilke IEEE 1394-enheter som er koblet til denne maskinen +Comment[nb]=Se hvilke IEEE 1394-enheter som er koblet til denne tqmaskinen Comment[nds]=De IEEE1394-Reedschappen ankieken, de dissen Reekner tokoppelt sünd Comment[ne]=यो कम्प्युटरमा सङ्लग्न गरिएका IEEE 1394 यन्त्र देखाउनुहोस् Comment[nl]=Hier kunt u de IEEE 1394-apparaten die op deze computer zijn aangesloten bekijken -Comment[nn]=Viser IEE 1394-einingane knytte til datamaskina +Comment[nn]=Viser IEE 1394-einingane knytte til datatqmaskina Comment[pa]=ਆਪਣੇ ਕੰਪਿਊਟਰ ਨਾਲ ਜੁੜੇ IEEE 1394 ਜੰਤਰ ਵੇਖੋ Comment[pl]=Informacja o urządzeniach IEEE 1394 podłączonych do tego komputera Comment[pt]=Ver os dispositivos IEEE 1394 ligados a este computador diff --git a/kcontrol/view1394/oui.db b/kcontrol/view1394/oui.db index 76f80cc84..dfe302b5b 100644 --- a/kcontrol/view1394/oui.db +++ b/kcontrol/view1394/oui.db @@ -3509,7 +3509,7 @@ 000E02 Advantech AMT Inc. 000E03 Aarohi Communications, Inc. 000E05 WIRELESS MATRIX CORP. -000E06 Team Simoco Ltd +000E06 Team Sitqmoco Ltd 000E07 Sony Ericsson Mobile Communications AB 000E08 Sipura Technology, Inc. 000E09 Shenzhen Coship Software Co.,LTD. diff --git a/kcontrol/view1394/view1394widget.ui b/kcontrol/view1394/view1394widget.ui index 5b6ba13e8..1677e9ab0 100644 --- a/kcontrol/view1394/view1394widget.ui +++ b/kcontrol/view1394/view1394widget.ui @@ -4,7 +4,7 @@ View1394Widget - + 0 0 @@ -147,7 +147,7 @@ - layout1 + tqlayout1 @@ -163,7 +163,7 @@ Expanding - + 40 20 @@ -182,5 +182,5 @@     - + diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index df9cbb6a6..a481e8f86 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -223,10 +223,10 @@ TQWidget *KCMXinerama::indicator(int dpy) { si->setFont(fnt); si->setFrameStyle(TQFrame::Panel); si->setFrameShadow(TQFrame::Plain); - si->setAlignment(Qt::AlignCenter); + si->tqsetAlignment(Qt::AlignCenter); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center()); - TQRect targetGeometry(TQPoint(0,0), si->sizeHint()); + TQRect targetGeometry(TQPoint(0,0), si->tqsizeHint()); targetGeometry.moveCenter(screenCenter); si->setGeometry(targetGeometry); si->show(); diff --git a/kcontrol/xinerama/xineramawidget.ui b/kcontrol/xinerama/xineramawidget.ui index cab732afd..d0b69c183 100644 --- a/kcontrol/xinerama/xineramawidget.ui +++ b/kcontrol/xinerama/xineramawidget.ui @@ -4,7 +4,7 @@ XineramaWidget - + 0 0 @@ -156,7 +156,7 @@ Expanding - + 431 21 @@ -165,7 +165,7 @@ - layout2 + tqlayout2 @@ -321,6 +321,6 @@ emitConfigChanged() - - + + -- cgit v1.2.3
    HHThe hour as a decimal number using a 24-hour " "clock (00-23).