summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ark/ace.cpp4
-rw-r--r--ark/ace.h1
-rw-r--r--ark/addition.ui16
-rw-r--r--ark/ar.cpp2
-rw-r--r--ark/ar.h1
-rw-r--r--ark/arch.cpp40
-rw-r--r--ark/arch.h37
-rw-r--r--ark/archiveformatdlg.cpp10
-rw-r--r--ark/archiveformatdlg.h3
-rw-r--r--ark/archiveformatinfo.cpp22
-rw-r--r--ark/archiveformatinfo.h2
-rw-r--r--ark/ark_part.cpp50
-rw-r--r--ark/ark_part.h9
-rw-r--r--ark/arkapp.cpp6
-rw-r--r--ark/arkapp.h3
-rw-r--r--ark/arkfactory.cpp6
-rw-r--r--ark/arkfactory.h4
-rw-r--r--ark/arkutils.cpp8
-rw-r--r--ark/arkviewer.cpp14
-rw-r--r--ark/arkviewer.h3
-rw-r--r--ark/arkwidget.cpp90
-rw-r--r--ark/arkwidget.h11
-rw-r--r--ark/compressedfile.cpp16
-rw-r--r--ark/compressedfile.h1
-rw-r--r--ark/extraction.ui16
-rw-r--r--ark/extractiondialog.cpp22
-rw-r--r--ark/extractiondialog.h5
-rw-r--r--ark/filelistview.cpp80
-rw-r--r--ark/filelistview.h7
-rw-r--r--ark/general.ui18
-rw-r--r--ark/lha.cpp8
-rw-r--r--ark/lha.h1
-rw-r--r--ark/mainwindow.cpp38
-rw-r--r--ark/mainwindow.h11
-rw-r--r--ark/rar.cpp8
-rw-r--r--ark/rar.h1
-rw-r--r--ark/searchbar.cpp8
-rw-r--r--ark/searchbar.h3
-rw-r--r--ark/sevenzip.cpp18
-rw-r--r--ark/sevenzip.h1
-rw-r--r--ark/tar.cpp18
-rw-r--r--ark/tar.h1
-rw-r--r--ark/tarlistingthread.cpp12
-rw-r--r--ark/tarlistingthread.h14
-rw-r--r--ark/zip.cpp6
-rw-r--r--ark/zip.h1
-rw-r--r--ark/zoo.cpp6
-rw-r--r--ark/zoo.h1
-rw-r--r--charselectapplet/charselectapplet.cpp44
-rw-r--r--charselectapplet/charselectapplet.h13
-rw-r--r--kcalc/colors.ui30
-rw-r--r--kcalc/constants.ui68
-rw-r--r--kcalc/dlabel.cpp6
-rw-r--r--kcalc/dlabel.h3
-rw-r--r--kcalc/general.ui30
-rw-r--r--kcalc/kcalc.cpp188
-rw-r--r--kcalc/kcalc.h17
-rw-r--r--kcalc/kcalc_button.cpp20
-rw-r--r--kcalc/kcalc_button.h16
-rw-r--r--kcalc/kcalc_const_button.cpp8
-rw-r--r--kcalc/kcalc_const_button.h7
-rw-r--r--kcalc/kcalc_const_menu.cpp4
-rw-r--r--kcalc/kcalc_const_menu.h8
-rw-r--r--kcalc/kcalc_core.cpp4
-rw-r--r--kcalc/kcalc_core.h2
-rw-r--r--kcalc/kcalcdisplay.cpp36
-rw-r--r--kcalc/kcalcdisplay.h7
-rw-r--r--kcalc/kcalctype.h2
-rw-r--r--kcalc/knumber/knumber.cpp16
-rw-r--r--kcalc/knumber/knumber.h8
-rw-r--r--kcalc/knumber/knumber_priv.cpp2
-rw-r--r--kcalc/knumber/tests/knumbertest.cpp4
-rw-r--r--kcalc/stats.cpp2
-rw-r--r--kcalc/stats.h2
-rw-r--r--kcharselect/kcharselectdia.cc60
-rw-r--r--kcharselect/kcharselectdia.h3
-rw-r--r--kdelirc/irkick/irkick.cpp16
-rw-r--r--kdelirc/irkick/irkick.h3
-rw-r--r--kdelirc/irkick/klircclient.cpp8
-rw-r--r--kdelirc/irkick/klircclient.h5
-rw-r--r--kdelirc/kcmlirc/addaction.cpp38
-rw-r--r--kdelirc/kcmlirc/addaction.h3
-rw-r--r--kdelirc/kcmlirc/addactionbase.ui164
-rw-r--r--kdelirc/kcmlirc/editaction.cpp8
-rw-r--r--kdelirc/kcmlirc/editaction.h3
-rw-r--r--kdelirc/kcmlirc/editactionbase.ui140
-rw-r--r--kdelirc/kcmlirc/editmode.cpp2
-rw-r--r--kdelirc/kcmlirc/editmode.h3
-rw-r--r--kdelirc/kcmlirc/editmodebase.ui40
-rw-r--r--kdelirc/kcmlirc/kcmlirc.cpp59
-rw-r--r--kdelirc/kcmlirc/kcmlirc.h14
-rw-r--r--kdelirc/kcmlirc/kcmlircbase.ui50
-rw-r--r--kdelirc/kcmlirc/kcmlircbase.ui.h6
-rw-r--r--kdelirc/kcmlirc/modeslist.cpp2
-rw-r--r--kdelirc/kcmlirc/modeslist.h3
-rw-r--r--kdelirc/kcmlirc/newmode.ui28
-rw-r--r--kdelirc/kcmlirc/newmode.ui.h2
-rw-r--r--kdelirc/kcmlirc/selectprofile.ui10
-rw-r--r--kdelirc/kdelirc/iraction.cpp2
-rw-r--r--kdelirc/kdelirc/iraction.h2
-rw-r--r--kdelirc/kdelirc/mode.cpp4
-rw-r--r--kdelirc/kdelirc/mode.h2
-rw-r--r--kdelirc/kdelirc/modes.cpp8
-rw-r--r--kdelirc/kdelirc/profileserver.cpp6
-rw-r--r--kdelirc/kdelirc/profileserver.h20
-rw-r--r--kdelirc/kdelirc/prototype.h2
-rw-r--r--kdelirc/kdelirc/remoteserver.cpp2
-rw-r--r--kdelirc/kdelirc/remoteserver.h2
-rw-r--r--kdelirc/profiles/klauncher.profile.xml8
-rw-r--r--kdelirc/profiles/konqueror.profile.xml2
-rw-r--r--kdessh/kdessh.cpp6
-rw-r--r--kdessh/sshdlg.cpp6
-rw-r--r--kdessh/sshdlg.h1
-rw-r--r--kdf/disklist.cpp74
-rw-r--r--kdf/disklist.h9
-rw-r--r--kdf/disks.cpp54
-rw-r--r--kdf/disks.h9
-rw-r--r--kdf/kcmdf.cpp8
-rw-r--r--kdf/kcmdf.h3
-rw-r--r--kdf/kconftest.cpp2
-rw-r--r--kdf/kdf.cpp10
-rw-r--r--kdf/kdf.h3
-rw-r--r--kdf/kdfconfig.cpp8
-rw-r--r--kdf/kdfconfig.h7
-rw-r--r--kdf/kdfwidget.cpp40
-rw-r--r--kdf/kdfwidget.h11
-rw-r--r--kdf/kwikdisk.cpp24
-rw-r--r--kdf/kwikdisk.h1
-rw-r--r--kdf/listview.cpp28
-rw-r--r--kdf/listview.h5
-rw-r--r--kdf/mntconfig.cpp18
-rw-r--r--kdf/mntconfig.h7
-rw-r--r--kdf/optiondialog.cpp6
-rw-r--r--kdf/optiondialog.h3
-rw-r--r--kedit/color.ui12
-rw-r--r--kedit/kedit.cpp124
-rw-r--r--kedit/kedit.h8
-rw-r--r--kedit/ktextfiledlg.cpp24
-rw-r--r--kedit/ktextfiledlg.h19
-rw-r--r--kedit/misc.ui20
-rw-r--r--kedit/misc.ui.h2
-rw-r--r--kfloppy/floppy.cpp32
-rw-r--r--kfloppy/floppy.h7
-rw-r--r--kfloppy/format.cpp118
-rw-r--r--kfloppy/format.h23
-rw-r--r--kfloppy/zip.cpp12
-rw-r--r--kfloppy/zip.h1
-rw-r--r--kgpg/adduid.ui10
-rw-r--r--kgpg/conf_decryption.ui12
-rw-r--r--kgpg/conf_encryption.ui38
-rw-r--r--kgpg/conf_encryption.ui.h2
-rw-r--r--kgpg/conf_gpg.ui30
-rw-r--r--kgpg/conf_misc.ui54
-rw-r--r--kgpg/conf_servers.ui12
-rw-r--r--kgpg/conf_ui2.ui22
-rw-r--r--kgpg/detailedconsole.cpp12
-rw-r--r--kgpg/detailedconsole.h4
-rw-r--r--kgpg/groupedit.ui12
-rw-r--r--kgpg/keyexport.ui24
-rw-r--r--kgpg/keyexport.ui.h2
-rw-r--r--kgpg/keygener.cpp12
-rw-r--r--kgpg/keygener.h3
-rw-r--r--kgpg/keyinfowidget.cpp42
-rw-r--r--kgpg/keyinfowidget.h3
-rw-r--r--kgpg/keyproperties.ui62
-rw-r--r--kgpg/keyserver.ui42
-rw-r--r--kgpg/keyservers.cpp70
-rw-r--r--kgpg/keyservers.h3
-rw-r--r--kgpg/kgpg.cpp156
-rw-r--r--kgpg/kgpg.h11
-rw-r--r--kgpg/kgpgeditor.cpp82
-rw-r--r--kgpg/kgpgeditor.h5
-rw-r--r--kgpg/kgpginterface.cpp622
-rw-r--r--kgpg/kgpginterface.h14
-rw-r--r--kgpg/kgpglibrary.cpp38
-rw-r--r--kgpg/kgpglibrary.h7
-rw-r--r--kgpg/kgpgoptions.cpp30
-rw-r--r--kgpg/kgpgoptions.h3
-rw-r--r--kgpg/kgpgrevokewidget.ui28
-rw-r--r--kgpg/kgpgrevokewidget.ui.h2
-rw-r--r--kgpg/kgpgview.cpp62
-rw-r--r--kgpg/kgpgview.h10
-rw-r--r--kgpg/kgpgwizard.ui74
-rw-r--r--kgpg/listkeys.cpp514
-rw-r--r--kgpg/listkeys.h18
-rw-r--r--kgpg/newkey.ui36
-rw-r--r--kgpg/newkey.ui.h2
-rw-r--r--kgpg/popuppublic.cpp50
-rw-r--r--kgpg/popuppublic.h5
-rw-r--r--kgpg/searchres.ui8
-rw-r--r--kgpg/sourceselect.ui18
-rw-r--r--khexedit/bitswapwidget.cc42
-rw-r--r--khexedit/bitswapwidget.h12
-rw-r--r--khexedit/chartabledialog.cc8
-rw-r--r--khexedit/chartabledialog.h3
-rw-r--r--khexedit/converterdialog.cc8
-rw-r--r--khexedit/converterdialog.h6
-rw-r--r--khexedit/dialog.cc70
-rw-r--r--khexedit/dialog.h25
-rw-r--r--khexedit/draglabel.cc16
-rw-r--r--khexedit/draglabel.h5
-rw-r--r--khexedit/exportdialog.cc32
-rw-r--r--khexedit/exportdialog.h3
-rw-r--r--khexedit/fileinfodialog.cc20
-rw-r--r--khexedit/fileinfodialog.h3
-rw-r--r--khexedit/hexbuffer.cc180
-rw-r--r--khexedit/hexbuffer.h28
-rw-r--r--khexedit/hexdrag.cc10
-rw-r--r--khexedit/hexdrag.h5
-rw-r--r--khexedit/hexeditorwidget.cc364
-rw-r--r--khexedit/hexeditorwidget.h19
-rw-r--r--khexedit/hexeditstate.h42
-rw-r--r--khexedit/hexmanagerwidget.cc44
-rw-r--r--khexedit/hexmanagerwidget.h12
-rw-r--r--khexedit/hextoolwidget.cc34
-rw-r--r--khexedit/hextoolwidget.h5
-rw-r--r--khexedit/hexvalidator.cc4
-rw-r--r--khexedit/hexvalidator.h5
-rw-r--r--khexedit/hexviewwidget.cc90
-rw-r--r--khexedit/hexviewwidget.h19
-rw-r--r--khexedit/lib/codecs/kbinarybytecodec.cpp4
-rw-r--r--khexedit/lib/codecs/kbytecodec.cpp4
-rw-r--r--khexedit/lib/codecs/kcharcodec.cpp2
-rw-r--r--khexedit/lib/codecs/kdecimalbytecodec.cpp12
-rw-r--r--khexedit/lib/codecs/kebcdic1047charcodec.cpp6
-rw-r--r--khexedit/lib/codecs/khexadecimalbytecodec.cpp8
-rw-r--r--khexedit/lib/codecs/koctalbytecodec.cpp12
-rw-r--r--khexedit/lib/codecs/ktextcharcodec.cpp14
-rw-r--r--khexedit/lib/codecs/ktextcharcodec.h4
-rw-r--r--khexedit/lib/controller/kchareditor.cpp4
-rw-r--r--khexedit/lib/controller/keditor.cpp20
-rw-r--r--khexedit/lib/controller/knavigator.cpp22
-rw-r--r--khexedit/lib/controller/ktabcontroller.cpp4
-rw-r--r--khexedit/lib/controller/kvalueeditor.cpp22
-rw-r--r--khexedit/lib/helper.h2
-rw-r--r--khexedit/lib/kbigbuffer.cpp6
-rw-r--r--khexedit/lib/kbigbuffer.h8
-rw-r--r--khexedit/lib/kbordercolumn.cpp8
-rw-r--r--khexedit/lib/kbuffercoltextexport.cpp2
-rw-r--r--khexedit/lib/kbuffercolumn.cpp26
-rw-r--r--khexedit/lib/kbuffercolumn.h8
-rw-r--r--khexedit/lib/kbuffercursor.h8
-rw-r--r--khexedit/lib/kbufferdrag.cpp16
-rw-r--r--khexedit/lib/kbufferdrag.h5
-rw-r--r--khexedit/lib/kbufferlayout.h6
-rw-r--r--khexedit/lib/kbufferranges.h2
-rw-r--r--khexedit/lib/kbytesedit.cpp4
-rw-r--r--khexedit/lib/kbytesedit.h17
-rw-r--r--khexedit/lib/kcolumnsview.cpp8
-rw-r--r--khexedit/lib/kcolumnsview.h7
-rw-r--r--khexedit/lib/kcursor.h2
-rw-r--r--khexedit/lib/kdatabuffer.cpp4
-rw-r--r--khexedit/lib/kdatabuffer.h14
-rw-r--r--khexedit/lib/kfixedsizebuffer.cpp10
-rw-r--r--khexedit/lib/kfixedsizebuffer.h6
-rw-r--r--khexedit/lib/khechar.h2
-rw-r--r--khexedit/lib/khexedit.cpp120
-rw-r--r--khexedit/lib/khexedit.h57
-rw-r--r--khexedit/lib/koffsetcolumn.cpp8
-rw-r--r--khexedit/lib/koffsetcolumn.h2
-rw-r--r--khexedit/lib/kplainbuffer.cpp8
-rw-r--r--khexedit/lib/kplainbuffer.h8
-rw-r--r--khexedit/lib/kvaluecolumn.cpp4
-rw-r--r--khexedit/lib/kwrappingrobuffer.cpp2
-rw-r--r--khexedit/lib/kwrappingrobuffer.h6
-rw-r--r--khexedit/listview.cc16
-rw-r--r--khexedit/listview.h5
-rw-r--r--khexedit/optiondialog.cc74
-rw-r--r--khexedit/optiondialog.h16
-rw-r--r--khexedit/parts/kbytesedit/kbyteseditwidget.cpp8
-rw-r--r--khexedit/parts/kbytesedit/kbyteseditwidget.h9
-rw-r--r--khexedit/parts/kpart/khebrowserextension.h1
-rw-r--r--khexedit/parts/kpart/khepart.cpp8
-rw-r--r--khexedit/parts/kpart/khepart.h1
-rw-r--r--khexedit/parts/kpart/khepartfactory.h5
-rw-r--r--khexedit/printdialogpage.cc26
-rw-r--r--khexedit/printdialogpage.h3
-rw-r--r--khexedit/searchbar.cc12
-rw-r--r--khexedit/searchbar.h5
-rw-r--r--khexedit/statusbarprogress.cc50
-rw-r--r--khexedit/statusbarprogress.h17
-rw-r--r--khexedit/stringdialog.cc16
-rw-r--r--khexedit/stringdialog.h3
-rw-r--r--khexedit/toplevel.cc280
-rw-r--r--khexedit/toplevel.h9
-rw-r--r--kjots/CHANGES14
-rw-r--r--kjots/KJotsMain.cpp112
-rw-r--r--kjots/KJotsMain.h3
-rw-r--r--kjots/confpagefont.ui4
-rw-r--r--kjots/confpagemisc.ui16
-rw-r--r--kjots/kjotsbookmarks.cpp6
-rw-r--r--kjots/kjotsbookmarks.h3
-rw-r--r--kjots/kjotsedit.cpp10
-rw-r--r--kjots/kjotsedit.h5
-rw-r--r--kjots/kjotsentry.cpp118
-rw-r--r--kjots/kjotsentry.h13
-rw-r--r--klaptopdaemon/Makefile.am3
-rw-r--r--klaptopdaemon/acpi.cpp22
-rw-r--r--klaptopdaemon/acpi.h5
-rw-r--r--klaptopdaemon/acpi_helper.cpp2
-rw-r--r--klaptopdaemon/apm.cpp36
-rw-r--r--klaptopdaemon/apm.h5
-rw-r--r--klaptopdaemon/battery.cpp38
-rw-r--r--klaptopdaemon/battery.h5
-rw-r--r--klaptopdaemon/buttons.cpp14
-rw-r--r--klaptopdaemon/buttons.h5
-rw-r--r--klaptopdaemon/checkcrc.h2
-rw-r--r--klaptopdaemon/daemon_state.cpp6
-rw-r--r--klaptopdaemon/daemon_state.h8
-rw-r--r--klaptopdaemon/daemondock.cpp82
-rw-r--r--klaptopdaemon/daemondock.h7
-rw-r--r--klaptopdaemon/kpcmcia.cpp22
-rw-r--r--klaptopdaemon/kpcmcia.h3
-rw-r--r--klaptopdaemon/kpcmciainfo.cpp68
-rw-r--r--klaptopdaemon/kpcmciainfo.h10
-rw-r--r--klaptopdaemon/krichtextlabel.cpp24
-rw-r--r--klaptopdaemon/krichtextlabel.h13
-rw-r--r--klaptopdaemon/laptop_daemon.cpp6
-rw-r--r--klaptopdaemon/laptop_daemon.h3
-rw-r--r--klaptopdaemon/linux/bulkmem.h32
-rw-r--r--klaptopdaemon/linux/ciscode.h10
-rw-r--r--klaptopdaemon/linux/cisreg.h12
-rw-r--r--klaptopdaemon/linux/cistpl.h8
-rw-r--r--klaptopdaemon/linux/cs.h66
-rw-r--r--klaptopdaemon/linux/k_compat.h10
-rw-r--r--klaptopdaemon/linux/ss.h8
-rw-r--r--klaptopdaemon/main.cpp78
-rw-r--r--klaptopdaemon/main.h5
-rw-r--r--klaptopdaemon/makecrc.cpp2
-rw-r--r--klaptopdaemon/pcmcia.cpp8
-rw-r--r--klaptopdaemon/pcmcia.h5
-rw-r--r--klaptopdaemon/portable.cpp164
-rw-r--r--klaptopdaemon/portable.h14
-rw-r--r--klaptopdaemon/power.cpp18
-rw-r--r--klaptopdaemon/power.h5
-rw-r--r--klaptopdaemon/profile.cpp14
-rw-r--r--klaptopdaemon/profile.h5
-rw-r--r--klaptopdaemon/sony.cpp14
-rw-r--r--klaptopdaemon/sony.h5
-rw-r--r--klaptopdaemon/warning.cpp36
-rw-r--r--klaptopdaemon/warning.h5
-rw-r--r--klaptopdaemon/xautolock.cc6
-rw-r--r--klaptopdaemon/xautolock.h3
-rw-r--r--klaptopdaemon/xautolock_diy.c28
-rw-r--r--klaptopdaemon/xautolock_engine.c18
-rw-r--r--kmilo/asus/asus.cpp4
-rw-r--r--kmilo/asus/asus.h2
-rw-r--r--kmilo/delli8k/delli8k.cpp4
-rw-r--r--kmilo/delli8k/delli8k.h2
-rw-r--r--kmilo/demo/demo.cpp4
-rw-r--r--kmilo/demo/demo.h2
-rw-r--r--kmilo/generic/generic_monitor.cpp24
-rw-r--r--kmilo/generic/generic_monitor.h5
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui44
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui.h2
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/main.cpp18
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/main.h3
-rw-r--r--kmilo/kmilo_kvaio/kmilo_kvaio.cpp6
-rw-r--r--kmilo/kmilo_kvaio/kmilo_kvaio.h5
-rw-r--r--kmilo/kmilo_kvaio/kvaio.cpp50
-rw-r--r--kmilo/kmilo_kvaio/kvaio.h15
-rw-r--r--kmilo/kmilo_kvaio/kvaiodriverinterface.cpp10
-rw-r--r--kmilo/kmilo_kvaio/kvaiodriverinterface.h9
-rw-r--r--kmilo/kmilod/defaultskin.cpp10
-rw-r--r--kmilo/kmilod/defaultskin.h1
-rw-r--r--kmilo/kmilod/defaultwidget.ui20
-rw-r--r--kmilo/kmilod/kmilod.h1
-rw-r--r--kmilo/kmilod/kmilointerface.h1
-rw-r--r--kmilo/kmilod/monitor.cpp6
-rw-r--r--kmilo/kmilod/monitor.h2
-rw-r--r--kmilo/powerbook/pb_monitor.cpp4
-rw-r--r--kmilo/powerbook/pb_monitor.h2
-rw-r--r--kmilo/powerbook2/pb_monitor.cpp8
-rw-r--r--kmilo/powerbook2/pb_monitor.h2
-rw-r--r--kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui40
-rw-r--r--kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h2
-rw-r--r--kmilo/thinkpad/kcmthinkpad/main.cpp14
-rw-r--r--kmilo/thinkpad/kcmthinkpad/main.h3
-rw-r--r--kmilo/thinkpad/thinkpad.cpp4
-rw-r--r--kmilo/thinkpad/thinkpad.h2
-rw-r--r--kregexpeditor/Comments6
-rw-r--r--kregexpeditor/KMultiFormListBox/ccp.cpp12
-rw-r--r--kregexpeditor/KMultiFormListBox/indexWindow.cpp14
-rw-r--r--kregexpeditor/KMultiFormListBox/indexWindow.h3
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp22
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h5
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp8
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h5
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp14
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox.h7
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp2
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h11
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp4
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h8
-rw-r--r--kregexpeditor/KMultiFormListBox/widgetwindow.cpp10
-rw-r--r--kregexpeditor/KMultiFormListBox/widgetwindow.h2
-rw-r--r--kregexpeditor/KMultiFormListBox/windowlistboxitem.h2
-rw-r--r--kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp112
-rw-r--r--kregexpeditor/KWidgetStreamer/kwidgetstreamer.h2
-rw-r--r--kregexpeditor/altnregexp.cpp2
-rw-r--r--kregexpeditor/altnregexp.h2
-rw-r--r--kregexpeditor/altnwidget.cpp80
-rw-r--r--kregexpeditor/altnwidget.h10
-rw-r--r--kregexpeditor/auxbuttons.cpp36
-rw-r--r--kregexpeditor/auxbuttons.h5
-rw-r--r--kregexpeditor/characterswidget.cpp56
-rw-r--r--kregexpeditor/characterswidget.h19
-rw-r--r--kregexpeditor/charselector.cpp42
-rw-r--r--kregexpeditor/charselector.h5
-rw-r--r--kregexpeditor/compoundregexp.cpp2
-rw-r--r--kregexpeditor/compoundregexp.h4
-rw-r--r--kregexpeditor/compoundwidget.cpp66
-rw-r--r--kregexpeditor/compoundwidget.h13
-rw-r--r--kregexpeditor/concregexp.cpp2
-rw-r--r--kregexpeditor/concregexp.h2
-rw-r--r--kregexpeditor/concwidget.cpp124
-rw-r--r--kregexpeditor/concwidget.h12
-rw-r--r--kregexpeditor/dcbutton.cpp6
-rw-r--r--kregexpeditor/dcbutton.h5
-rw-r--r--kregexpeditor/drag.cpp8
-rw-r--r--kregexpeditor/drag.h6
-rw-r--r--kregexpeditor/dragaccepter.cpp28
-rw-r--r--kregexpeditor/dragaccepter.h4
-rw-r--r--kregexpeditor/editorwindow.cpp48
-rw-r--r--kregexpeditor/editorwindow.h9
-rw-r--r--kregexpeditor/emacsregexpconverter.cpp48
-rw-r--r--kregexpeditor/errormap.cpp8
-rw-r--r--kregexpeditor/gen_qregexplexer.cpp2
-rw-r--r--kregexpeditor/gen_qregexpparser.cc18
-rw-r--r--kregexpeditor/gen_qregexpparser.hh6
-rw-r--r--kregexpeditor/infopage.cpp14
-rw-r--r--kregexpeditor/infopage.h4
-rw-r--r--kregexpeditor/kregexpeditorfactory.cpp2
-rw-r--r--kregexpeditor/kregexpeditorgui.cpp40
-rw-r--r--kregexpeditor/kregexpeditorgui.h12
-rw-r--r--kregexpeditor/kregexpeditorprivate.cpp44
-rw-r--r--kregexpeditor/kregexpeditorprivate.h7
-rw-r--r--kregexpeditor/limitedcharlineedit.cpp12
-rw-r--r--kregexpeditor/limitedcharlineedit.h4
-rw-r--r--kregexpeditor/lookaheadwidget.cpp20
-rw-r--r--kregexpeditor/lookaheadwidget.h7
-rw-r--r--kregexpeditor/main.cpp10
-rw-r--r--kregexpeditor/multicontainerwidget.cpp94
-rw-r--r--kregexpeditor/multicontainerwidget.h8
-rw-r--r--kregexpeditor/myfontmetrics.cpp4
-rw-r--r--kregexpeditor/qregexpparser.y12
-rwxr-xr-xkregexpeditor/qt-only/clean4
-rw-r--r--kregexpeditor/qt-only/compat.cpp20
-rw-r--r--kregexpeditor/qt-only/compat.h30
-rw-r--r--kregexpeditor/qtregexpconverter.cpp96
-rw-r--r--kregexpeditor/qtregexpconverter.h8
-rw-r--r--kregexpeditor/qtregexphighlighter.cpp6
-rw-r--r--kregexpeditor/qtregexphighlighter.h6
-rw-r--r--kregexpeditor/regexp.cpp12
-rw-r--r--kregexpeditor/regexp.h4
-rw-r--r--kregexpeditor/regexpbuttons.cpp50
-rw-r--r--kregexpeditor/regexpbuttons.h5
-rw-r--r--kregexpeditor/regexpconverter.cpp2
-rw-r--r--kregexpeditor/regexphighlighter.h2
-rw-r--r--kregexpeditor/regexpwidget.cpp34
-rw-r--r--kregexpeditor/regexpwidget.h21
-rw-r--r--kregexpeditor/repeatregexp.cpp6
-rw-r--r--kregexpeditor/repeatwidget.cpp44
-rw-r--r--kregexpeditor/repeatwidget.h14
-rw-r--r--kregexpeditor/scrollededitorwindow.cpp8
-rw-r--r--kregexpeditor/scrollededitorwindow.h5
-rw-r--r--kregexpeditor/selectablelineedit.cpp20
-rw-r--r--kregexpeditor/selectablelineedit.h9
-rw-r--r--kregexpeditor/singlecontainerwidget.cpp16
-rw-r--r--kregexpeditor/singlecontainerwidget.h5
-rw-r--r--kregexpeditor/test-without-dl/main.cpp10
-rw-r--r--kregexpeditor/textrangeregexp.cpp4
-rw-r--r--kregexpeditor/textregexp.cpp4
-rw-r--r--kregexpeditor/textregexp.h2
-rw-r--r--kregexpeditor/textwidget.cpp34
-rw-r--r--kregexpeditor/textwidget.h9
-rw-r--r--kregexpeditor/userdefinedregexps.cpp36
-rw-r--r--kregexpeditor/userdefinedregexps.h9
-rw-r--r--kregexpeditor/util.cpp8
-rw-r--r--kregexpeditor/verifier.cpp12
-rw-r--r--kregexpeditor/verifier.h5
-rw-r--r--kregexpeditor/verifybuttons.cpp64
-rw-r--r--kregexpeditor/verifybuttons.h13
-rw-r--r--kregexpeditor/widgetfactory.cpp60
-rw-r--r--kregexpeditor/widgetfactory.h4
-rw-r--r--kregexpeditor/zerowidgets.cpp32
-rw-r--r--kregexpeditor/zerowidgets.h14
-rw-r--r--ksim/baselist.h4
-rw-r--r--ksim/generalprefs.cpp56
-rw-r--r--ksim/generalprefs.h25
-rw-r--r--ksim/ksim.cpp12
-rw-r--r--ksim/ksim.h5
-rw-r--r--ksim/ksimframe.cpp8
-rw-r--r--ksim/ksimframe.h5
-rw-r--r--ksim/ksimpref.cpp22
-rw-r--r--ksim/ksimpref.h3
-rw-r--r--ksim/ksimsysinfo.cpp44
-rw-r--r--ksim/ksimsysinfo.h3
-rw-r--r--ksim/ksimview.cpp60
-rw-r--r--ksim/ksimview.h9
-rw-r--r--ksim/library/chart.cpp56
-rw-r--r--ksim/library/chart.h17
-rw-r--r--ksim/library/common.h4
-rw-r--r--ksim/library/label.cpp60
-rw-r--r--ksim/library/label.h21
-rw-r--r--ksim/library/led.cpp42
-rw-r--r--ksim/library/led.h23
-rw-r--r--ksim/library/pluginglobal.cpp4
-rw-r--r--ksim/library/pluginloader.cpp32
-rw-r--r--ksim/library/pluginloader.h13
-rw-r--r--ksim/library/pluginmodule.cpp34
-rw-r--r--ksim/library/pluginmodule.h14
-rw-r--r--ksim/library/progress.cpp32
-rw-r--r--ksim/library/progress.h25
-rw-r--r--ksim/library/themeloader.cpp114
-rw-r--r--ksim/library/themetypes.h6
-rw-r--r--ksim/monitorprefs.cpp8
-rw-r--r--ksim/monitorprefs.h3
-rw-r--r--ksim/monitors/cpu/ksimcpu.cpp44
-rw-r--r--ksim/monitors/cpu/ksimcpu.h6
-rw-r--r--ksim/monitors/disk/ksimdisk.cpp50
-rw-r--r--ksim/monitors/disk/ksimdisk.h10
-rw-r--r--ksim/monitors/filesystem/filesystemstats.cpp2
-rw-r--r--ksim/monitors/filesystem/filesystemwidget.cpp24
-rw-r--r--ksim/monitors/filesystem/filesystemwidget.h5
-rw-r--r--ksim/monitors/filesystem/fsystemconfig.cpp22
-rw-r--r--ksim/monitors/filesystem/fsystemconfig.h3
-rw-r--r--ksim/monitors/filesystem/ksimfsystem.cpp6
-rw-r--r--ksim/monitors/filesystem/ksimfsystem.h5
-rw-r--r--ksim/monitors/i8k/ksimi8k.cpp36
-rw-r--r--ksim/monitors/i8k/ksimi8k.h6
-rw-r--r--ksim/monitors/lm_sensors/NVCtrl.c20
-rw-r--r--ksim/monitors/lm_sensors/NVCtrl.h22
-rw-r--r--ksim/monitors/lm_sensors/NVCtrlLib.h14
-rw-r--r--ksim/monitors/lm_sensors/ksimsensors.cpp4
-rw-r--r--ksim/monitors/lm_sensors/ksimsensors.h3
-rw-r--r--ksim/monitors/lm_sensors/nv_control.h10
-rw-r--r--ksim/monitors/lm_sensors/sensorbase.cpp26
-rw-r--r--ksim/monitors/lm_sensors/sensorbase.h3
-rw-r--r--ksim/monitors/lm_sensors/sensorsconfig.cpp16
-rw-r--r--ksim/monitors/lm_sensors/sensorsconfig.h3
-rw-r--r--ksim/monitors/mail/ksimmail.cpp28
-rw-r--r--ksim/monitors/mail/ksimmail.h9
-rw-r--r--ksim/monitors/net/ksimnet.cpp28
-rw-r--r--ksim/monitors/net/ksimnet.h3
-rw-r--r--ksim/monitors/net/netconfig.cpp24
-rw-r--r--ksim/monitors/net/netconfig.h5
-rw-r--r--ksim/monitors/net/netdialog.cpp16
-rw-r--r--ksim/monitors/net/netdialog.h5
-rw-r--r--ksim/monitors/snmp/browsedialog.cpp8
-rw-r--r--ksim/monitors/snmp/browsedialog.h3
-rw-r--r--ksim/monitors/snmp/browsedialogbase.ui38
-rw-r--r--ksim/monitors/snmp/chartmonitor.cpp10
-rw-r--r--ksim/monitors/snmp/chartmonitor.h7
-rw-r--r--ksim/monitors/snmp/configpage.cpp12
-rw-r--r--ksim/monitors/snmp/configpage.h23
-rw-r--r--ksim/monitors/snmp/configwidget.ui24
-rw-r--r--ksim/monitors/snmp/hostdialog.cpp18
-rw-r--r--ksim/monitors/snmp/hostdialog.h5
-rw-r--r--ksim/monitors/snmp/hostdialogbase.ui68
-rw-r--r--ksim/monitors/snmp/identifier.cpp4
-rw-r--r--ksim/monitors/snmp/labelmonitor.cpp8
-rw-r--r--ksim/monitors/snmp/labelmonitor.h3
-rw-r--r--ksim/monitors/snmp/monitor.cpp4
-rw-r--r--ksim/monitors/snmp/monitor.h5
-rw-r--r--ksim/monitors/snmp/monitorconfig.cpp16
-rw-r--r--ksim/monitors/snmp/monitorconfig.h2
-rw-r--r--ksim/monitors/snmp/monitordialog.cpp14
-rw-r--r--ksim/monitors/snmp/monitordialog.h5
-rw-r--r--ksim/monitors/snmp/monitordialogbase.ui74
-rw-r--r--ksim/monitors/snmp/probedialog.cpp6
-rw-r--r--ksim/monitors/snmp/probedialog.h3
-rw-r--r--ksim/monitors/snmp/proberesultdialog.cpp6
-rw-r--r--ksim/monitors/snmp/proberesultdialog.h3
-rw-r--r--ksim/monitors/snmp/proberesultdialogbase.ui12
-rw-r--r--ksim/monitors/snmp/session.cpp4
-rw-r--r--ksim/monitors/snmp/snmp.cpp14
-rw-r--r--ksim/monitors/snmp/value.cpp18
-rw-r--r--ksim/monitors/snmp/value.h4
-rw-r--r--ksim/monitors/snmp/value_p.h2
-rw-r--r--ksim/monitors/snmp/view.cpp4
-rw-r--r--ksim/monitors/snmp/view.h3
-rw-r--r--ksim/monitors/snmp/walker.cpp4
-rw-r--r--ksim/monitors/snmp/walker.h5
-rw-r--r--ksim/themeprefs.cpp30
-rw-r--r--ksim/themeprefs.h5
-rw-r--r--ktimer/ktimer.cpp26
-rw-r--r--ktimer/ktimer.h6
-rw-r--r--ktimer/prefwidget.ui40
-rw-r--r--kwallet/allyourbase.cpp84
-rw-r--r--kwallet/allyourbase.h22
-rw-r--r--kwallet/kbetterthankdialogbase.ui26
-rw-r--r--kwallet/kbetterthankdialogbase.ui.h2
-rw-r--r--kwallet/konfigurator/konfigurator.cpp24
-rw-r--r--kwallet/konfigurator/konfigurator.h3
-rw-r--r--kwallet/konfigurator/walletconfigwidget.ui66
-rw-r--r--kwallet/kwalleteditor.cpp136
-rw-r--r--kwallet/kwalleteditor.h5
-rw-r--r--kwallet/kwalletmanager.cpp56
-rw-r--r--kwallet/kwalletmanager.h3
-rw-r--r--kwallet/kwalletpopup.cpp14
-rw-r--r--kwallet/kwalletpopup.h3
-rw-r--r--kwallet/kwmapeditor.cpp26
-rw-r--r--kwallet/kwmapeditor.h5
-rw-r--r--kwallet/walletwidget.ui66
-rw-r--r--superkaramba/doc/faq/faq.dat2
-rw-r--r--superkaramba/doc/faq/faq.html4
-rw-r--r--superkaramba/doc/faq/faq.txt4
-rwxr-xr-xsuperkaramba/doc/python_api/make_api_doc.sh2
-rw-r--r--superkaramba/examples/api.html6
-rw-r--r--superkaramba/examples/globalMouse/extension/xcursor.c4
-rw-r--r--superkaramba/examples/globalMouse/eyes.py2
-rw-r--r--superkaramba/examples/globalMouse/eyes.theme2
-rw-r--r--superkaramba/examples/richtext/richtext.py4
-rw-r--r--superkaramba/examples/taskBar/cleanbar/cleanbar.py4
-rwxr-xr-xsuperkaramba/examples/test_all.sh2
-rw-r--r--superkaramba/examples/unicode/unicode.py6
-rw-r--r--superkaramba/src/bar.h1
-rw-r--r--superkaramba/src/clickarea.cpp4
-rw-r--r--superkaramba/src/clickarea.h1
-rw-r--r--superkaramba/src/clickmap.cpp6
-rw-r--r--superkaramba/src/clickmap.h1
-rw-r--r--superkaramba/src/config_python.cpp2
-rw-r--r--superkaramba/src/cpusensor.cpp12
-rw-r--r--superkaramba/src/cpusensor.h1
-rw-r--r--superkaramba/src/datesensor.cpp16
-rw-r--r--superkaramba/src/datesensor.h3
-rw-r--r--superkaramba/src/disksensor.cpp28
-rw-r--r--superkaramba/src/disksensor.h1
-rw-r--r--superkaramba/src/graph.h1
-rw-r--r--superkaramba/src/imagelabel.cpp16
-rw-r--r--superkaramba/src/imagelabel.h4
-rw-r--r--superkaramba/src/imagelabel_python.cpp2
-rw-r--r--superkaramba/src/input.cpp8
-rw-r--r--superkaramba/src/input.h1
-rw-r--r--superkaramba/src/input_python.cpp4
-rw-r--r--superkaramba/src/karamba.cpp88
-rw-r--r--superkaramba/src/karamba.h17
-rw-r--r--superkaramba/src/karamba_python.cpp10
-rw-r--r--superkaramba/src/karambaapp.cpp14
-rw-r--r--superkaramba/src/karambaapp.h7
-rw-r--r--superkaramba/src/karambainterface.cpp4
-rw-r--r--superkaramba/src/karambalistboxitem.h2
-rw-r--r--superkaramba/src/karambasessionmanaged.cpp6
-rw-r--r--superkaramba/src/karambasessionmanaged.h4
-rw-r--r--superkaramba/src/kwidgetlistbox.cpp6
-rw-r--r--superkaramba/src/kwidgetlistbox.h5
-rw-r--r--superkaramba/src/lineparser.h2
-rw-r--r--superkaramba/src/main.cpp6
-rw-r--r--superkaramba/src/memsensor.cpp16
-rw-r--r--superkaramba/src/memsensor.h1
-rw-r--r--superkaramba/src/menu_python.cpp6
-rw-r--r--superkaramba/src/meter.cpp2
-rw-r--r--superkaramba/src/meter.h5
-rw-r--r--superkaramba/src/meter_python.cpp12
-rw-r--r--superkaramba/src/meter_python.h2
-rw-r--r--superkaramba/src/misc_python.cpp8
-rw-r--r--superkaramba/src/misc_python.h2
-rw-r--r--superkaramba/src/networksensor.cpp14
-rw-r--r--superkaramba/src/networksensor.h1
-rw-r--r--superkaramba/src/noatunsensor.cpp16
-rw-r--r--superkaramba/src/programsensor.h1
-rw-r--r--superkaramba/src/richtextlabel.cpp8
-rw-r--r--superkaramba/src/richtextlabel.h1
-rw-r--r--superkaramba/src/rsssensor.cpp4
-rw-r--r--superkaramba/src/rsssensor.h3
-rw-r--r--superkaramba/src/sensor.h3
-rw-r--r--superkaramba/src/sensorparams.h2
-rw-r--r--superkaramba/src/sensorsensor.cpp4
-rw-r--r--superkaramba/src/sensorsensor.h1
-rw-r--r--superkaramba/src/showdesktop.h3
-rw-r--r--superkaramba/src/sklineedit.cpp10
-rw-r--r--superkaramba/src/sklineedit.h2
-rw-r--r--superkaramba/src/systemtray.cpp16
-rw-r--r--superkaramba/src/systemtray.h7
-rw-r--r--superkaramba/src/systray_python.cpp4
-rw-r--r--superkaramba/src/taskbartest.cpp2
-rw-r--r--superkaramba/src/taskmanager.cpp34
-rw-r--r--superkaramba/src/taskmanager.h65
-rw-r--r--superkaramba/src/textfield.cpp24
-rw-r--r--superkaramba/src/textfield.h6
-rw-r--r--superkaramba/src/textfilesensor.h3
-rw-r--r--superkaramba/src/textlabel.cpp26
-rw-r--r--superkaramba/src/textlabel.h5
-rw-r--r--superkaramba/src/textlabel_python.cpp2
-rw-r--r--superkaramba/src/themefile.cpp8
-rw-r--r--superkaramba/src/themelocale.cpp8
-rw-r--r--superkaramba/src/themes_layout.ui34
-rw-r--r--superkaramba/src/themesdlg.cpp32
-rw-r--r--superkaramba/src/themesdlg.h5
-rw-r--r--superkaramba/src/themewidget.cpp16
-rw-r--r--superkaramba/src/themewidget.h3
-rw-r--r--superkaramba/src/themewidget_layout.ui34
-rw-r--r--superkaramba/src/uptimesensor.cpp14
-rw-r--r--superkaramba/src/widget_python.cpp10
-rw-r--r--superkaramba/src/widget_python.h6
-rw-r--r--superkaramba/src/xmmssensor.cpp14
-rw-r--r--superkaramba/src/xmmssensor.h3
698 files changed, 7065 insertions, 6801 deletions
diff --git a/ark/ace.cpp b/ark/ace.cpp
index 0c8fb14..4ce0709 100644
--- a/ark/ace.cpp
+++ b/ark/ace.cpp
@@ -102,7 +102,7 @@ void AceArch::open()
if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
}
}
@@ -174,7 +174,7 @@ void AceArch::unarchFileInternal( )
void AceArch::catchMeIfYouCan( KProcess*, char *buffer, int buflen )
{
- TQString myBuf = TQString::fromLatin1( buffer, buflen );
+ TQString myBuf = TQString::tqfromLatin1( buffer, buflen );
kdDebug(1601) << " Wololo!: " << myBuf << endl;
}
diff --git a/ark/ace.h b/ark/ace.h
index 0f22fb1..2492961 100644
--- a/ark/ace.h
+++ b/ark/ace.h
@@ -32,6 +32,7 @@ class KProcess; // TODO: Remove me!
class AceArch : public Arch
{
Q_OBJECT
+ TQ_OBJECT
public:
AceArch( ArkWidget *, const TQString & );
virtual ~AceArch();
diff --git a/ark/addition.ui b/ark/addition.ui
index a8f51d8..8098325 100644
--- a/ark/addition.ui
+++ b/ark/addition.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>Addition</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Addition</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_replaceOnlyWithNewer</cstring>
</property>
@@ -24,7 +24,7 @@
<string>Replace old files only &amp;with newer files</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_forceMSDOS</cstring>
</property>
@@ -32,7 +32,7 @@
<string>Force &amp;MS-DOS short filenames (Zip)</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_convertLF2CRLF</cstring>
</property>
@@ -40,7 +40,7 @@
<string>Translate &amp;LF to DOS CRLF (Zip)</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_rarStoreSymlinks</cstring>
</property>
@@ -48,7 +48,7 @@
<string>&amp;Store symlinks as links (Zip, Rar)</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_rarRecurseSubdirs</cstring>
</property>
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>51</height>
@@ -75,5 +75,5 @@
</spacer>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/ark/ar.cpp b/ark/ar.cpp
index d71a2a0..3456f81 100644
--- a/ark/ar.cpp
+++ b/ark/ar.cpp
@@ -100,7 +100,7 @@ void ArArch::open()
if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
- emit sigOpen(this, false, TQString::null, 0 );
+ emit sigOpen(this, false, TQString(), 0 );
}
kdDebug(1601) << "-ArArch::open" << endl;
}
diff --git a/ark/ar.h b/ark/ar.h
index 39b2ba3..ccc7172 100644
--- a/ark/ar.h
+++ b/ark/ar.h
@@ -40,6 +40,7 @@ class ArkWidget;
class ArArch : public Arch
{
Q_OBJECT
+ TQ_OBJECT
public:
ArArch( ArkWidget *_gui,
const TQString & _fileName );
diff --git a/ark/arch.cpp b/ark/arch.cpp
index a08484c..336fe59 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -118,7 +118,7 @@ void Arch::slotOpenExited( KProcess* _kp )
return;
}
m_password = "";
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
delete _kp;
_kp = m_currentProcess = 0;
return;
@@ -140,7 +140,7 @@ void Arch::slotOpenExited( KProcess* _kp )
emit sigOpen( this, true, m_filename,
Arch::Extract | Arch::Delete | Arch::Add | Arch::View );
else
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
delete _kp;
_kp = m_currentProcess = 0;
@@ -206,7 +206,7 @@ void Arch::slotExtractExited( KProcess *_kp )
if ( !getLastShellOutput().isNull() )
{
- //getLastShellOutput() is a TQString. errorList is expecting QStringLists to show in multiple lines
+ //getLastShellOutput() is a TQString. errorList is expecting TQStringLists to show in multiple lines
TQStringList list = TQStringList::split( "\n", getLastShellOutput() );
KMessageBox::errorList( m_gui, msg, list );
clearShellOutput();
@@ -297,7 +297,7 @@ void Arch::slotReceivedTOC( KProcess*, char* data, int length )
{
processLine( m_buffer );
}
- else if ( m_buffer.find( m_headerString ) == -1 )
+ else if ( m_buffer.tqfind( m_headerString.data() ) == -1 )
{
if ( m_header_removed && !m_finished )
{
@@ -365,13 +365,13 @@ bool Arch::processLine( const TQCString &line )
: columns[ m_fixYear ];
TQString month = ( m_repairMonth >= 0 ) ?
TQString( "%1" )
- .arg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) )
+ .tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) )
: columns[ m_fixMonth ];
- TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" )
- .arg( year )
- .arg( month )
- .arg( columns[ m_fixDay ] )
- .arg( columns[ m_fixTime ] );
+ TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" )
+ .tqarg( year )
+ .tqarg( month )
+ .tqarg( columns[ m_fixDay ] )
+ .tqarg( columns[ m_fixTime ] );
columns[ m_dateCol ] = timestamp;
}
@@ -390,37 +390,37 @@ bool Arch::processLine( const TQCString &line )
Arch *Arch::archFactory( ArchType aType,
- ArkWidget *parent, const TQString &filename,
+ ArkWidget *tqparent, const TQString &filename,
const TQString &openAsMimeType )
{
switch( aType )
{
case TAR_FORMAT:
- return new TarArch( parent, filename, openAsMimeType );
+ return new TarArch( tqparent, filename, openAsMimeType );
case ZIP_FORMAT:
- return new ZipArch( parent, filename );
+ return new ZipArch( tqparent, filename );
case LHA_FORMAT:
- return new LhaArch( parent, filename );
+ return new LhaArch( tqparent, filename );
case COMPRESSED_FORMAT:
- return new CompressedFile( parent, filename, openAsMimeType );
+ return new CompressedFile( tqparent, filename, openAsMimeType );
case ZOO_FORMAT:
- return new ZooArch( parent, filename );
+ return new ZooArch( tqparent, filename );
case RAR_FORMAT:
- return new RarArch( parent, filename );
+ return new RarArch( tqparent, filename );
case AA_FORMAT:
- return new ArArch( parent, filename );
+ return new ArArch( tqparent, filename );
case SEVENZIP_FORMAT:
- return new SevenZipArch( parent, filename );
+ return new SevenZipArch( tqparent, filename );
case ACE_FORMAT:
- return new AceArch( parent, filename );
+ return new AceArch( tqparent, filename );
case UNKNOWN_FORMAT:
default:
diff --git a/ark/arch.h b/ark/arch.h
index de04260..05642fc 100644
--- a/ark/arch.h
+++ b/ark/arch.h
@@ -67,15 +67,16 @@ enum ArchType { UNKNOWN_FORMAT, ZIP_FORMAT, TAR_FORMAT, AA_FORMAT,
LHA_FORMAT, RAR_FORMAT, ZOO_FORMAT, COMPRESSED_FORMAT,
SEVENZIP_FORMAT, ACE_FORMAT };
-typedef TQValueList< QPair< TQString, Qt::AlignmentFlags > > ColumnList;
+typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList;
/**
* Pure virtual base class for archives - provides a framework as well as
* useful common functionality.
*/
-class Arch : public QObject
+class Arch : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
protected:
/**
@@ -128,7 +129,7 @@ class Arch : public QObject
// check to see if the utility exists in the PATH of the user
void verifyUtilityIsAvailable( const TQString &,
- const TQString & = TQString::null );
+ const TQString & = TQString() );
void verifyCompressUtilityIsAvailable( const TQString &utility );
@@ -146,9 +147,9 @@ class Arch : public QObject
void clearShellOutput() { m_lastShellOutput.truncate( 0 ); }
const TQString& getLastShellOutput() const { return m_lastShellOutput; }
- static Arch *archFactory( ArchType aType, ArkWidget *parent,
+ static Arch *archFactory( ArchType aType, ArkWidget *tqparent,
const TQString &filename,
- const TQString &openAsMimeType = TQString::null );
+ const TQString &openAsMimeType = TQString() );
protected slots:
void slotOpenExited( KProcess* );
@@ -204,18 +205,18 @@ class Arch : public QObject
// Columns
// don't forget to change common_texts.cpp if you change something here
-#define FILENAME_COLUMN qMakePair( i18n(" Filename "), Qt::AlignLeft )
-#define PERMISSION_COLUMN qMakePair( i18n(" Permissions "), Qt::AlignLeft )
-#define OWNER_GROUP_COLUMN qMakePair( i18n(" Owner/Group "), Qt::AlignLeft )
-#define SIZE_COLUMN qMakePair( i18n(" Size "), Qt::AlignRight )
-#define TIMESTAMP_COLUMN qMakePair( i18n(" Timestamp "), Qt::AlignRight )
-#define LINK_COLUMN qMakePair( i18n(" Link "), Qt::AlignLeft )
-#define PACKED_COLUMN qMakePair( i18n(" Size Now "), Qt::AlignRight )
-#define RATIO_COLUMN qMakePair( i18n(" Ratio "), Qt::AlignRight )
-#define CRC_COLUMN qMakePair( i18n("Cyclic Redundancy Check"," CRC "), Qt::AlignLeft )
-#define METHOD_COLUMN qMakePair( i18n(" Method "), Qt::AlignLeft )
-#define VERSION_COLUMN qMakePair( i18n(" Version "), Qt::AlignLeft )
-#define OWNER_COLUMN qMakePair( i18n(" Owner "), Qt::AlignLeft )
-#define GROUP_COLUMN qMakePair( i18n(" Group "), Qt::AlignLeft )
+#define FILENAME_COLUMN tqMakePair( i18n(" Filename "), TQt::AlignLeft )
+#define PERMISSION_COLUMN tqMakePair( i18n(" Permissions "), TQt::AlignLeft )
+#define OWNER_GROUP_COLUMN tqMakePair( i18n(" Owner/Group "), TQt::AlignLeft )
+#define SIZE_COLUMN tqMakePair( i18n(" Size "), TQt::AlignRight )
+#define TIMESTAMP_COLUMN tqMakePair( i18n(" Timestamp "), TQt::AlignRight )
+#define LINK_COLUMN tqMakePair( i18n(" Link "), TQt::AlignLeft )
+#define PACKED_COLUMN tqMakePair( i18n(" Size Now "), TQt::AlignRight )
+#define RATIO_COLUMN tqMakePair( i18n(" Ratio "), TQt::AlignRight )
+#define CRC_COLUMN tqMakePair( i18n("Cyclic Redundancy Check"," CRC "), TQt::AlignLeft )
+#define METHOD_COLUMN tqMakePair( i18n(" Method "), TQt::AlignLeft )
+#define VERSION_COLUMN tqMakePair( i18n(" Version "), TQt::AlignLeft )
+#define OWNER_COLUMN tqMakePair( i18n(" Owner "), TQt::AlignLeft )
+#define GROUP_COLUMN tqMakePair( i18n(" Group "), TQt::AlignLeft )
#endif /* ARCH_H */
diff --git a/ark/archiveformatdlg.cpp b/ark/archiveformatdlg.cpp
index 5ac942c..f9ac931 100644
--- a/ark/archiveformatdlg.cpp
+++ b/ark/archiveformatdlg.cpp
@@ -28,8 +28,8 @@
#include <tqlabel.h>
#include <tqvbox.h>
-ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * parent, const TQString & defaultType )
- :KDialogBase( parent, "archiveformatdialog", true,
+ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * tqparent, const TQString & defaultType )
+ :KDialogBase( tqparent, "archiveformatdialog", true,
i18n( "Choose Archive Format" ),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok),
m_combo( 0 )
@@ -40,12 +40,12 @@ ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * parent, const TQString & defaultT
text = i18n( "This file appears to be of type %1,\n"
"which is not a supported archive format.\n"
"In order to proceed, please choose the format\n"
- "of the file." ).arg( defaultType );
+ "of the file." ).tqarg( defaultType );
else
text = i18n( "You are about to open a file that has a non-standard extension.\n"
"Ark has detected the format: %1\n"
"If this is not correct, please choose "
- "the appropriate format." ).arg( defaultDescription );
+ "the appropriate format." ).tqarg( defaultDescription );
TQVBox * page = makeVBoxMainWidget();
@@ -56,7 +56,7 @@ ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * parent, const TQString & defaultT
TQStringList list = ArchiveFormatInfo::self()->allDescriptions();
list.sort();
m_combo->insertStringList( list );
- m_combo->setCurrentItem( list.findIndex( defaultDescription ) );
+ m_combo->setCurrentItem( list.tqfindIndex( defaultDescription ) );
}
TQString ArchiveFormatDlg::mimeType()
diff --git a/ark/archiveformatdlg.h b/ark/archiveformatdlg.h
index 6ef2302..1a1cefa 100644
--- a/ark/archiveformatdlg.h
+++ b/ark/archiveformatdlg.h
@@ -28,8 +28,9 @@
class ArchiveFormatDlg: public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ArchiveFormatDlg( TQWidget * parent, const TQString & defaultType );
+ ArchiveFormatDlg( TQWidget * tqparent, const TQString & defaultType );
TQString mimeType();
private:
diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp
index 01b84fc..ea07d6a 100644
--- a/ark/archiveformatinfo.cpp
+++ b/ark/archiveformatinfo.cpp
@@ -72,7 +72,7 @@ void ArchiveFormatInfo::buildFormatInfos()
addFormatInfo( COMPRESSED_FORMAT, "application/x-xz", ".xz" );
addFormatInfo( COMPRESSED_FORMAT, "application/x-lzop", ".lzo" );
addFormatInfo( COMPRESSED_FORMAT, "application/x-compress", ".Z" );
- find( COMPRESSED_FORMAT ).description = i18n( "Compressed File" );
+ tqfind( COMPRESSED_FORMAT ).description = i18n( "Compressed File" );
addFormatInfo( ZOO_FORMAT, "application/x-zoo", ".zoo" );
@@ -90,7 +90,7 @@ void ArchiveFormatInfo::buildFormatInfos()
void ArchiveFormatInfo::addFormatInfo( ArchType type, TQString mime, TQString stdExt )
{
- FormatInfo & info = find( type );
+ FormatInfo & info = tqfind( type );
KDesktopFile * desktopFile = new KDesktopFile( mime + ".desktop", true, "mime" );
if( !desktopFile )
@@ -146,7 +146,7 @@ TQStringList ArchiveFormatInfo::allDescriptions()
return descriptions;
}
-ArchiveFormatInfo::FormatInfo & ArchiveFormatInfo::find( ArchType type )
+ArchiveFormatInfo::FormatInfo & ArchiveFormatInfo::tqfind( ArchType type )
{
InfoList::Iterator it = m_formatInfos.begin();
for( ; it != m_formatInfos.end(); ++it )
@@ -177,7 +177,7 @@ ArchType ArchiveFormatInfo::archTypeForMimeType( const TQString & mimeType )
InfoList::Iterator it = m_formatInfos.begin();
for( ; it != m_formatInfos.end(); ++it )
{
- int index = (*it).mimeTypes.findIndex( mimeType );
+ int index = (*it).mimeTypes.tqfindIndex( mimeType );
if( index != -1 )
return (*it).type;
}
@@ -223,7 +223,7 @@ TQString ArchiveFormatInfo::findMimeType( const KURL & url )
char buffer[ 0x200 ];
dev->open( IO_ReadOnly );
- Q_LONG n = dev->readBlock( buffer, 0x200 );
+ TQ_LONG n = dev->readBlock( buffer, 0x200 );
delete dev;
if ( n == 0x200 && buffer[0] != 0 && !strncmp(buffer + 257, "ustar", 5) )
@@ -243,11 +243,11 @@ TQString ArchiveFormatInfo::mimeTypeForDescription( const TQString & description
int index;
for( ; it != m_formatInfos.end(); ++it )
{
- index = (*it).allDescriptions.findIndex( description );
+ index = (*it).allDescriptions.tqfindIndex( description );
if ( index != -1 )
return (* (*it).mimeTypes.at( index ) );
}
- return TQString::null;
+ return TQString();
}
TQString ArchiveFormatInfo::descriptionForMimeType( const TQString & mimeType )
@@ -256,11 +256,11 @@ TQString ArchiveFormatInfo::descriptionForMimeType( const TQString & mimeType )
int index;
for( ; it != m_formatInfos.end(); ++it )
{
- index = (*it).mimeTypes.findIndex( mimeType );
+ index = (*it).mimeTypes.tqfindIndex( mimeType );
if ( index != -1 )
return (* (*it).allDescriptions.at( index ) );
}
- return TQString::null;
+ return TQString();
}
TQString ArchiveFormatInfo::defaultExtension( const TQString & mimeType )
@@ -269,11 +269,11 @@ TQString ArchiveFormatInfo::defaultExtension( const TQString & mimeType )
int index;
for( ; it != m_formatInfos.end(); ++it )
{
- index = (*it).mimeTypes.findIndex( mimeType );
+ index = (*it).mimeTypes.tqfindIndex( mimeType );
if ( index != -1 )
return (* (*it).defaultExtensions.at( index ) );
}
- return TQString::null;
+ return TQString();
}
bool ArchiveFormatInfo::wasUnknownExtension()
diff --git a/ark/archiveformatinfo.h b/ark/archiveformatinfo.h
index 5ba5ef3..e1c987d 100644
--- a/ark/archiveformatinfo.h
+++ b/ark/archiveformatinfo.h
@@ -59,7 +59,7 @@ private:
enum ArchType type;
};
- FormatInfo & find ( ArchType type );
+ FormatInfo & tqfind ( ArchType type );
typedef TQValueList<FormatInfo> InfoList;
InfoList m_formatInfos;
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index 60e7ff0..62aa81e 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -63,13 +63,13 @@ KAboutData *ArkPart::createAboutData()
-ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject *parent,
+ArkPart::ArkPart( TQWidget *tqparentWidget, const char * /*widgetName*/, TQObject *tqparent,
const char *name, const TQStringList &, bool readWrite )
- : KParts::ReadWritePart(parent, name)
+ : KParts::ReadWritePart(tqparent, name)
{
kdDebug(1601)<<"ArkPart::ArkPart"<<endl;
setInstance(ArkFactory::instance());
- awidget = new ArkWidget( parentWidget, "ArkWidget" );
+ awidget = new ArkWidget( tqparentWidget, "ArkWidget" );
setWidget(awidget);
connect( awidget, TQT_SIGNAL( fixActions() ), this, TQT_SLOT( fixEnables() ) );
@@ -116,40 +116,40 @@ ArkPart::~ArkPart()
void
ArkPart::setupActions()
{
- addFileAction = new KAction(i18n("Add &File..."), "ark_addfile", 0, awidget,
+ addFileAction = new KAction(i18n("Add &File..."), "ark_addfile", 0, TQT_TQOBJECT(awidget),
TQT_SLOT(action_add()), actionCollection(), "addfile");
- addDirAction = new KAction(i18n("Add Folde&r..."), "ark_adddir", 0, awidget,
+ addDirAction = new KAction(i18n("Add Folde&r..."), "ark_adddir", 0, TQT_TQOBJECT(awidget),
TQT_SLOT(action_add_dir()), actionCollection(), "adddir");
- extractAction = new KAction(i18n("E&xtract..."), "ark_extract", 0, awidget,
+ extractAction = new KAction(i18n("E&xtract..."), "ark_extract", 0, TQT_TQOBJECT(awidget),
TQT_SLOT(action_extract()), actionCollection(), "extract");
- deleteAction = new KAction(i18n("De&lete"), "ark_delete", KShortcut(Qt::Key_Delete), awidget,
+ deleteAction = new KAction(i18n("De&lete"), "ark_delete", KShortcut(TQt::Key_Delete), TQT_TQOBJECT(awidget),
TQT_SLOT(action_delete()), actionCollection(), "delete");
- viewAction = new KAction(i18n("to view something","&View"), "ark_view", 0, awidget,
+ viewAction = new KAction(i18n("to view something","&View"), "ark_view", 0, TQT_TQOBJECT(awidget),
TQT_SLOT(action_view()), actionCollection(), "view");
- openWithAction = new KAction(i18n("&Open With..."), 0, awidget,
+ openWithAction = new KAction(i18n("&Open With..."), 0, TQT_TQOBJECT(awidget),
TQT_SLOT(slotOpenWith()), actionCollection(), "open_with");
- editAction = new KAction(i18n("Edit &With..."), 0, awidget,
+ editAction = new KAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget),
TQT_SLOT(action_edit()), actionCollection(), "edit");
- selectAllAction = KStdAction::selectAll(awidget->fileList(), TQT_SLOT(selectAll()), actionCollection(), "select_all");
+ selectAllAction = KStdAction::selectAll(TQT_TQOBJECT(awidget->fileList()), TQT_SLOT(selectAll()), actionCollection(), "select_all");
- deselectAllAction = new KAction(i18n("&Unselect All"), 0, awidget->fileList(), TQT_SLOT(unselectAll()), actionCollection(), "deselect_all");
+ deselectAllAction = new KAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all");
- invertSelectionAction = new KAction(i18n("&Invert Selection"), 0, awidget->fileList(), TQT_SLOT(invertSelection()), actionCollection(), "invert_selection");
+ invertSelectionAction = new KAction(i18n("&Invert Selection"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection");
saveAsAction = KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection());
//KStdAction::preferences(awidget, TQT_SLOT(showSettings()), actionCollection());
- ( void ) new KAction( i18n( "Configure &Ark..." ), "configure" , 0, awidget,
+ ( void ) new KAction( i18n( "Configure &Ark..." ), "configure" , 0, TQT_TQOBJECT(awidget),
TQT_SLOT( showSettings() ), actionCollection(), "options_configure_ark" );
@@ -158,7 +158,7 @@ ArkPart::setupActions()
showSearchBar->setChecked( ArkSettings::showSearchBar() );
- connect( showSearchBar, TQT_SIGNAL( toggled( bool ) ), awidget, TQT_SLOT( slotShowSearchBarToggled( bool ) ) );
+ connect( showSearchBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(awidget), TQT_SLOT( slotShowSearchBarToggled( bool ) ) );
initialEnables();
}
@@ -249,7 +249,7 @@ bool ArkPart::openFile()
url.setPath( m_file );
if( !TQFile::exists( m_file ) )
{
- emit setWindowCaption( TQString::null );
+ emit setWindowCaption( TQString() );
emit removeRecentURL( awidget->realURL() );
return false;
}
@@ -294,7 +294,7 @@ bool ArkPart::closeURL()
int res = KMessageBox::warningYesNoCancel( widget(),
i18n( "The archive \"%1\" has been modified.\n"
- "Do you want to save it?" ).arg( docName ),
+ "Do you want to save it?" ).tqarg( docName ),
i18n( "Save Archive?" ), KStdGuiItem::save(), KStdGuiItem::discard() );
switch ( res )
@@ -320,7 +320,7 @@ void ArkPart::transferStarted( KIO::Job *job )
{
m_job = job;
- m_bar->slotSetBusy( i18n( "Downloading %1..." ).arg( m_url.prettyURL() ),
+ m_bar->slotSetBusy( i18n( "Downloading %1..." ).tqarg( m_url.prettyURL() ),
(job != 0), (job != 0) );
if ( job )
@@ -372,8 +372,8 @@ void ArkPart::cancelTransfer()
}
}
-ArkBrowserExtension::ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name )
- : KParts::BrowserExtension( parent, name )
+ArkBrowserExtension::ArkBrowserExtension( KParts::ReadOnlyPart * tqparent, const char * name )
+ : KParts::BrowserExtension( tqparent, name )
{
}
@@ -382,8 +382,8 @@ void ArkBrowserExtension::slotOpenURLRequested( const KURL & url )
emit openURLRequest( url, KParts::URLArgs() );
}
-ArkStatusBarExtension::ArkStatusBarExtension( KParts::ReadWritePart * parent )
- : KParts::StatusBarExtension( parent ),
+ArkStatusBarExtension::ArkStatusBarExtension( KParts::ReadWritePart * tqparent )
+ : KParts::StatusBarExtension( tqparent ),
m_bBusy( false ),
m_pStatusLabelSelect( 0 ),
m_pStatusLabelTotal( 0 ),
@@ -411,12 +411,12 @@ void ArkStatusBarExtension::setupStatusBar()
m_pStatusLabelTotal = new KSqueezedTextLabel( statusBar(), "StatusLabelTotal" );
m_pStatusLabelTotal->setFrameStyle( TQFrame::NoFrame );
- m_pStatusLabelTotal->setAlignment( AlignRight );
+ m_pStatusLabelTotal->tqsetAlignment( AlignRight );
m_pStatusLabelTotal->setText( i18n( "Total: 0 files" ) );
m_pStatusLabelSelect = new TQLabel( statusBar(), "StatusLabelSelect" );
m_pStatusLabelSelect->setFrameStyle( TQFrame::NoFrame );
- m_pStatusLabelSelect->setAlignment( AlignLeft );
+ m_pStatusLabelSelect->tqsetAlignment( AlignLeft );
m_pStatusLabelSelect->setText(i18n( "0 files selected" ) );
m_cancelButton = new KPushButton( SmallIcon( "cancel" ), TQString(), statusBar(), "CancelButton" );
@@ -454,7 +454,7 @@ void ArkStatusBarExtension::slotSetBusy( const TQString & text, bool showCancelB
{
m_pBusyText = new TQLabel( statusBar() );
- m_pBusyText->setAlignment( AlignLeft );
+ m_pBusyText->tqsetAlignment( AlignLeft );
m_pBusyText->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
}
diff --git a/ark/ark_part.h b/ark/ark_part.h
index 2be1bd8..816ee6c 100644
--- a/ark/ark_part.h
+++ b/ark/ark_part.h
@@ -46,8 +46,9 @@ namespace KIO
class ArkBrowserExtension: public KParts::BrowserExtension
{
Q_OBJECT
+ TQ_OBJECT
public:
- ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name = 0L );
+ ArkBrowserExtension( KParts::ReadOnlyPart * tqparent, const char * name = 0L );
public slots:
void slotOpenURLRequested( const KURL & url );
};
@@ -55,8 +56,9 @@ public slots:
class ArkStatusBarExtension: public KParts::StatusBarExtension
{
Q_OBJECT
+ TQ_OBJECT
public:
- ArkStatusBarExtension( KParts::ReadWritePart * parent );
+ ArkStatusBarExtension( KParts::ReadWritePart * tqparent );
~ArkStatusBarExtension();
void setProgress( unsigned long progress );
@@ -86,8 +88,9 @@ private:
class ArkPart: public KParts::ReadWritePart
{
Q_OBJECT
+ TQ_OBJECT
public:
- ArkPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent,
+ ArkPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
const char *name, const TQStringList &, bool readWrite );
virtual ~ArkPart();
diff --git a/ark/arkapp.cpp b/ark/arkapp.cpp
index c4604e6..3085399 100644
--- a/ark/arkapp.cpp
+++ b/ark/arkapp.cpp
@@ -85,7 +85,7 @@ static TQString resolveFilename(const TQString & _arkname)
if (name.at(0) != '/')
{
// copy the path from _arkname
- int index = _arkname.findRev('/');
+ int index = _arkname.tqfindRev('/');
name = _arkname.left(index + 1) + name;
}
kdDebug(1601) << "Now resolve " << name << endl;
@@ -243,7 +243,7 @@ ArkApplication::addOpenArk(const KURL & _arkname, MainWindow *_ptr)
else
realName = _arkname.prettyURL();
openArksList.append(realName);
- m_windowsHash.replace(realName, _ptr);
+ m_windowsHash.tqreplace(realName, _ptr);
kdDebug(1601) << "Saved ptr " << _ptr << " added open ark: " << realName << endl;
}
@@ -287,7 +287,7 @@ ArkApplication::isArkOpenAlready(const KURL & _arkname)
realName = resolveFilename(_arkname.path()); // follow symlink
else
realName = _arkname.prettyURL();
- return ( openArksList.findIndex(realName) != -1 );
+ return ( openArksList.tqfindIndex(realName) != -1 );
}
#include "arkapp.moc"
diff --git a/ark/arkapp.h b/ark/arkapp.h
index 197b241..71cd573 100644
--- a/ark/arkapp.h
+++ b/ark/arkapp.h
@@ -52,6 +52,7 @@ class EqualKey
class ArkApplication : public KUniqueApplication
{
Q_OBJECT
+ TQ_OBJECT
public:
virtual int newInstance();
virtual ~ArkApplication() {}
@@ -78,7 +79,7 @@ class ArkApplication : public KUniqueApplication
ArkApplication();
private:
- TQWidget *m_mainwidget; // to be the parent of all ArkWidgets
+ TQWidget *m_mainwidget; // to be the tqparent of all ArkWidgets
int m_windowCount;
TQStringList openArksList;
diff --git a/ark/arkfactory.cpp b/ark/arkfactory.cpp
index 3e17e7a..d5dfba6 100644
--- a/ark/arkfactory.cpp
+++ b/ark/arkfactory.cpp
@@ -38,8 +38,8 @@ ArkFactory::~ArkFactory()
s_instance = 0L;
}
-KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget,
- const char *widgetName, TQObject *parent,
+KParts::Part * ArkFactory::createPartObject( TQWidget *tqparentWidget,
+ const char *widgetName, TQObject *tqparent,
const char *name, const char *classname,
const TQStringList &args )
{
@@ -49,7 +49,7 @@ KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget,
{
readWrite = true;
}
- ArkPart* obj = new ArkPart( parentWidget, widgetName, parent, name,
+ ArkPart* obj = new ArkPart( tqparentWidget, widgetName, tqparent, name,
args, readWrite );
//kdDebug( 1601 ) << "classname is: " << TQCString( classname ) << endl;
return obj;
diff --git a/ark/arkfactory.h b/ark/arkfactory.h
index 2b5514b..57bc105 100644
--- a/ark/arkfactory.h
+++ b/ark/arkfactory.h
@@ -29,8 +29,8 @@ public:
ArkFactory() : KParts::Factory() {}
virtual ~ArkFactory();
virtual KParts::Part *createPartObject(
- TQWidget *parentWidget = 0,const char *widgetName = 0,
- TQObject *parent = 0, const char *name = 0,
+ TQWidget *tqparentWidget = 0,const char *widgetName = 0,
+ TQObject *tqparent = 0, const char *name = 0,
const char *classname = "KParts::Part",
const TQStringList &args = TQStringList() );
static KInstance* instance();
diff --git a/ark/arkutils.cpp b/ark/arkutils.cpp
index bfe496c..94b5bc1 100644
--- a/ark/arkutils.cpp
+++ b/ark/arkutils.cpp
@@ -69,7 +69,7 @@
#include <klocale.h>
#include <klargefile.h>
-// Qt includes
+// TQt includes
#include <tqfile.h>
#include "arkutils.h"
@@ -101,7 +101,7 @@ TQString ArkUtils::getTimeStamp(const TQString &_month,
TQString year, timestamp;
- if (_yearOrTime.contains(":"))
+ if (_yearOrTime.tqcontains(":"))
// it has a timestamp so we have to figure out the year
{
year.sprintf("%d", ArkUtils::getYear(nMonth, thisYear, thisMonth));
@@ -147,7 +147,7 @@ int ArkUtils::getMonth(const char *strMonth)
int ArkUtils::getYear(int theMonth, int thisYear, int thisMonth)
{
- int monthDiff = QABS(thisMonth - theMonth);
+ int monthDiff = TQABS(thisMonth - theMonth);
if (monthDiff > 6)
return (thisYear - 1);
else
@@ -176,7 +176,7 @@ TQString ArkUtils::fixYear(const TQString& strYear)
return TQString::number( y );
}
else
- return TQString::null;
+ return TQString();
}
bool
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index 2f173a8..1e70ce5 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -36,11 +36,11 @@
#include <tqurl.h>
-ArkViewer::ArkViewer( TQWidget * parent, const char * name )
- : KDialogBase( parent, name, false, TQString::null, Close ), m_part( 0 )
+ArkViewer::ArkViewer( TQWidget * tqparent, const char * name )
+ : KDialogBase( tqparent, name, false, TQString(), Close ), m_part( 0 )
{
m_widget = new TQVBox( this );
- m_widget->layout()->setSpacing( 10 );
+ m_widget->tqlayout()->setSpacing( 10 );
connect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFinished() ) );
@@ -76,17 +76,17 @@ bool ArkViewer::view( const KURL& filename )
TQLabel *iconLabel = new TQLabel( header );
iconLabel->setPixmap( mimetype->pixmap( KIcon::Desktop ) );
- iconLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+ iconLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
TQVBox *headerRight = new TQVBox( header );
new TQLabel( TQString( "<qt><b>%1</b></qt>" )
- .arg( filename.fileName() ), headerRight
+ .tqarg( filename.fileName() ), headerRight
);
new TQLabel( mimetype->comment(), headerRight );
- header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum );
+ header->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum );
- m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype->name(), TQString::null, m_widget, 0, this );
+ m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype->name(), TQString(), m_widget, 0, TQT_TQOBJECT(this) );
if ( m_part )
{
diff --git a/ark/arkviewer.h b/ark/arkviewer.h
index 3720ffa..c601eab 100644
--- a/ark/arkviewer.h
+++ b/ark/arkviewer.h
@@ -28,9 +28,10 @@
class ArkViewer : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ArkViewer( TQWidget* parent = 0, const char * name = 0 );
+ ArkViewer( TQWidget* tqparent = 0, const char * name = 0 );
~ArkViewer();
bool view( const KURL& filename );
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index 4ced49a..2eb922b 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -32,7 +32,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-// Qt includes
+// TQt includes
#include <tqlayout.h>
#include <tqstringlist.h>
#include <tqlabel.h>
@@ -81,7 +81,7 @@
#include "searchbar.h"
#include "arkviewer.h"
-static void viewInExternalViewer( ArkWidget* parent, const KURL& filename )
+static void viewInExternalViewer( ArkWidget* tqparent, const KURL& filename )
{
TQString mimetype = KMimeType::findByURL( filename )->name();
bool view = true;
@@ -89,7 +89,7 @@ static void viewInExternalViewer( ArkWidget* parent, const KURL& filename )
if ( KRun::isExecutable( mimetype ) )
{
TQString text = i18n( "The file you're trying to view may be an executable. Running untrusted executables may compromise your system's security.\nAre you sure you want to run that file?" );
- view = ( KMessageBox::warningContinueCancel( parent, text, TQString::null, i18n("Run Nevertheless") ) == KMessageBox::Continue );
+ view = ( KMessageBox::warningContinueCancel( tqparent, text, TQString(), i18n("Run Nevertheless") ) == KMessageBox::Continue );
}
if ( view )
@@ -103,10 +103,10 @@ static void viewInExternalViewer( ArkWidget* parent, const KURL& filename )
//
//----------------------------------------------------------------------
-ArkWidget::ArkWidget( TQWidget *parent, const char *name )
- : TQVBox(parent, name), m_bBusy( false ), m_bBusyHold( false ),
+ArkWidget::ArkWidget( TQWidget *tqparent, const char *name )
+ : TQVBox(tqparent, name), m_bBusy( false ), m_bBusyHold( false ),
m_extractOnly( false ), m_extractRemote(false),
- m_openAsMimeType(TQString::null), m_pTempAddList(NULL),
+ m_openAsMimeType(TQString()), m_pTempAddList(NULL),
m_bArchivePopupEnabled( false ),
m_convert_tmpDir( NULL ), m_convertSuccess( false ),
m_createRealArchTmpDir( NULL ), m_extractRemoteTmpDir( NULL ),
@@ -199,7 +199,7 @@ ArkWidget::updateStatusTotals()
m_nSizeOfFiles = m_fileListView->totalSize();
TQString strInfo = i18n( "%n file %1", "%n files %1", m_nNumFiles )
- .arg( KIO::convertSize( m_nSizeOfFiles ) );
+ .tqarg( KIO::convertSize( m_nSizeOfFiles ) );
emit setStatusBarText(strInfo);
}
@@ -354,7 +354,7 @@ ArkWidget::convertSlotCreateDone( bool success )
// addFile( const TQString & baseDir, //
// const TQStringList & filesToAdd ) //
//////////////////////////////////////////////////////
- *it = TQString::fromLatin1( "file:" )+ m_convert_tmpDir->name() + *it;
+ *it = TQString::tqfromLatin1( "file:" )+ m_convert_tmpDir->name() + *it;
}
bool bOldRecVal = ArkSettings::rarRecurseSubdirs();
connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) );
@@ -431,7 +431,7 @@ ArkWidget::extractTo( const KURL & targetDirectory, const KURL & archive, bool b
{
if ( !KIO::NetAccess::mkdir( m_extractTo_targetDirectory, this ) )
{
- KMessageBox::error( 0, i18n( "Could not create the folder %1" ).arg(
+ KMessageBox::error( 0, i18n( "Could not create the folder %1" ).tqarg(
targetDirectory.prettyURL() ) );
emit request_file_quit();
return;
@@ -441,7 +441,7 @@ ArkWidget::extractTo( const KURL & targetDirectory, const KURL & archive, bool b
connect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( extractToSlotOpenDone( bool ) ) );
}
-const QString
+const TQString
ArkWidget::guessName( const KURL &archive )
{
TQString fileName = archive.fileName();
@@ -453,7 +453,7 @@ ArkWidget::guessName( const KURL &archive )
ext = (*it).remove( '*' );
if ( fileName.endsWith( ext ) )
{
- fileName = fileName.left( fileName.findRev( ext ) );
+ fileName = fileName.left( fileName.tqfindRev( ext ) );
break;
}
}
@@ -467,7 +467,7 @@ ArkWidget::extractToSlotOpenDone( bool success )
disconnect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( extractToSlotOpenDone( bool ) ) );
if ( !success )
{
- KMessageBox::error( this, i18n( "An error occurred while opening the archive %1." ).arg( m_url.prettyURL() ) );
+ KMessageBox::error( this, i18n( "An error occurred while opening the archive %1." ).tqarg( m_url.prettyURL() ) );
emit request_file_quit();
return;
}
@@ -712,7 +712,7 @@ ArkWidget::file_open(const KURL& url)
TQFileInfo fileInfo( strFile );
if ( !fileInfo.exists() )
{
- KMessageBox::error(this, i18n("The archive %1 does not exist.").arg(strFile));
+ KMessageBox::error(this, i18n("The archive %1 does not exist.").tqarg(strFile));
emit removeRecentURL( m_realURL );
return;
}
@@ -756,7 +756,7 @@ ArkWidget::getCreateFilename(const TQString & _caption,
TQString strFile;
KURL url;
- KFileDialog dlg( ":ArkSaveAsDialog", TQString::null, this, "SaveAsDialog", true );
+ KFileDialog dlg( ":ArkSaveAsDialog", TQString(), this, "SaveAsDialog", true );
dlg.setCaption( _caption );
dlg.setOperationMode( KFileDialog::Saving );
dlg.setMimeFilter( ArchiveFormatInfo::self()->supportedMimeTypes( allowCompressed ),
@@ -775,13 +775,13 @@ ArkWidget::getCreateFilename(const TQString & _caption,
strFile = url.path();
if (strFile.isEmpty())
- return TQString::null;
+ return TQString();
//the user chose to save as the current archive
//or wanted to create a new one with the same name
//no need to do anything
if (strFile == m_strArchName && m_bIsArchiveOpen)
- return TQString::null;
+ return TQString();
TQStringList extensions = dlg.currentFilterMimeType()->patterns();
TQStringList::Iterator it = extensions.begin();
@@ -809,7 +809,7 @@ ArkWidget::getCreateFilename(const TQString & _caption,
}
else if ( choice == KMessageBox::Cancel )
{
- return TQString::null;
+ return TQString();
}
else
{
@@ -821,8 +821,8 @@ ArkWidget::getCreateFilename(const TQString & _caption,
{
KMessageBox::error( this,
i18n( "You do not have permission"
- " to write to the directory %1" ).arg(url.directory() ) );
- return TQString::null;
+ " to write to the directory %1" ).tqarg(url.directory() ) );
+ return TQString();
}
} // end of while loop
@@ -957,7 +957,7 @@ ArkWidget::file_close()
if ( isArchiveOpen() )
{
closeArch();
- emit setWindowCaption( TQString::null );
+ emit setWindowCaption( TQString() );
emit removeOpenArk( m_strArchName );
updateStatusTotals();
updateStatusSelection();
@@ -968,7 +968,7 @@ ArkWidget::file_close()
closeArch();
}
- m_strArchName = TQString::null;
+ m_strArchName = TQString();
m_url = KURL();
}
@@ -984,10 +984,10 @@ ArkWidget::askToCreateRealArchive()
if (choice == KMessageBox::Yes)
{
url = getCreateFilename( i18n("Create New Archive"),
- TQString::null, false );
+ TQString(), false );
}
else
- url.setPath( TQString::null );
+ url.setPath( TQString() );
return url;
}
@@ -1096,7 +1096,7 @@ ArkWidget::action_add()
return;
}
- KFileDialog fileDlg( ":ArkAddDir", TQString::null, this, "adddlg", true );
+ KFileDialog fileDlg( ":ArkAddDir", TQString(), this, "adddlg", true );
fileDlg.setMode( KFile::Mode( KFile::Files | KFile::ExistingOnly ) );
fileDlg.setCaption(i18n("Select Files to Add"));
@@ -1204,7 +1204,7 @@ ArkWidget::toLocalFile( const KURL& url )
TQString strURL = url.prettyURL();
TQString tempfile = tmpDir();
- tempfile += strURL.right(strURL.length() - strURL.findRev("/") - 1);
+ tempfile += strURL.right(strURL.length() - strURL.tqfindRev("/") - 1);
deleteAfterUse(tempfile); // remember for deletion
KURL tempurl; tempurl.setPath( tempfile );
if( !KIO::NetAccess::dircopy(url, tempurl, this) )
@@ -1255,7 +1255,7 @@ ArkWidget::action_delete()
if ( KMessageBox::warningContinueCancelList( this,
i18n( "Do you really want to delete the selected items?" ),
list,
- TQString::null,
+ TQString(),
KStdGuiItem::del(),
"confirmDelete" )
!= KMessageBox::Continue)
@@ -1321,7 +1321,7 @@ ArkWidget::openWithSlotExtractDone( bool success )
{
KURL::List list;
list.append(m_viewURL);
- KOpenWithDlg l( list, i18n("Open with:"), TQString::null, (TQWidget*)0L);
+ KOpenWithDlg l( list, i18n("Open with:"), TQString(), (TQWidget*)0L);
if ( l.exec() )
{
KService::Ptr service = l.service();
@@ -1389,7 +1389,7 @@ ArkWidget::reportExtractFailures( const TQString & _dest, TQStringList *_list )
return redoExtraction;
}
-QStringList
+TQStringList
ArkWidget::existingFiles( const TQString & _dest, TQStringList & _list )
{
TQString strFilename, tmp;
@@ -1608,7 +1608,7 @@ ArkWidget::editStart()
KURL::List list;
// edit will be in progress until the KProcess terminates.
KOpenWithDlg l( list, i18n("Edit with:"),
- TQString::null, (TQWidget*)0L );
+ TQString(), (TQWidget*)0L );
if ( l.exec() )
{
KProcess *kp = new KProcess;
@@ -1643,10 +1643,10 @@ ArkWidget::slotEditFinished(KProcess *kp)
TQStringList::Iterator it = list.begin();
TQString filename = *it;
TQString path;
- if (filename.contains('/') > 3)
+ if (filename.tqcontains('/') > 3)
{
kdDebug(1601) << "Filename is originally: " << filename << endl;
- int i = filename.find('/', 5);
+ int i = filename.tqfind('/', 5);
path = filename.left(1+i);
kdDebug(1601) << "Changing to dir: " << path << endl;
TQDir::setCurrent(path);
@@ -1696,7 +1696,7 @@ ArkWidget::viewSlotExtractDone( bool success )
if ( !viewer->view( m_viewURL ) )
{
TQString text = i18n( "The internal viewer is not able to display this file. Would you like to view it using an external program?" );
- view = ( KMessageBox::warningYesNo( this, text, TQString::null, i18n("View Externally"), i18n("Do Not View") ) == KMessageBox::Yes );
+ view = ( KMessageBox::warningYesNo( this, text, TQString(), i18n("View Externally"), i18n("Do Not View") ) == KMessageBox::Yes );
if ( view )
viewInExternalViewer( this, m_viewURL );
@@ -1734,7 +1734,7 @@ ArkWidget::showCurrentFile()
TQString fullname = tmpDir();
fullname += name;
- if(fullname.contains("../"))
+ if(fullname.tqcontains("../"))
fullname.remove("../");
//Convert the TQString filename to KURL to escape the bad characters
@@ -1817,13 +1817,13 @@ ArkWidget::updateStatusSelection()
else if (m_nNumSelectedFiles != 1)
{
strInfo = i18n("%1 files selected %2")
- .arg(KGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0))
- .arg(KIO::convertSize(m_nSizeOfSelectedFiles));
+ .tqarg(KGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0))
+ .tqarg(KIO::convertSize(m_nSizeOfSelectedFiles));
}
else
{
strInfo = i18n("1 file selected %2")
- .arg(KIO::convertSize(m_nSizeOfSelectedFiles));
+ .tqarg(KIO::convertSize(m_nSizeOfSelectedFiles));
}
emit setStatusBarSelectedFiles(strInfo);
@@ -1896,7 +1896,7 @@ ArkWidget::dropAction( TQStringList & list )
// one or open it as the new current archive
int nRet = KMessageBox::warningYesNoCancel(this,
i18n("Do you wish to add this to the current archive or open it as a new archive?"),
- TQString::null,
+ TQString(),
i18n("&Add"), i18n("&Open"));
if (KMessageBox::Yes == nRet) // add it
{
@@ -1954,7 +1954,7 @@ ArkWidget::dropAction( TQStringList & list )
str = (list.count() > 1)
? i18n("There is no archive currently open. Do you wish to create one now for these files?")
: i18n("There is no archive currently open. Do you wish to create one now for this file?");
- int nRet = KMessageBox::warningYesNo(this, str, TQString::null, i18n("Create Archive"), i18n("Do Not Create"));
+ int nRet = KMessageBox::warningYesNo(this, str, TQString(), i18n("Create Archive"), i18n("Do Not Create"));
if (nRet == KMessageBox::Yes) // yes
{
file_new();
@@ -2044,7 +2044,7 @@ Arch * ArkWidget::getNewArchive( const TQString & _fileName, const TQString& _mi
if (!newArch->archUtilityIsAvailable())
{
- KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").arg(newArch->getArchUtility()));
+ KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").tqarg(newArch->getArchUtility()));
return NULL;
}
@@ -2128,7 +2128,7 @@ ArkWidget::openArchive( const TQString & _filename )
ArchiveFormatDlg * dlg = new ArchiveFormatDlg( this, info->findMimeType( m_url ) );
if ( !dlg->exec() == TQDialog::Accepted )
{
- emit setWindowCaption( TQString::null );
+ emit setWindowCaption( TQString() );
emit removeRecentURL( m_realURL );
delete dlg;
file_close();
@@ -2148,7 +2148,7 @@ ArkWidget::openArchive( const TQString & _filename )
if( 0 == ( newArch = Arch::archFactory( archtype, this,
_filename, m_openAsMimeType) ) )
{
- emit setWindowCaption( TQString::null );
+ emit setWindowCaption( TQString() );
emit removeRecentURL( m_realURL );
KMessageBox::error( this, i18n("Unknown archive format or corrupted archive") );
return;
@@ -2156,7 +2156,7 @@ ArkWidget::openArchive( const TQString & _filename )
if (!newArch->unarchUtilityIsAvailable())
{
- KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").arg(newArch->getUnarchUtility()));
+ KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").tqarg(newArch->getUnarchUtility()));
return;
}
@@ -2210,8 +2210,8 @@ ArkWidget::slotOpen( Arch * /* _newarch */, bool _success, const TQString & _fil
else
{
emit removeRecentURL( m_realURL );
- emit setWindowCaption( TQString::null );
- KMessageBox::error( this, i18n( "An error occurred while trying to open the archive %1" ).arg( _filename ) );
+ emit setWindowCaption( TQString() );
+ KMessageBox::error( this, i18n( "An error occurred while trying to open the archive %1" ).tqarg( _filename ) );
if ( m_extractOnly )
emit request_file_quit();
@@ -2257,7 +2257,7 @@ void ArkWidget::showSettings(){
if ( offers.isEmpty() )
genPage->kcfg_KonquerorIntegration->setEnabled( false );
else
- genPage->konqIntegrationLabel->setText( TQString::null );
+ genPage->konqIntegrationLabel->setText( TQString() );
dialog->show();
diff --git a/ark/arkwidget.h b/ark/arkwidget.h
index 529d50e..1ea203f 100644
--- a/ark/arkwidget.h
+++ b/ark/arkwidget.h
@@ -56,11 +56,12 @@ class FileListView;
class SearchBar;
-class ArkWidget : public QVBox
+class ArkWidget : public TQVBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- ArkWidget( TQWidget *parent=0, const char *name=0 );
+ ArkWidget( TQWidget *tqparent=0, const char *name=0 );
virtual ~ArkWidget();
bool isArchiveOpen() const { return m_bIsArchiveOpen; }
@@ -75,7 +76,7 @@ public:
const KURL& realURL() const { return m_realURL; }
void setRealURL( const KURL& url ) { m_realURL = url; }
- TQString tmpDir() const { return m_tmpDir ? m_tmpDir->name() : TQString::null; }
+ TQString tmpDir() const { return m_tmpDir ? m_tmpDir->name() : TQString(); }
FileListView * fileList() const { return m_fileListView; }
SearchBar * searchBar() const { return m_searchBar; }
@@ -181,9 +182,9 @@ private: // methods
void createRealArchive( const TQString &strFilename,
const TQStringList & filesToAdd = TQStringList() );
KURL getCreateFilename( const TQString & _caption,
- const TQString & _defaultMimeType = TQString::null,
+ const TQString & _defaultMimeType = TQString(),
bool allowCompressed = true,
- const TQString & _suggestedName = TQString::null );
+ const TQString & _suggestedName = TQString() );
bool reportExtractFailures(const TQString & _dest, TQStringList *_list);
TQStringList existingFiles( const TQString & _dest, TQStringList & _list );
diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp
index 65e21de..17df279 100644
--- a/ark/compressedfile.cpp
+++ b/ark/compressedfile.cpp
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <fcntl.h>
-// Qt includes
+// TQt includes
#include <tqdir.h>
// KDE includes
@@ -60,7 +60,7 @@ CompressedFile::CompressedFile( ArkWidget *_gui, const TQString & _fileName, con
m_openAsMimeType = _openAsMimeType;
kdDebug(1601) << "CompressedFile constructor" << endl;
m_tempDirectory = new KTempDir( _gui->tmpDir()
- + TQString::fromLatin1( "compressed_file_temp" ) );
+ + TQString::tqfromLatin1( "compressed_file_temp" ) );
m_tempDirectory->setAutoDelete( true );
m_tmpdir = m_tempDirectory->name();
initData();
@@ -97,8 +97,8 @@ void CompressedFile::setHeaders()
void CompressedFile::initData()
{
- m_unarchiver_program = TQString::null;
- m_archiver_program = TQString::null;
+ m_unarchiver_program = TQString();
+ m_archiver_program = TQString();
TQString mimeType;
if ( !m_openAsMimeType.isNull() )
@@ -155,7 +155,7 @@ TQString CompressedFile::extension()
TQStringList::Iterator it = m_defaultExtensions.begin();
for( ; it != m_defaultExtensions.end(); ++it )
if( m_filename.endsWith( *it ) )
- return TQString::null;
+ return TQString();
return m_defaultExtensions.first();
}
@@ -212,7 +212,7 @@ void CompressedFile::open()
if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false)
{
KMessageBox::error( 0, i18n("Could not start a subprocess.") );
- emit sigOpen(this, false, TQString::null, 0 );
+ emit sigOpen(this, false, TQString(), 0 );
}
kdDebug(1601) << "-CompressedFile::open" << endl;
@@ -235,7 +235,7 @@ void CompressedFile::slotUncompressDone(KProcess *_kp)
if ( !bSuccess )
{
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
return;
}
@@ -289,7 +289,7 @@ void CompressedFile::addFile( const TQStringList &urls )
proc.start(KProcess::Block);
m_tmpfile = file.right(file.length()
- - file.findRev("/")-1);
+ - file.tqfindRev("/")-1);
m_tmpfile = m_tmpdir + '/' + m_tmpfile;
kdDebug(1601) << "Temp file name is " << m_tmpfile << endl;
diff --git a/ark/compressedfile.h b/ark/compressedfile.h
index 99e19be..3c5ede8 100644
--- a/ark/compressedfile.h
+++ b/ark/compressedfile.h
@@ -44,6 +44,7 @@ class ArkWidget;
class CompressedFile : public Arch
{
Q_OBJECT
+ TQ_OBJECT
public:
CompressedFile( ArkWidget *_gui, const TQString & _fileName, const TQString &_openAsMimeType );
virtual ~CompressedFile();
diff --git a/ark/extraction.ui b/ark/extraction.ui
index 692692f..a8b324a 100644
--- a/ark/extraction.ui
+++ b/ark/extraction.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>Extraction</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Extraction</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_extractOverwrite</cstring>
</property>
@@ -24,7 +24,7 @@
<string>O&amp;verwrite files (Zip, Tar, Zoo, Rar)</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_preservePerms</cstring>
</property>
@@ -32,7 +32,7 @@
<string>&amp;Preserve permissions (Tar)</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_extractJunkPaths</cstring>
</property>
@@ -40,7 +40,7 @@
<string>&amp;Ignore folder names (Zip)</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_rarToLower</cstring>
</property>
@@ -48,7 +48,7 @@
<string>Convert file names to &amp;lowercase (Zip, Rar)</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_rarToUpper</cstring>
</property>
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -75,5 +75,5 @@
</spacer>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index cf95d48..87df006 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -51,36 +51,36 @@
#include "arkutils.h"
#include "settings.h"
-ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
+ExtractionDialog::ExtractionDialog( TQWidget *tqparent, const char *name,
bool enableSelected,
const KURL& defaultExtractionDir,
const TQString &prefix,
const TQString &archiveName )
- : KDialogBase( parent, name, true, i18n( "Extract" ), Ok | Cancel, Ok ),
+ : KDialogBase( tqparent, name, true, i18n( "Extract" ), Ok | Cancel, Ok ),
m_selectedButton( 0 ), m_allButton( 0 ),
m_selectedOnly( enableSelected ), m_extractionDirectory( defaultExtractionDir ),
m_defaultExtractionDir( defaultExtractionDir.prettyURL() ), m_prefix( prefix )
{
if ( !archiveName.isNull() )
{
- setCaption( i18n( "Extract Files From %1" ).arg( archiveName ) );
+ setCaption( i18n( "Extract Files From %1" ).tqarg( archiveName ) );
}
TQVBox *vbox = makeVBoxMainWidget();
TQHBox *header = new TQHBox( vbox );
- header->layout()->setSpacing( 10 );
+ header->tqlayout()->setSpacing( 10 );
TQLabel *icon = new TQLabel( header );
icon->setPixmap( DesktopIcon( "ark_extract" ) );
- icon->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+ icon->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
if ( enableSelected )
{
TQVBox *whichFiles = new TQVBox( header );
- whichFiles->layout()->setSpacing( 6 );
+ whichFiles->tqlayout()->setSpacing( 6 );
new TQLabel( TQString( "<qt><b><font size=\"+1\">%1</font></b></qt>" )
- .arg( i18n( "Extract:" ) ), whichFiles );
+ .tqarg( i18n( "Extract:" ) ), whichFiles );
TQHButtonGroup *filesGroup = new TQHButtonGroup( whichFiles );
m_selectedButton = new TQRadioButton( i18n( "Selected files only" ), filesGroup );
m_allButton = new TQRadioButton( i18n( "All files" ), filesGroup );
@@ -90,13 +90,13 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
else
{
new TQLabel( TQString( "<qt><b><font size=\"+2\">%1</font></b></qt>" )
- .arg( i18n( "Extract all files" ) ), header );
+ .tqarg( i18n( "Extract all files" ) ), header );
}
TQHBox *destDirBox = new TQHBox( vbox );
TQLabel *destFolderLabel = new TQLabel( i18n( "Destination folder: " ), destDirBox );
- destFolderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
+ destFolderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
KHistoryCombo *combobox = new KHistoryCombo( true, destDirBox );
combobox->setPixmapProvider( new KURLPixmapProvider );
@@ -111,7 +111,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
combobox->setInsertionPolicy( TQComboBox::AtTop );
m_urlRequester = new KURLRequester( combobox, destDirBox );
- m_urlRequester->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ m_urlRequester->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
m_urlRequester->setMode( KFile::Directory );
if (!defaultExtractionDir.prettyURL().isEmpty() )
@@ -145,7 +145,7 @@ void ExtractionDialog::accept()
TQFileInfo fi( p.path() );
if ( !fi.isDir() && !fi.exists() )
{
- TQString ltext = i18n( "Create folder %1?").arg(p.path());
+ TQString ltext = i18n( "Create folder %1?").tqarg(p.path());
int createDir = KMessageBox::questionYesNo( this, ltext, i18n( "Missing Folder" ) , i18n("Create Folder"), i18n("Do Not Create"));
if( createDir == 4 )
{
diff --git a/ark/extractiondialog.h b/ark/extractiondialog.h
index 6d27ae2..b881770 100644
--- a/ark/extractiondialog.h
+++ b/ark/extractiondialog.h
@@ -41,15 +41,16 @@ class KURLRequester;
class ExtractionDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructor.
*/
- ExtractionDialog( TQWidget *parent = 0, const char *name = 0,
+ ExtractionDialog( TQWidget *tqparent = 0, const char *name = 0,
bool enableSelected = true,
const KURL &defaultExtractionDir = KURL(),
const TQString &prefix = TQString(),
- const TQString &archiveName = TQString::null );
+ const TQString &archiveName = TQString() );
/**
* Destructor.
diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp
index 165b128..8036a28 100644
--- a/ark/filelistview.cpp
+++ b/ark/filelistview.cpp
@@ -26,7 +26,7 @@
*/
-// Qt includes
+// TQt includes
#include <tqpainter.h>
#include <tqwhatsthis.h>
#include <tqheader.h>
@@ -129,7 +129,7 @@ void FileLVI::setText( int column, const TQString &text )
name = name.left( name.length() - 1 );
if ( name.startsWith( "/" ) )
name = name.mid( 1 );
- int pos = name.findRev( '/' );
+ int pos = name.tqfindRev( '/' );
if ( pos != -1 )
name = name.right( name.length() - pos - 1 );
TQListViewItem::setText( column, name );
@@ -153,7 +153,7 @@ void FileLVI::setText( int column, const TQString &text )
else
m_ratio = text.toDouble();
TQListViewItem::setText( column, i18n( "Packed Ratio", "%1 %" )
- .arg(KGlobal::locale()->formatNumber( m_ratio, 1 ) )
+ .tqarg(KGlobal::locale()->formatNumber( m_ratio, 1 ) )
);
}
else if ( colName == timeStampStrCol )
@@ -162,7 +162,7 @@ void FileLVI::setText( int column, const TQString &text )
TQListViewItem::setText(column, text);
else
{
- m_timeStamp = TQDateTime::fromString( text, ISODate );
+ m_timeStamp = TQDateTime::fromString( text, Qt::ISODate );
TQListViewItem::setText( column, KGlobal::locale()->formatDateTime( m_timeStamp ) );
}
}
@@ -170,9 +170,9 @@ void FileLVI::setText( int column, const TQString &text )
TQListViewItem::setText(column, text);
}
-static FileLVI* folderLVI( KListViewItem *parent, const TQString& name )
+static FileLVI* folderLVI( KListViewItem *tqparent, const TQString& name )
{
- FileLVI *folder = new FileLVI( parent );
+ FileLVI *folder = new FileLVI( tqparent );
folder->setText( 0, name );
@@ -181,9 +181,9 @@ static FileLVI* folderLVI( KListViewItem *parent, const TQString& name )
return folder;
}
-static FileLVI* folderLVI( KListView *parent, const TQString& name )
+static FileLVI* folderLVI( KListView *tqparent, const TQString& name )
{
- FileLVI *folder = new FileLVI( parent );
+ FileLVI *folder = new FileLVI( tqparent );
folder->setText( 0, name );
folder->setPixmap( 0, KMimeType::mimeType( "inode/directory" )->pixmap( KIcon::Small ) );
return folder;
@@ -194,8 +194,8 @@ static FileLVI* folderLVI( KListView *parent, const TQString& name )
/////////////////////////////////////////////////////////////////////
-FileListView::FileListView(TQWidget *parent, const char* name)
- : KListView(parent, name)
+FileListView::FileListView(TQWidget *tqparent, const char* name)
+ : KListView(tqparent, name)
{
TQWhatsThis::add( this,
i18n( "This area is for displaying information about the files contained within an archive." )
@@ -242,7 +242,7 @@ void FileListView::removeColumn( int index )
{
for ( unsigned int i = index; i < m_columnMap.count() - 2; i++ )
{
- m_columnMap.replace( i, m_columnMap[ i + 1 ] );
+ m_columnMap.tqreplace( i, m_columnMap[ i + 1 ] );
}
m_columnMap.remove( m_columnMap[ m_columnMap.count() - 1 ] );
@@ -264,31 +264,31 @@ TQStringList FileListView::selectedFilenames()
{
if ( item->isSelected() )
{
- // If the item has children, add each child and the item
+ // If the item has tqchildren, add each child and the item
if ( item->childCount() > 0 )
{
files += item->fileName();
- files += childrenOf( item );
+ files += tqchildrenOf( item );
/* If we got here, then the logic for "going to the next item"
- * is a bit different: as we already dealt with all the children,
+ * is a bit different: as we already dealt with all the tqchildren,
* the "next item" is the next sibling of the current item, not
* its first child. If the current item has no siblings, then
- * the next item is the next sibling of its parent, and so on.
+ * the next item is the next sibling of its tqparent, and so on.
*/
FileLVI *nitem = static_cast<FileLVI*>( item->nextSibling() );
- while ( !nitem && item->parent() )
+ while ( !nitem && item->tqparent() )
{
- item = static_cast<FileLVI*>( item->parent() );
- if ( item->parent() )
- nitem = static_cast<FileLVI*>( item->parent()->nextSibling() );
+ item = static_cast<FileLVI*>( item->tqparent() );
+ if ( item->tqparent() )
+ nitem = static_cast<FileLVI*>( item->tqparent()->nextSibling() );
}
item = nitem;
continue;
}
else
{
- // If the item has no children, just add it to the list
+ // If the item has no tqchildren, just add it to the list
files += item->fileName();
}
}
@@ -331,7 +331,7 @@ bool FileListView::isSelectionEmpty()
void
FileListView::contentsMousePressEvent(TQMouseEvent *e)
{
- if( e->button()==TQMouseEvent::LeftButton )
+ if( e->button()==Qt::LeftButton )
{
m_pressed = true;
m_presspos = e->pos();
@@ -385,9 +385,9 @@ FileListView::item(const TQString& filename) const
void FileListView::addItem( const TQStringList & entries )
{
- FileLVI *flvi, *parent = findParent( entries[0] );
- if ( parent )
- flvi = new FileLVI( parent );
+ FileLVI *flvi, *tqparent = findParent( entries[0] );
+ if ( tqparent )
+ flvi = new FileLVI( tqparent );
else
flvi = new FileLVI( this );
@@ -422,7 +422,7 @@ void FileListView::setHeaders( const ColumnList& columns )
it != columns.constEnd();
++it )
{
- QPair< TQString, Qt::AlignmentFlags > pair = *it;
+ TQPair< TQString, TQt::AlignmentFlags > pair = *it;
int colnum = addColumn( pair.first );
setColumnAlignment( colnum, pair.second );
}
@@ -508,13 +508,13 @@ FileLVI* FileListView::findParent( const TQString& fullname )
name = name.left( name.length() -1 );
if ( name.startsWith( "/" ) )
name = name.mid( 1 );
- // Checks if this entry needs a parent
- if ( !name.contains( '/' ) )
+ // Checks if this entry needs a tqparent
+ if ( !name.tqcontains( '/' ) )
return static_cast< FileLVI* >( 0 );
// Get a list of ancestors
- TQString parentFullname = name.left( name.findRev( '/' ) );
- TQStringList ancestorList = TQStringList::split( '/', parentFullname );
+ TQString tqparentFullname = name.left( name.tqfindRev( '/' ) );
+ TQStringList ancestorList = TQStringList::split( '/', tqparentFullname );
// Checks if the listview contains the first item in the list of ancestors
TQListViewItem *item = firstChild();
@@ -538,8 +538,8 @@ FileLVI* FileListView::findParent( const TQString& fullname )
{
TQString name = ancestorList[0];
- FileLVI *parent = static_cast< FileLVI*>( item );
- item = parent->firstChild();
+ FileLVI *tqparent = static_cast< FileLVI*>( item );
+ item = tqparent->firstChild();
while ( item )
{
if ( item->text(0) == name )
@@ -549,7 +549,7 @@ FileLVI* FileListView::findParent( const TQString& fullname )
if ( !item )
{
- item = folderLVI( parent, name );
+ item = folderLVI( tqparent, name );
}
ancestorList.pop_front();
@@ -559,28 +559,28 @@ FileLVI* FileListView::findParent( const TQString& fullname )
return static_cast< FileLVI* >( item );
}
-TQStringList FileListView::childrenOf( FileLVI* parent )
+TQStringList FileListView::tqchildrenOf( FileLVI* tqparent )
{
- Q_ASSERT( parent );
- TQStringList children;
+ Q_ASSERT( tqparent );
+ TQStringList tqchildren;
- FileLVI *item = static_cast<FileLVI*>( parent->firstChild() );
+ FileLVI *item = static_cast<FileLVI*>( tqparent->firstChild() );
while ( item )
{
if ( item->childCount() == 0 )
{
- children += item->fileName();
+ tqchildren += item->fileName();
}
else
{
- children += item->fileName();
- children += childrenOf( item );
+ tqchildren += item->fileName();
+ tqchildren += tqchildrenOf( item );
}
item = static_cast<FileLVI*>( item->nextSibling() );
}
- return children;
+ return tqchildren;
}
#include "filelistview.moc"
diff --git a/ark/filelistview.h b/ark/filelistview.h
index 54c22c1..e2546e5 100644
--- a/ark/filelistview.h
+++ b/ark/filelistview.h
@@ -69,13 +69,14 @@ class FileLVI : public KListViewItem
TQString m_entryName;
};
-typedef TQValueList< QPair< TQString, Qt::AlignmentFlags > > ColumnList;
+typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList;
class FileListView: public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- FileListView( TQWidget *parent = 0, const char* name = 0 );
+ FileListView( TQWidget *tqparent = 0, const char* name = 0 );
FileLVI *currentItem() {return ((FileLVI *) KListView::currentItem());}
@@ -152,7 +153,7 @@ class FileListView: public KListView
private:
FileLVI* findParent( const TQString& fullname );
- TQStringList childrenOf( FileLVI* parent );
+ TQStringList tqchildrenOf( FileLVI* tqparent );
TQMap<int, columnName> m_columnMap;
bool m_pressed;
diff --git a/ark/general.ui b/ark/general.ui
index d822b4c..f782d69 100644
--- a/ark/general.ui
+++ b/ark/general.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>General</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>General</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_UseIntegratedViewer</cstring>
</property>
@@ -27,7 +27,7 @@
<string>&amp;Use integrated viewer</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_KonquerorIntegration</cstring>
</property>
@@ -35,9 +35,9 @@
<string>&amp;Enable Konqueror integration</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -53,14 +53,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>15</width>
<height>31</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>konqIntegrationLabel</cstring>
</property>
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -89,5 +89,5 @@
</spacer>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/ark/lha.cpp b/ark/lha.cpp
index 1bf3aac..d34fd51 100644
--- a/ark/lha.cpp
+++ b/ark/lha.cpp
@@ -67,7 +67,7 @@ bool LhaArch::processLine( const TQCString &line )
char columns[13][80];
char filename[4096];
- if ( line.contains( "[generic]" ) )
+ if ( line.tqcontains( "[generic]" ) )
{
sscanf( _line,
" %79[]\\[generic] %79[0-9] %79[0-9] %79[0-9.%*] %10[-a-z0-9 ] %3[A-Za-z]%1[ ]%2[0-9 ]%1[ ]%5[ 0-9:]%1[ ]%4095[^\n]",
@@ -76,7 +76,7 @@ bool LhaArch::processLine( const TQCString &line )
columns[9], filename );
strcpy( columns[1], " " );
}
- else if ( line.contains( "[MS-DOS]" ) )
+ else if ( line.tqcontains( "[MS-DOS]" ) )
{
sscanf( _line,
" %79[]\\[MS-DOS] %79[0-9] %79[0-9] %79[0-9.%*] %10[-a-z0-9 ] %3[A-Za-z]%1[ ]%2[0-9 ]%1[ ]%5[ 0-9:]%1[ ]%4095[^\n]",
@@ -103,7 +103,7 @@ bool LhaArch::processLine( const TQCString &line )
TQString file = filename;
TQString name, link;
bool bLink = false;
- int pos = file.find( " -> " );
+ int pos = file.tqfind( " -> " );
if ( pos != -1 )
{
bLink = true;
@@ -154,7 +154,7 @@ void LhaArch::open()
if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
}
}
diff --git a/ark/lha.h b/ark/lha.h
index bd0c1b0..075f7a3 100644
--- a/ark/lha.h
+++ b/ark/lha.h
@@ -38,6 +38,7 @@ class ArkWidget;
class LhaArch : public Arch
{
Q_OBJECT
+ TQ_OBJECT
public:
LhaArch( ArkWidget *, const TQString & );
virtual ~LhaArch() { }
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 5866d18..045ce1a 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -45,11 +45,11 @@
#include "archiveformatinfo.h"
#include "arkwidget.h"
-MainWindow::MainWindow( TQWidget * /*parent*/, const char *name )
+MainWindow::MainWindow( TQWidget * /*tqparent*/, const char *name )
: KParts::MainWindow(), progressDialog( 0 )
{
setXMLFile( "arkui.rc" );
- m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( "libarkpart", this, name, this, "ArkPart");
+ m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( "libarkpart", this, name, TQT_TQOBJECT(this), "ArkPart");
if (m_part )
{
//Since most of the functionality is still in ArkWidget:
@@ -109,24 +109,24 @@ MainWindow::~MainWindow()
void
MainWindow::setupActions()
{
- newWindowAction = new KAction(i18n("New &Window"), "window_new", KShortcut(), this,
+ newWindowAction = new KAction(i18n("New &Window"), "window_new", KShortcut(), TQT_TQOBJECT(this),
TQT_SLOT(file_newWindow()), actionCollection(), "new_window");
- newArchAction = KStdAction::openNew(this, TQT_SLOT(file_new()), actionCollection());
- openAction = KStdAction::open(this, TQT_SLOT(file_open()), actionCollection());
+ newArchAction = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection());
+ openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection());
- reloadAction = new KAction(i18n("Re&load"), "reload", KStdAccel::shortcut( KStdAccel::Reload ), this,
+ reloadAction = new KAction(i18n("Re&load"), "reload", KStdAccel::shortcut( KStdAccel::Reload ), TQT_TQOBJECT(this),
TQT_SLOT(file_reload()), actionCollection(), "reload_arch");
- closeAction = KStdAction::close(this, TQT_SLOT(file_close()), actionCollection(), "file_close");
+ closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection(), "file_close");
- recent = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), actionCollection());
+ recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection());
recent->loadEntries(kapp->config());
createStandardStatusBarAction();
- KStdAction::quit(this, TQT_SLOT(window_close()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection());
- KStdAction::keyBindings(this, TQT_SLOT( slotConfigureKeyBindings()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(window_close()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeyBindings()), actionCollection());
openAction->setEnabled( true );
recent->setEnabled( true );
@@ -177,7 +177,7 @@ MainWindow::file_reload()
void
MainWindow::editToolbars()
{
- saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
+ saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
KEditToolbar dlg( factory(), this );
connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
dlg.exec();
@@ -187,7 +187,7 @@ void
MainWindow::slotNewToolbarConfig()
{
createGUI( m_part );
- applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
+ applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
}
void
@@ -221,7 +221,7 @@ MainWindow::arkAlreadyOpen( const KURL & url )
window_close();
// notify the user what's going on
- KMessageBox::information(0, i18n("The archive %1 is already open and has been raised.\nNote: if the filename does not match, it only means that one of the two is a symbolic link.").arg(url.prettyURL()));
+ KMessageBox::information(0, i18n("The archive %1 is already open and has been raised.\nNote: if the filename does not match, it only means that one of the two is a symbolic link.").tqarg(url.prettyURL()));
return true;
}
return false;
@@ -262,8 +262,8 @@ MainWindow::getOpenURL( bool addOnly, const TQString & caption,
TQString filter = ArchiveFormatInfo::self()->filter();
if ( !suggestedName.isEmpty() )
{
- filter = TQString::null;
- combo->setCurrentItem( list.findIndex( ArchiveFormatInfo::self()->descriptionForMimeType(
+ filter = TQString();
+ combo->setCurrentItem( list.tqfindIndex( ArchiveFormatInfo::self()->descriptionForMimeType(
KMimeType::findByPath( suggestedName, 0, true )->name() ) ) );
}
@@ -296,7 +296,7 @@ MainWindow::getOpenURL( bool addOnly, const TQString & caption,
m_widget->setOpenAsMimeType(
ArchiveFormatInfo::self()->mimeTypeForDescription( combo->currentText() ) );
else
- m_widget->setOpenAsMimeType( TQString::null );
+ m_widget->setOpenAsMimeType( TQString() );
return url;
}
@@ -446,11 +446,11 @@ void
MainWindow::startProgressDialog( const TQString & text )
{
if ( !progressDialog )
- progressDialog = new KProgressDialog( this, "progress_dialog", TQString::null, text, false );
+ progressDialog = new KProgressDialog( this, "progress_dialog", TQString(), text, false );
else
progressDialog->setLabel( text );
-// progressDialog->setWFlags( Qt::WType_TopLevel );
+// progressDialog->setWFlags( TQt::WType_TopLevel );
progressDialog->setAllowCancel( true );
progressDialog->setPlainCaption( i18n( "Please Wait" ) );
diff --git a/ark/mainwindow.h b/ark/mainwindow.h
index 428167e..28989c0 100644
--- a/ark/mainwindow.h
+++ b/ark/mainwindow.h
@@ -41,13 +41,14 @@ class
MainWindow: public KParts::MainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
- MainWindow( TQWidget *parent=0, const char *name=0 );
+ MainWindow( TQWidget *tqparent=0, const char *name=0 );
virtual ~MainWindow();
void setExtractOnly ( bool b );
void extractTo( const KURL & targetDirectory, const KURL & archive, bool guessName );
- void addToArchive( const KURL::List & filesToAdd, const TQString & cwd = TQString::null,
+ void addToArchive( const KURL::List & filesToAdd, const TQString & cwd = TQString(),
const KURL & archive = KURL(), bool askForName = false );
public slots:
@@ -84,9 +85,9 @@ private: // methods
void newCaption(const TQString & filename);
bool arkAlreadyOpen( const KURL & url );
- KURL getOpenURL( bool addOnly = false , const TQString & caption = TQString::null,
- const TQString & startDir = TQString::null,
- const TQString & suggestedName = TQString::null );
+ KURL getOpenURL( bool addOnly = false , const TQString & caption = TQString(),
+ const TQString & startDir = TQString(),
+ const TQString & suggestedName = TQString() );
void startProgressDialog( const TQString & text );
diff --git a/ark/rar.cpp b/ark/rar.cpp
index 87f9ab4..056e6c4 100644
--- a/ark/rar.cpp
+++ b/ark/rar.cpp
@@ -90,10 +90,10 @@ RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName )
bool RarArch::processLine( const TQCString &line )
{
- TQString unicode_line;
+ TQString tqunicode_line;
TQTextCodec *codec = TQTextCodec::codecForLocale();
- unicode_line = codec->toUnicode( line );
+ tqunicode_line = codec->toUnicode( line );
if ( m_isFirstLine )
{
@@ -153,7 +153,7 @@ void RarArch::open()
if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
}
}
@@ -291,7 +291,7 @@ void RarArch::unarchFileInternal()
bool RarArch::passwordRequired()
{
- return m_lastShellOutput.findRev("password incorrect ?)")+1;
+ return m_lastShellOutput.tqfindRev("password incorrect ?)")+1;
}
void RarArch::remove( TQStringList *list )
diff --git a/ark/rar.h b/ark/rar.h
index ca64621..9176fe6 100644
--- a/ark/rar.h
+++ b/ark/rar.h
@@ -35,6 +35,7 @@ class ArkWidget;
class RarArch : public Arch
{
Q_OBJECT
+ TQ_OBJECT
public:
RarArch( ArkWidget *_gui, const TQString & _fileName );
virtual ~RarArch() {}
diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp
index 40fb522..fce4576 100644
--- a/ark/searchbar.cpp
+++ b/ark/searchbar.cpp
@@ -32,12 +32,12 @@
#include <tqapplication.h>
#include <tqvaluelist.h>
-SearchBar::SearchBar( TQWidget* parent, KActionCollection* aC, const char * name )
- : KListViewSearchLine( parent, 0, name )
+SearchBar::SearchBar( TQWidget* tqparent, KActionCollection* aC, const char * name )
+ : KListViewSearchLine( tqparent, 0, name )
{
- KAction *resetSearch = new KAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, this, TQT_SLOT( clear() ), aC, "reset_search" );
+ KAction *resetSearch = new KAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" );
- resetSearch->plug( parent );
+ resetSearch->plug( tqparent );
resetSearch->setWhatsThis( i18n( "Reset Search\n"
"Resets the search bar, so that all archive entries are shown again." ) );
}
diff --git a/ark/searchbar.h b/ark/searchbar.h
index c21b4d4..2e245ab 100644
--- a/ark/searchbar.h
+++ b/ark/searchbar.h
@@ -32,8 +32,9 @@ class KActionCollection;
class SearchBar: public KListViewSearchLine
{
Q_OBJECT
+ TQ_OBJECT
public:
- SearchBar( TQWidget* parent, KActionCollection* aC, const char * name = 0 );
+ SearchBar( TQWidget* tqparent, KActionCollection* aC, const char * name = 0 );
~SearchBar();
};
diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp
index 99170ac..2292214 100644
--- a/ark/sevenzip.cpp
+++ b/ark/sevenzip.cpp
@@ -110,7 +110,7 @@ void SevenZipArch::open()
if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
}
}
@@ -283,13 +283,13 @@ bool SevenZipArch::processLine( const TQCString& _line )
: columns[ m_fixYear ];
TQString month = ( m_repairMonth >= 0 ) ?
TQString( "%1" )
- .arg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) )
+ .tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) )
: columns[ m_fixMonth ];
- TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" )
- .arg( year )
- .arg( month )
- .arg( columns[ m_fixDay ] )
- .arg( columns[ m_fixTime ] );
+ TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" )
+ .tqarg( year )
+ .tqarg( month )
+ .tqarg( columns[ m_fixDay ] )
+ .tqarg( columns[ m_fixTime ] );
columns[ m_dateCol ] = timestamp;
}
@@ -330,11 +330,11 @@ void SevenZipArch::slotReceivedTOC( KProcess*, char* data, int length )
startChar = lfChar + 1;
// Check if the header was found
- if ( m_buffer.find( m_headerString ) != -1 )
+ if ( m_buffer.tqfind( m_headerString.data() ) != -1 )
{
if ( !m_header_removed )
{
- m_nameColumnPos = m_buffer.findRev( ' ' ) + 1;
+ m_nameColumnPos = m_buffer.tqfindRev( ' ' ) + 1;
m_header_removed = true;
}
else
diff --git a/ark/sevenzip.h b/ark/sevenzip.h
index f728768..535ea53 100644
--- a/ark/sevenzip.h
+++ b/ark/sevenzip.h
@@ -29,6 +29,7 @@
class SevenZipArch : public Arch
{
Q_OBJECT
+ TQ_OBJECT
public:
SevenZipArch( ArkWidget *, const TQString & );
virtual ~SevenZipArch();
diff --git a/ark/tar.cpp b/ark/tar.cpp
index 7de54f9..4bc6c0a 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -48,7 +48,7 @@
#include <stdio.h>
#include <stdlib.h>
-// Qt includes
+// TQt includes
#include <tqdir.h>
#include <tqregexp.h>
#include <tqeventloop.h>
@@ -106,12 +106,12 @@ TarArch::TarArch( ArkWidget *_gui,
{
compressed = true;
m_tmpDir = new KTempDir( _gui->tmpDir()
- + TQString::fromLatin1( "temp_tar" ) );
+ + TQString::tqfromLatin1( "temp_tar" ) );
m_tmpDir->setAutoDelete( true );
m_tmpDir->qDir()->cd( m_tmpDir->name() );
// build the temp file name
KTempFile *pTempFile = new KTempFile( m_tmpDir->name(),
- TQString::fromLatin1(".tar") );
+ TQString::tqfromLatin1(".tar") );
tmpfile = pTempFile->name();
delete pTempFile;
@@ -217,7 +217,7 @@ TQString TarArch::getCompressor()
if( m_fileMimeType == "application/x-tzo" )
return TQString( "lzop" );
- return TQString::null;
+ return TQString();
}
@@ -241,7 +241,7 @@ TQString TarArch::getUnCompressor()
if( m_fileMimeType == "application/x-tzo" )
return TQString( "lzop" );
- return TQString::null;
+ return TQString();
}
void
@@ -322,14 +322,14 @@ void TarArch::slotListingDone(KProcess *_kp)
if (flv!=NULL && flv->totalFiles()>0)
{
const TQString firstfile = ((FileLVI *) flv->firstChild())->fileName();
- if (list.find(TQRegExp(TQString("\\s\\./%1[/\\n]").arg(firstfile)))>=0)
+ if (list.tqfind(TQRegExp(TQString("\\s\\./%1[/\\n]").tqarg(firstfile)))>=0)
{
m_dotslash = true;
kdDebug(1601) << k_funcinfo << "archive has dot-slash" << endl;
}
else
{
- if (list.find(TQRegExp(TQString("\\s%1[/\\n]").arg(firstfile)))>=0)
+ if (list.tqfind(TQRegExp(TQString("\\s%1[/\\n]").tqarg(firstfile)))>=0)
{
// archive doesn't have dot-slash
m_dotslash = false;
@@ -418,7 +418,7 @@ void TarArch::createTmp()
if (kp->start(KProcess::NotifyOnExit, flag ) == false)
{
KMessageBox::error(0, i18n("Unable to fork a decompressor"));
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
}
}
else
@@ -772,7 +772,7 @@ void TarArch::customEvent( TQCustomEvent *ev )
m_listingThread->wait();
delete m_listingThread;
m_listingThread = 0;
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
break;
case ListingEvent::ListingFinished:
diff --git a/ark/tar.h b/ark/tar.h
index a12ad95..74f37c2 100644
--- a/ark/tar.h
+++ b/ark/tar.h
@@ -56,6 +56,7 @@ class TarListingThread;
class TarArch : public Arch
{
Q_OBJECT
+ TQ_OBJECT
public:
TarArch( ArkWidget *_gui, const TQString & _filename,
const TQString & _openAsMimeType );
diff --git a/ark/tarlistingthread.cpp b/ark/tarlistingthread.cpp
index 3045c4a..4b09bfd 100644
--- a/ark/tarlistingthread.cpp
+++ b/ark/tarlistingthread.cpp
@@ -78,8 +78,8 @@ static char *makeAccessString(mode_t mode)
return buffer;
}
-TarListingThread::TarListingThread( TQObject *parent, const TQString& filename )
- : TQThread(), m_parent( parent )
+TarListingThread::TarListingThread( TQObject *tqparent, const TQString& filename )
+ : TQThread(), m_parent( tqparent )
{
Q_ASSERT( m_parent );
m_archive = new KTar( filename );
@@ -96,7 +96,7 @@ void TarListingThread::run()
if (!m_archive->open( IO_ReadOnly ))
{
ListingEvent *ev = new ListingEvent( TQStringList(), ListingEvent::Error );
- qApp->postEvent( m_parent, ev );
+ tqApp->postEvent( m_parent, ev );
return;
}
@@ -104,7 +104,7 @@ void TarListingThread::run()
// Send an empty TQStringList in an Event to signal the listing end.
ListingEvent *ev = new ListingEvent( TQStringList(), ListingEvent::ListingFinished );
- qApp->postEvent( m_parent, ev );
+ tqApp->postEvent( m_parent, ev );
}
void TarListingThread::processDir( const KTarDirectory *tardir, const TQString & root )
@@ -144,12 +144,12 @@ void TarListingThread::processDir( const KTarDirectory *tardir, const TQString &
strSize.sprintf("%d", ((KTarFile *)tarEntry)->size());
}
col_list.append(strSize);
- TQString timestamp = tarEntry->datetime().toString(ISODate);
+ TQString timestamp = tarEntry->datetime().toString(Qt::ISODate);
col_list.append(timestamp);
col_list.append(tarEntry->symlink());
ListingEvent *ev = new ListingEvent( col_list );
- qApp->postEvent( m_parent, ev );
+ tqApp->postEvent( m_parent, ev );
// if it's a directory, process it.
// remember that name is root + / + the name of the directory
diff --git a/ark/tarlistingthread.h b/ark/tarlistingthread.h
index 25ce188..b6f1dea 100644
--- a/ark/tarlistingthread.h
+++ b/ark/tarlistingthread.h
@@ -29,25 +29,25 @@
class TQString;
class KArchive;
-class ListingEvent: public QCustomEvent
+class ListingEvent: public TQCustomEvent
{
public:
- enum Status { Normal, Error, ListingFinished };
- ListingEvent( const TQStringList& data, Status st = Normal )
+ enum tqStatus { Normal, Error, ListingFinished };
+ ListingEvent( const TQStringList& data, tqStatus st = Normal )
: TQCustomEvent( 65442 ), m_data( data ), m_status( st ) {}
const TQStringList& columns() const { return m_data; }
- Status status() const { return m_status; }
+ tqStatus status() const { return m_status; }
private:
TQStringList m_data;
- Status m_status;
+ tqStatus m_status;
};
-class TarListingThread: public QThread
+class TarListingThread: public TQThread
{
public:
- TarListingThread( TQObject *parent, const TQString& filename );
+ TarListingThread( TQObject *tqparent, const TQString& filename );
~TarListingThread();
protected:
diff --git a/ark/zip.cpp b/ark/zip.cpp
index f223016..59db0c9 100644
--- a/ark/zip.cpp
+++ b/ark/zip.cpp
@@ -26,7 +26,7 @@
*/
-// Qt includes
+// TQt includes
#include <tqdir.h>
// KDE includes
@@ -103,7 +103,7 @@ void ZipArch::open()
if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
}
}
@@ -240,7 +240,7 @@ void ZipArch::unarchFileInternal()
bool ZipArch::passwordRequired()
{
- return m_lastShellOutput.findRev("unable to get password\n")!=-1 || m_lastShellOutput.endsWith("password inflating\n") || m_lastShellOutput.findRev("password incorrect--reenter:")!=-1 || m_lastShellOutput.endsWith("incorrect password\n");
+ return m_lastShellOutput.tqfindRev("unable to get password\n")!=-1 || m_lastShellOutput.endsWith("password inflating\n") || m_lastShellOutput.tqfindRev("password incorrect--reenter:")!=-1 || m_lastShellOutput.endsWith("incorrect password\n");
}
void ZipArch::remove( TQStringList *list )
diff --git a/ark/zip.h b/ark/zip.h
index 74813a1..c6f0fe3 100644
--- a/ark/zip.h
+++ b/ark/zip.h
@@ -38,6 +38,7 @@ class ArkWidget;
class ZipArch : public Arch
{
Q_OBJECT
+ TQ_OBJECT
public:
ZipArch( ArkWidget *_gui, const TQString & _fileName );
virtual ~ZipArch() { }
diff --git a/ark/zoo.cpp b/ark/zoo.cpp
index 8896251..6f9a53e 100644
--- a/ark/zoo.cpp
+++ b/ark/zoo.cpp
@@ -120,7 +120,7 @@ void ZooArch::open()
if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
{
KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
- emit sigOpen( this, false, TQString::null, 0 );
+ emit sigOpen( this, false, TQString(), 0 );
}
}
@@ -287,9 +287,9 @@ TQString fixTime( const TQString &_strTime )
// +3 or -3 etc.
TQString strTime = _strTime;
- if ( strTime.contains("+") || strTime.contains("-") )
+ if ( strTime.tqcontains("+") || strTime.tqcontains("-") )
{
- TQCharRef c = strTime.at( 8 );
+ TQCharRef c = strTime.tqat( 8 );
int offset = strTime.right( strTime.length() - 9 ).toInt();
TQString strHour = strTime.left( 2 );
int nHour = strHour.toInt();
diff --git a/ark/zoo.h b/ark/zoo.h
index 87e1c0b..6b9538e 100644
--- a/ark/zoo.h
+++ b/ark/zoo.h
@@ -36,6 +36,7 @@ class ArkWidget;
class ZooArch : public Arch
{
Q_OBJECT
+ TQ_OBJECT
public:
ZooArch( ArkWidget *, const TQString & );
virtual ~ZooArch() { }
diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp
index 24cc55a..1ccfaf8 100644
--- a/charselectapplet/charselectapplet.cpp
+++ b/charselectapplet/charselectapplet.cpp
@@ -41,12 +41,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+ KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("kcharselectapplet");
return new CharSelectApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About | KPanelApplet::Preferences,
- parent, "kcharselectapplet");
+ tqparent, "kcharselectapplet");
}
}
@@ -55,8 +55,8 @@ static int cell_height = 16;
static int char_count = 0;
CharSelectApplet::CharSelectApplet(const TQString& configFile, Type type, int actions,
- TQWidget *parent, const char *name)
- : KPanelApplet(configFile, type, actions, parent, name),
+ TQWidget *tqparent, const char *name)
+ : KPanelApplet(configFile, type, actions, tqparent, name),
_aboutData(0), _configDialog(0)
{
// read configuration
@@ -64,9 +64,9 @@ CharSelectApplet::CharSelectApplet(const TQString& configFile, Type type, int ac
c->setGroup("General");
cell_width = c->readNumEntry("CellWidth", cell_width);
cell_height = c->readNumEntry("CellHeight", cell_height);
- TQString characters = c->readEntry("Characters", "ߩ");
+ TQString characters = c->readEntry("Characters", "������ߩ��");
- // setup layout
+ // setup tqlayout
TQHBoxLayout *_layout = new TQHBoxLayout(this);
_layout->setAutoAdd(true);
@@ -151,13 +151,13 @@ void CharSelectApplet::about()
dialog.exec();
}
-CharTable::CharTable(TQWidget* parent, const char* name)
- : TQFrame(parent, name), _rows(2), _cols(2),
+CharTable::CharTable(TQWidget* tqparent, const char* name)
+ : TQFrame(tqparent, name), _rows(2), _cols(2),
_activeRow(-1), _activeCol(-1),
_cWidth(cell_width), _cHeight(cell_height)
{
setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
- setFocusPolicy(TQWidget::NoFocus);
+ setFocusPolicy(TQ_NoFocus);
setBackgroundMode(TQWidget::NoBackground);
}
@@ -228,7 +228,7 @@ void CharTable::paintEvent(TQPaintEvent* e)
TQFrame::paintEvent(e);
}
-void CharTable::repaintCell(int r, int c)
+void CharTable::tqrepaintCell(int r, int c)
{
TQPainter p(this);
@@ -251,16 +251,16 @@ void CharTable::paintCell(TQPainter* p, int row, int col)
// draw background
if (active) {
- p->setBrush(TQBrush(colorGroup().highlight()));
+ p->setBrush(TQBrush(tqcolorGroup().highlight()));
p->setPen(NoPen);
p->drawRect(0, 0, w, h);
- p->setPen(colorGroup().highlightedText());
+ p->setPen(tqcolorGroup().highlightedText());
}
else {
- p->setBrush(TQBrush(colorGroup().base()));
+ p->setBrush(TQBrush(tqcolorGroup().base()));
p->setPen(NoPen);
p->drawRect(0, 0, w, h);
- p->setPen(colorGroup().text());
+ p->setPen(tqcolorGroup().text());
}
// set font
@@ -285,7 +285,7 @@ void CharTable::mousePressEvent(TQMouseEvent *e)
void CharTable::mouseMoveEvent(TQMouseEvent *e)
{
- if(!(e->state() & (LeftButton | RightButton | MidButton))) return;
+ if(!(e->state() & (Qt::LeftButton | Qt::RightButton | Qt::MidButton))) return;
int row = findRow(e->y());
if (row == -1) return;
@@ -307,10 +307,10 @@ void CharTable::selectCell(int row, int col)
_activeRow = row;
_activeCol = col;
- repaintCell(oldRow, oldCol);
- repaintCell(_activeRow, _activeCol);
+ tqrepaintCell(oldRow, oldCol);
+ tqrepaintCell(_activeRow, _activeCol);
- QClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
TQObject::disconnect( cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
TQString text = TQString(_map[col + row * _cols]);
bool oldMode = cb->selectionModeEnabled();
@@ -330,14 +330,14 @@ void CharTable::clearCell()
_activeRow = -1;
_activeCol = -1;
- repaintCell(oldRow, oldCol);
+ tqrepaintCell(oldRow, oldCol);
- TQObject::disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
+ TQObject::disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
}
-ConfigDialog::ConfigDialog(TQWidget* parent, const char* name)
- : KDialogBase(parent, name, true, i18n("Configuration"),
+ConfigDialog::ConfigDialog(TQWidget* tqparent, const char* name)
+ : KDialogBase(tqparent, name, true, i18n("Configuration"),
Ok | Cancel, Ok, true)
{
TQVBox *page = makeVBoxMainWidget();
diff --git a/charselectapplet/charselectapplet.h b/charselectapplet/charselectapplet.h
index b223b53..332c18c 100644
--- a/charselectapplet/charselectapplet.h
+++ b/charselectapplet/charselectapplet.h
@@ -36,9 +36,10 @@ class KAboutData;
class ConfigDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigDialog(TQWidget* parent = 0, const char* name = 0);
+ ConfigDialog(TQWidget* tqparent = 0, const char* name = 0);
void setCharacters(const TQString& s) { _characterInput->setText(s); }
void setCellWidth(int w) { _widthSpinBox->setValue(w); }
@@ -54,12 +55,13 @@ private:
KLineEdit *_characterInput;
};
-class CharTable : public QFrame
+class CharTable : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
- CharTable(TQWidget* parent = 0, const char* name = 0);
+ CharTable(TQWidget* tqparent = 0, const char* name = 0);
void setRowsAndColumns(int, int);
@@ -73,7 +75,7 @@ protected:
void mouseMoveEvent(TQMouseEvent*);
void paintCell(TQPainter*, int, int);
- void repaintCell(int, int);
+ void tqrepaintCell(int, int);
void selectCell(int row, int col);
void insertString(TQString s);
@@ -95,10 +97,11 @@ private:
class CharSelectApplet : public KPanelApplet
{
Q_OBJECT
+ TQ_OBJECT
public:
CharSelectApplet(const TQString& configFile, Type t = Stretch, int actions = 0,
- TQWidget *parent = 0, const char *name = 0);
+ TQWidget *tqparent = 0, const char *name = 0);
int widthForHeight(int height) const;
int heightForWidth(int width) const;
diff --git a/kcalc/colors.ui b/kcalc/colors.ui
index 26f4b28..e6b4513 100644
--- a/kcalc/colors.ui
+++ b/kcalc/colors.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>Colors</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Colors</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox3</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -41,7 +41,7 @@
<cstring>kcfg_ForeColor</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -101,7 +101,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox4</cstring>
</property>
@@ -112,7 +112,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -123,7 +123,7 @@
<cstring>kcfg_FunctionButtonsColor</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel7</cstring>
</property>
@@ -134,7 +134,7 @@
<cstring>kcfg_HexButtonsColor</cstring>
</property>
</widget>
- <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel10</cstring>
</property>
@@ -179,7 +179,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -202,7 +202,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel8</cstring>
</property>
@@ -221,7 +221,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel6</cstring>
</property>
@@ -232,7 +232,7 @@
<cstring>kcfg_StatButtonsColor</cstring>
</property>
</widget>
- <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel9</cstring>
</property>
@@ -255,7 +255,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -274,5 +274,5 @@
<tabstop>kcfg_MemoryButtonsColor</tabstop>
<tabstop>kcfg_OperationButtonsColor</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcalc/constants.ui b/kcalc/constants.ui
index f7c734e..82fe7d2 100644
--- a/kcalc/constants.ui
+++ b/kcalc/constants.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>Constants</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Constants</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>mainGroupBox</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox0</cstring>
</property>
@@ -41,7 +41,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_nameConstant0</cstring>
</property>
@@ -59,14 +59,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>70</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_valueConstant0</cstring>
</property>
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -101,7 +101,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -112,7 +112,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_nameConstant1</cstring>
</property>
@@ -130,14 +130,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>70</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_valueConstant1</cstring>
</property>
@@ -155,7 +155,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -172,7 +172,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -183,7 +183,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_nameConstant2</cstring>
</property>
@@ -201,14 +201,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>70</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_valueConstant2</cstring>
</property>
@@ -226,7 +226,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -243,7 +243,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox3</cstring>
</property>
@@ -254,7 +254,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_nameConstant3</cstring>
</property>
@@ -272,14 +272,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>70</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_valueConstant3</cstring>
</property>
@@ -297,7 +297,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -314,7 +314,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox4</cstring>
</property>
@@ -325,7 +325,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_nameConstant4</cstring>
</property>
@@ -343,14 +343,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>70</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_valueConstant4</cstring>
</property>
@@ -368,7 +368,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -385,7 +385,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox5</cstring>
</property>
@@ -396,7 +396,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_nameConstant5</cstring>
</property>
@@ -414,14 +414,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>70</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>kcfg_valueConstant5</cstring>
</property>
@@ -439,7 +439,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -468,7 +468,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -479,7 +479,7 @@
</widget>
<customwidgets>
</customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kcalc/dlabel.cpp b/kcalc/dlabel.cpp
index c4dbb17..5591655 100644
--- a/kcalc/dlabel.cpp
+++ b/kcalc/dlabel.cpp
@@ -2,7 +2,7 @@
$Id$
KCalc, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
Copyright (C) 1996 Bernd Johannes Wuebben
wuebben@math.cornell.edu
@@ -34,9 +34,9 @@
-DispLogic::DispLogic(TQWidget *parent, const char *name,
+DispLogic::DispLogic(TQWidget *tqparent, const char *name,
KActionCollection *coll)
- :KCalcDisplay(parent,name), _history_index(0)
+ :KCalcDisplay(tqparent,name), _history_index(0)
{
KNumber::setDefaultFloatOutput(true);
KNumber::setDefaultFractionalInput(true);
diff --git a/kcalc/dlabel.h b/kcalc/dlabel.h
index 0a7c386..e2d0395 100644
--- a/kcalc/dlabel.h
+++ b/kcalc/dlabel.h
@@ -38,9 +38,10 @@ class KActionCollection;
class DispLogic : public KCalcDisplay
{
Q_OBJECT
+ TQ_OBJECT
public:
- DispLogic(TQWidget *parent, const char *name,
+ DispLogic(TQWidget *tqparent, const char *name,
KActionCollection *coll);
~DispLogic();
diff --git a/kcalc/general.ui b/kcalc/general.ui
index 7ec8b15..59ba2f3 100644
--- a/kcalc/general.ui
+++ b/kcalc/general.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>General</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>General</cstring>
</property>
@@ -22,7 +22,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -33,7 +33,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_Fixed</cstring>
</property>
@@ -41,7 +41,7 @@
<string>Set &amp;decimal precision</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="1">
+ <widget class="TQLabel" row="2" column="1">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -55,7 +55,7 @@
<cstring>kcfg_FixedPrecision</cstring>
</property>
</widget>
- <widget class="QSpinBox" row="2" column="2">
+ <widget class="TQSpinBox" row="2" column="2">
<property name="name">
<cstring>kcfg_FixedPrecision</cstring>
</property>
@@ -73,14 +73,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -101,21 +101,21 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>101</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QSpinBox" row="0" column="2">
+ <widget class="TQSpinBox" row="0" column="2">
<property name="name">
<cstring>kcfg_Precision</cstring>
</property>
</widget>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -126,7 +126,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_Beep</cstring>
</property>
@@ -137,7 +137,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_CaptionResult</cstring>
</property>
@@ -145,7 +145,7 @@
<string>Show &amp;result in window title</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_GroupDigits</cstring>
</property>
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -195,5 +195,5 @@
<tabstop>kcfg_Beep</tabstop>
<tabstop>kcfg_CaptionResult</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 515536f..df773b2 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -78,8 +78,8 @@ static const char description[] = I18N_NOOP("KDE Calculator");
static const char version[] = KCALCVERSION;
-KCalculator::KCalculator(TQWidget *parent, const char *name)
- : KMainWindow(parent, name), inverse(false),
+KCalculator::KCalculator(TQWidget *tqparent, const char *name)
+ : KMainWindow(tqparent, name), inverse(false),
hyp_mode(false), memory_num(0.0), calc_display(NULL),
mInternalSpacing(4), core()
{
@@ -106,7 +106,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
// Create Button to select BaseMode
BaseChooseGroup = new TQHButtonGroup(i18n("Base"), central);
connect(BaseChooseGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotBaseSelected(int)));
- BaseChooseGroup->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
+ BaseChooseGroup->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
pbBaseChoose[0] = new TQRadioButton(i18n("He&x"), BaseChooseGroup,
@@ -155,7 +155,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
// Create Calculator Buttons
//
- // First the widgets that are the parents of the buttons
+ // First the widgets that are the tqparents of the buttons
mSmallPage = new TQWidget(central);
mLargePage = new TQWidget(central);
mNumericPage = setupNumericKeys(central);
@@ -228,7 +228,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
//
- // All these layouts are needed because all the groups have their
+ // All these tqlayouts are needed because all the groups have their
// own size per row so we can't use one huge TQGridLayout (mosfet)
//
TQGridLayout *smallBtnLayout = new TQGridLayout(mSmallPage, 6, 4, 0,
@@ -246,54 +246,54 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
mainLayout->addLayout(topLayout);
mainLayout->addLayout(btnLayout);
- // button layout
+ // button tqlayout
btnLayout->addWidget(mSmallPage, 0, AlignTop);
btnLayout->addSpacing(2*mInternalSpacing);
btnLayout->addWidget(mNumericPage, 0, AlignTop);
btnLayout->addSpacing(2*mInternalSpacing);
btnLayout->addWidget(mLargePage, 0, AlignTop);
- // small button layout
+ // small button tqlayout
smallBtnLayout->addWidget(pbStat["NumData"], 0, 0);
smallBtnLayout->addWidget(pbScientific["HypMode"], 0, 1);
smallBtnLayout->addWidget(pbLogic["AND"], 0, 2);
smallBtnLayout->addWidget(pbMod, 0, 3);
- smallBtnLayout->addWidget(NumButtonGroup->find(0xA), 0, 4);
+ smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xA), 0, 4);
smallBtnLayout->addWidget(pbConstant[0], 0, 5);
smallBtnLayout->addWidget(pbStat["Mean"], 1, 0);
smallBtnLayout->addWidget(pbScientific["Sine"], 1, 1);
smallBtnLayout->addWidget(pbLogic["OR"], 1, 2);
smallBtnLayout->addWidget(pbReci, 1, 3);
- smallBtnLayout->addWidget(NumButtonGroup->find(0xB), 1, 4);
+ smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xB), 1, 4);
smallBtnLayout->addWidget(pbConstant[1], 1, 5);
smallBtnLayout->addWidget(pbStat["StandardDeviation"], 2, 0);
smallBtnLayout->addWidget(pbScientific["Cosine"], 2, 1);
smallBtnLayout->addWidget(pbLogic["XOR"], 2, 2);
smallBtnLayout->addWidget(pbFactorial, 2, 3);
- smallBtnLayout->addWidget(NumButtonGroup->find(0xC), 2, 4);
+ smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xC), 2, 4);
smallBtnLayout->addWidget(pbConstant[2], 2, 5);
smallBtnLayout->addWidget(pbStat["Median"], 3, 0);
smallBtnLayout->addWidget(pbScientific["Tangent"], 3, 1);
smallBtnLayout->addWidget(pbLogic["LeftShift"], 3, 2);
smallBtnLayout->addWidget(pbSquare, 3, 3);
- smallBtnLayout->addWidget(NumButtonGroup->find(0xD), 3, 4);
+ smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xD), 3, 4);
smallBtnLayout->addWidget(pbConstant[3], 3, 5);
smallBtnLayout->addWidget(pbStat["InputData"], 4, 0);
smallBtnLayout->addWidget(pbScientific["Log10"], 4, 1);
smallBtnLayout->addWidget(pbLogic["RightShift"], 4, 2);
smallBtnLayout->addWidget(pbRoot, 4, 3);
- smallBtnLayout->addWidget(NumButtonGroup->find(0xE), 4, 4);
+ smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xE), 4, 4);
smallBtnLayout->addWidget(pbConstant[4], 4, 5);
smallBtnLayout->addWidget(pbStat["ClearData"], 5, 0);
smallBtnLayout->addWidget(pbScientific["LogNatural"], 5, 1);
smallBtnLayout->addWidget(pbLogic["One-Complement"], 5, 2);
smallBtnLayout->addWidget(pbPower, 5, 3);
- smallBtnLayout->addWidget(NumButtonGroup->find(0xF), 5, 4);
+ smallBtnLayout->addWidget(NumButtonGroup->tqfind(0xF), 5, 4);
smallBtnLayout->addWidget(pbConstant[5], 5, 5);
smallBtnLayout->setRowStretch(0, 0);
@@ -303,7 +303,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
smallBtnLayout->setRowStretch(4, 0);
smallBtnLayout->setRowStretch(5, 0);
- // large button layout
+ // large button tqlayout
largeBtnLayout->addWidget(pbClear, 0, 0);
largeBtnLayout->addWidget(pbAC, 0, 1);
@@ -319,7 +319,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
largeBtnLayout->addWidget(pbPercent, 4, 0);
largeBtnLayout->addWidget(pbPlusMinus, 4, 1);
- // top layout
+ // top tqlayout
topLayout->addWidget(pbAngleChoose);
topLayout->addWidget(BaseChooseGroup);
topLayout->addStretch();
@@ -381,7 +381,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
updateGeometry();
adjustSize();
- setFixedSize(sizeHint());
+ setFixedSize(tqsizeHint());
UpdateDisplay(true);
@@ -457,7 +457,7 @@ actionCollection());
void KCalculator::setupStatusbar(void)
{
- // Status bar contents
+ // tqStatus bar contents
statusBar()->insertFixedItem(" NORM ", 0, true);
statusBar()->setItemAlignment(0, AlignCenter);
@@ -471,12 +471,12 @@ void KCalculator::setupStatusbar(void)
statusBar()->setItemAlignment(3, AlignCenter);
}
-TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
+TQWidget* KCalculator::setupNumericKeys(TQWidget *tqparent)
{
Q_CHECK_PTR(mSmallPage);
Q_CHECK_PTR(mLargePage);
- TQWidget *thisPage = new TQWidget(parent);
+ TQWidget *thisPage = new TQWidget(tqparent);
KCalcButton *tmp_pb;
@@ -608,28 +608,28 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
TQGridLayout *thisLayout = new TQGridLayout(thisPage, 5, 4, 0,
mInternalSpacing);
- // large button layout
+ // large button tqlayout
thisLayout->addWidget(pbEE, 0, 0);
thisLayout->addWidget(pbDivision, 0, 1);
thisLayout->addWidget(pbX, 0, 2);
thisLayout->addWidget(pbMinus, 0, 3);
- thisLayout->addWidget(NumButtonGroup->find(7), 1, 0);
- thisLayout->addWidget(NumButtonGroup->find(8), 1, 1);
- thisLayout->addWidget(NumButtonGroup->find(9), 1, 2);
+ thisLayout->addWidget(NumButtonGroup->tqfind(7), 1, 0);
+ thisLayout->addWidget(NumButtonGroup->tqfind(8), 1, 1);
+ thisLayout->addWidget(NumButtonGroup->tqfind(9), 1, 2);
thisLayout->addMultiCellWidget(pbPlus, 1, 2, 3, 3);
- thisLayout->addWidget(NumButtonGroup->find(4), 2, 0);
- thisLayout->addWidget(NumButtonGroup->find(5), 2, 1);
- thisLayout->addWidget(NumButtonGroup->find(6), 2, 2);
+ thisLayout->addWidget(NumButtonGroup->tqfind(4), 2, 0);
+ thisLayout->addWidget(NumButtonGroup->tqfind(5), 2, 1);
+ thisLayout->addWidget(NumButtonGroup->tqfind(6), 2, 2);
//thisLayout->addMultiCellWidget(pbPlus, 1, 2, 3, 3);
- thisLayout->addWidget(NumButtonGroup->find(1), 3, 0);
- thisLayout->addWidget(NumButtonGroup->find(2), 3, 1);
- thisLayout->addWidget(NumButtonGroup->find(3), 3, 2);
+ thisLayout->addWidget(NumButtonGroup->tqfind(1), 3, 0);
+ thisLayout->addWidget(NumButtonGroup->tqfind(2), 3, 1);
+ thisLayout->addWidget(NumButtonGroup->tqfind(3), 3, 2);
thisLayout->addMultiCellWidget(pbEqual, 3, 4, 3, 3);
- thisLayout->addMultiCellWidget(NumButtonGroup->find(0), 4, 4, 0, 1);
+ thisLayout->addMultiCellWidget(NumButtonGroup->tqfind(0), 4, 4, 0, 1);
thisLayout->addWidget(pbPeriod, 4, 2);
//thisLayout->addMultiCellWidget(pbEqual, 3, 4, 3, 3);
@@ -741,33 +741,33 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
return thisPage;
}
-void KCalculator::setupLogicKeys(TQWidget *parent)
+void KCalculator::setupLogicKeys(TQWidget *tqparent)
{
- Q_CHECK_PTR(parent);
+ Q_CHECK_PTR(tqparent);
KCalcButton *tmp_pb;
- tmp_pb = new KCalcButton("AND", parent, "AND-Button", i18n("Bitwise AND"));
+ tmp_pb = new KCalcButton("AND", tqparent, "AND-Button", i18n("Bitwise AND"));
pbLogic.insert("AND", tmp_pb);
tmp_pb->setAccel(Key_Ampersand);
connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotANDclicked(void)));
- tmp_pb = new KCalcButton("OR", parent, "OR-Button", i18n("Bitwise OR"));
+ tmp_pb = new KCalcButton("OR", tqparent, "OR-Button", i18n("Bitwise OR"));
pbLogic.insert("OR", tmp_pb);
tmp_pb->setAccel(Key_Bar);
connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotORclicked(void)));
- tmp_pb = new KCalcButton("XOR", parent, "XOR-Button", i18n("Bitwise XOR"));
+ tmp_pb = new KCalcButton("XOR", tqparent, "XOR-Button", i18n("Bitwise XOR"));
pbLogic.insert("XOR", tmp_pb);
connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotXORclicked(void)));
- tmp_pb = new KCalcButton("Cmp", parent, "One-Complement-Button",
+ tmp_pb = new KCalcButton("Cmp", tqparent, "One-Complement-Button",
i18n("One's complement"));
pbLogic.insert("One-Complement", tmp_pb);
tmp_pb->setAccel(Key_AsciiTilde);
@@ -775,7 +775,7 @@ void KCalculator::setupLogicKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotNegateclicked(void)));
- tmp_pb = new KCalcButton("Lsh", parent, "LeftBitShift-Button",
+ tmp_pb = new KCalcButton("Lsh", tqparent, "LeftBitShift-Button",
i18n("Left bit shift"));
tmp_pb->setAccel(Key_Less);
pbLogic.insert("LeftShift", tmp_pb);
@@ -784,7 +784,7 @@ void KCalculator::setupLogicKeys(TQWidget *parent)
connect(tmp_pb, TQT_SIGNAL(clicked(void)),
TQT_SLOT(slotLeftShiftclicked(void)));
- tmp_pb = new KCalcButton("Rsh", parent, "RightBitShift-Button",
+ tmp_pb = new KCalcButton("Rsh", tqparent, "RightBitShift-Button",
i18n("Right bit shift"));
tmp_pb->setAccel(Key_Greater);
pbLogic.insert("RightShift", tmp_pb);
@@ -794,13 +794,13 @@ void KCalculator::setupLogicKeys(TQWidget *parent)
TQT_SLOT(slotRightShiftclicked(void)));
}
-void KCalculator::setupScientificKeys(TQWidget *parent)
+void KCalculator::setupScientificKeys(TQWidget *tqparent)
{
- Q_CHECK_PTR(parent);
+ Q_CHECK_PTR(tqparent);
KCalcButton *tmp_pb;
- tmp_pb = new KCalcButton("Hyp", parent, "Hyp-Button", i18n("Hyperbolic mode"));
+ tmp_pb = new KCalcButton("Hyp", tqparent, "Hyp-Button", i18n("Hyperbolic mode"));
pbScientific.insert("HypMode", tmp_pb);
tmp_pb->setAccel(Key_H);
connect(this, TQT_SIGNAL(switchShowAccels(bool)),
@@ -808,7 +808,7 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
connect(tmp_pb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHyptoggled(bool)));
tmp_pb->setToggleButton(true);
- tmp_pb = new KCalcButton(parent, "Sin-Button");
+ tmp_pb = new KCalcButton(tqparent, "Sin-Button");
pbScientific.insert("Sine", tmp_pb);
tmp_pb->addMode(ModeNormal, "Sin", i18n("Sine"));
tmp_pb->addMode(ModeInverse, "Asin", i18n("Arc sine"));
@@ -822,7 +822,7 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotSinclicked(void)));
- tmp_pb = new KCalcButton(parent, "Cos-Button");
+ tmp_pb = new KCalcButton(tqparent, "Cos-Button");
pbScientific.insert("Cosine", tmp_pb);
tmp_pb->addMode(ModeNormal, "Cos", i18n("Cosine"));
tmp_pb->addMode(ModeInverse, "Acos", i18n("Arc cosine"));
@@ -836,7 +836,7 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotCosclicked(void)));
- tmp_pb = new KCalcButton(parent, "Tan-Button");
+ tmp_pb = new KCalcButton(tqparent, "Tan-Button");
pbScientific.insert("Tangent", tmp_pb);
tmp_pb->addMode(ModeNormal, "Tan", i18n("Tangent"));
tmp_pb->addMode(ModeInverse, "Atan", i18n("Arc tangent"));
@@ -850,7 +850,7 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotTanclicked(void)));
- tmp_pb = new KCalcButton(parent, "Ln-Button");
+ tmp_pb = new KCalcButton(tqparent, "Ln-Button");
tmp_pb->addMode(ModeNormal, "Ln", i18n("Natural log"));
tmp_pb->addMode(ModeInverse, "e<sup> x </sup>", i18n("Exponential function"),
true);
@@ -862,7 +862,7 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLnclicked(void)));
- tmp_pb = new KCalcButton(parent, "Log-Button");
+ tmp_pb = new KCalcButton(tqparent, "Log-Button");
tmp_pb->addMode(ModeNormal, "Log", i18n("Logarithm to base 10"));
tmp_pb->addMode(ModeInverse, "10<sup> x </sup>", i18n("10 to the power of x"),
true);
@@ -876,13 +876,13 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
}
-void KCalculator::setupStatisticKeys(TQWidget *parent)
+void KCalculator::setupStatisticKeys(TQWidget *tqparent)
{
- Q_CHECK_PTR(parent);
+ Q_CHECK_PTR(tqparent);
KCalcButton *tmp_pb;
- tmp_pb = new KCalcButton(parent, "Stat.NumData-Button");
+ tmp_pb = new KCalcButton(tqparent, "Stat.NumData-Button");
tmp_pb->addMode(ModeNormal, "N", i18n("Number of data entered"));
tmp_pb->addMode(ModeInverse, TQString::fromUtf8("\xce\xa3")
+ "x", i18n("Sum of all data items"));
@@ -894,7 +894,7 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatNumclicked(void)));
- tmp_pb = new KCalcButton(parent, "Stat.Median-Button");
+ tmp_pb = new KCalcButton(tqparent, "Stat.Median-Button");
tmp_pb->addMode(ModeNormal, "Med", i18n("Median"));
pbStat.insert("Median", tmp_pb);
mStatButtonList.append(tmp_pb);
@@ -903,7 +903,7 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMedianclicked(void)));
- tmp_pb = new KCalcButton(parent, "Stat.Mean-Button");
+ tmp_pb = new KCalcButton(tqparent, "Stat.Mean-Button");
tmp_pb->addMode(ModeNormal, "Mea", i18n("Mean"));
tmp_pb->addMode(ModeInverse, TQString::fromUtf8("\xce\xa3")
+ "x<sup>2</sup>",
@@ -916,7 +916,7 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMeanclicked(void)));
- tmp_pb = new KCalcButton(parent, "Stat.StandardDeviation-Button");
+ tmp_pb = new KCalcButton(tqparent, "Stat.StandardDeviation-Button");
tmp_pb->addMode(ModeNormal, TQString::fromUtf8("σ",-1) + "<sub>N-1</sub>",
i18n("Sample standard deviation"), true);
tmp_pb->addMode(ModeInverse, TQString::fromUtf8("σ",-1) + "<sub>N</sub>",
@@ -929,7 +929,7 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatStdDevclicked(void)));
- tmp_pb = new KCalcButton(parent, "Stat.DataInput-Button");
+ tmp_pb = new KCalcButton(tqparent, "Stat.DataInput-Button");
tmp_pb->addMode(ModeNormal, "Dat", i18n("Enter data"));
tmp_pb->addMode(ModeInverse, "CDat", i18n("Delete last data item"));
pbStat.insert("InputData", tmp_pb);
@@ -940,7 +940,7 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatDataInputclicked(void)));
- tmp_pb = new KCalcButton(parent, "Stat.ClearData-Button");
+ tmp_pb = new KCalcButton(tqparent, "Stat.ClearData-Button");
tmp_pb->addMode(ModeNormal, "CSt", i18n("Clear data store"));
pbStat.insert("ClearData", tmp_pb);
mStatButtonList.append(tmp_pb);
@@ -949,16 +949,16 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatClearDataclicked(void)));
}
-void KCalculator::setupConstantsKeys(TQWidget *parent)
+void KCalculator::setupConstantsKeys(TQWidget *tqparent)
{
- Q_CHECK_PTR(parent);
+ Q_CHECK_PTR(tqparent);
ConstButtonGroup = new TQButtonGroup(0, "Const-Button-Group");
connect(ConstButtonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotConstclicked(int)));
KCalcConstButton *tmp_pb;
- tmp_pb = new KCalcConstButton(parent, 0, "C1");
+ tmp_pb = new KCalcConstButton(tqparent, 0, "C1");
tmp_pb->setAccel(ALT + Key_1);
pbConstant[0] = tmp_pb;
connect(this, TQT_SIGNAL(switchShowAccels(bool)),
@@ -967,7 +967,7 @@ void KCalculator::setupConstantsKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 0);
- tmp_pb = new KCalcConstButton(parent, 1, "C2");
+ tmp_pb = new KCalcConstButton(tqparent, 1, "C2");
tmp_pb->setAccel(ALT + Key_2);
pbConstant[1] = tmp_pb;
connect(this, TQT_SIGNAL(switchShowAccels(bool)),
@@ -976,7 +976,7 @@ void KCalculator::setupConstantsKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 1);
- tmp_pb = new KCalcConstButton(parent, 2, "C3");
+ tmp_pb = new KCalcConstButton(tqparent, 2, "C3");
tmp_pb->setAccel(ALT + Key_3);
pbConstant[2] = tmp_pb;
connect(this, TQT_SIGNAL(switchShowAccels(bool)),
@@ -985,7 +985,7 @@ void KCalculator::setupConstantsKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 2);
- tmp_pb = new KCalcConstButton(parent, 3, "C4");
+ tmp_pb = new KCalcConstButton(tqparent, 3, "C4");
tmp_pb->setAccel(ALT + Key_4);
pbConstant[3] = tmp_pb;
connect(this, TQT_SIGNAL(switchShowAccels(bool)),
@@ -994,7 +994,7 @@ void KCalculator::setupConstantsKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 3);
- tmp_pb = new KCalcConstButton(parent, 4, "C5");
+ tmp_pb = new KCalcConstButton(tqparent, 4, "C5");
tmp_pb->setAccel(ALT + Key_5);
pbConstant[4] = tmp_pb;
connect(this, TQT_SIGNAL(switchShowAccels(bool)),
@@ -1003,7 +1003,7 @@ void KCalculator::setupConstantsKeys(TQWidget *parent)
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 4);
- tmp_pb = new KCalcConstButton(parent, 5, "C6");
+ tmp_pb = new KCalcConstButton(tqparent, 5, "C6");
tmp_pb->setAccel(ALT + Key_6);
pbConstant[5] = tmp_pb;
connect(this, TQT_SIGNAL(switchShowAccels(bool)),
@@ -1041,7 +1041,7 @@ void KCalculator::updateGeometry(void)
s.setHeight(mSmallPage->fontMetrics().lineSpacing());
// why this stupid cast!
- l = const_cast<TQObjectList *>(mSmallPage->children());
+ l = const_cast<TQObjectList *>(mSmallPage->tqchildren());
for(uint i=0; i < l->count(); i++)
{
@@ -1050,7 +1050,7 @@ void KCalculator::updateGeometry(void)
{
TQWidget *tmp_widget = dynamic_cast<TQWidget *>(o);
margin = TQApplication::style().
- pixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
+ tqpixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
tmp_widget->setFixedSize(s.width()+margin, s.height()+margin);
//tmp_widget->setMinimumSize(s.width()+margin, s.height()+margin);
tmp_widget->installEventFilter( this );
@@ -1059,13 +1059,13 @@ void KCalculator::updateGeometry(void)
}
// why this stupic cast !!
- l = const_cast<TQObjectList*>(mLargePage->children());
+ l = const_cast<TQObjectList*>(mLargePage->tqchildren());
- int h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
+ int h1 = (NumButtonGroup->tqfind(0x0F))->tqminimumSize().height();
int h2 = static_cast<int>( (static_cast<float>(h1) + 4.0) / 5.0 );
s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::style().
- pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
+ tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->tqfind(0x0F))*2);
s.setHeight(h1 + h2);
for(uint i = 0; i < l->count(); i++)
@@ -1086,13 +1086,13 @@ void KCalculator::updateGeometry(void)
- l = (TQObjectList*)mNumericPage->children(); // silence please
+ l = (TQObjectList*)mNumericPage->tqchildren(); // silence please
- h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
+ h1 = (NumButtonGroup->tqfind(0x0F))->tqminimumSize().height();
h2 = (int)((((float)h1 + 4.0) / 5.0));
s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::style().
- pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
+ tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->tqfind(0x0F))*2);
s.setHeight(h1 + h2);
for(uint i = 0; i < l->count(); i++)
@@ -1110,7 +1110,7 @@ void KCalculator::updateGeometry(void)
// Set Buttons of double size
TQSize t(s);
t.setWidth(2*s.width());
- NumButtonGroup->find(0x00)->setFixedSize(t);
+ NumButtonGroup->tqfind(0x00)->setFixedSize(t);
t = s;
t.setHeight(2*s.height());
pbEqual->setFixedSize(t);
@@ -1152,11 +1152,11 @@ void KCalculator::slotBaseSelected(int base)
// Enable the buttons not available in this base
for (int i=0; i<current_base; i++)
- NumButtonGroup->find(i)->setEnabled (true);
+ NumButtonGroup->tqfind(i)->setEnabled (true);
// Disable the buttons not available in this base
for (int i=current_base; i<16; i++)
- NumButtonGroup->find(i)->setEnabled (false);
+ NumButtonGroup->tqfind(i)->setEnabled (false);
// Only enable the decimal point in decimal
pbPeriod->setEnabled(current_base == NB_DECIMAL);
@@ -1271,7 +1271,7 @@ void KCalculator::slotInvtoggled(bool flag)
else
{
statusBar()->changeItem("NORM", 0);
- calc_display->setStatusText(0, TQString::null);
+ calc_display->setStatusText(0, TQString());
}
}
@@ -1544,7 +1544,7 @@ void KCalculator::slotMCclicked(void)
{
memory_num = 0;
statusBar()->changeItem(" \xa0\xa0 ",3);
- calc_display->setStatusText(3, TQString::null);
+ calc_display->setStatusText(3, TQString());
pbMemRecall->setDisabled(true);
}
@@ -1951,7 +1951,7 @@ void KCalculator::slotStatshow(bool toggled)
pbStat["ClearData"]->hide();
}
adjustSize();
- setFixedSize(sizeHint());
+ setFixedSize(tqsizeHint());
KCalcSettings::setShowStat(toggled);
}
@@ -1983,10 +1983,10 @@ void KCalculator::slotScientificshow(bool toggled)
pbAngleChoose->hide();
if(statusBar()->hasItem(2))
statusBar()->removeItem(2);
- calc_display->setStatusText(2, TQString::null);
+ calc_display->setStatusText(2, TQString());
}
adjustSize();
- setFixedSize(sizeHint());
+ setFixedSize(tqsizeHint());
KCalcSettings::setShowScientific(toggled);
}
@@ -2007,7 +2007,7 @@ void KCalculator::slotLogicshow(bool toggled)
resetBase();
BaseChooseGroup->show();
for (int i=10; i<16; i++)
- (NumButtonGroup->find(i))->show();
+ (NumButtonGroup->tqfind(i))->show();
}
else
{
@@ -2022,12 +2022,12 @@ void KCalculator::slotLogicshow(bool toggled)
BaseChooseGroup->hide();
if(statusBar()->hasItem(1))
statusBar()->removeItem(1);
- calc_display->setStatusText(1, TQString::null);
+ calc_display->setStatusText(1, TQString());
for (int i=10; i<16; i++)
- (NumButtonGroup->find(i))->hide();
+ (NumButtonGroup->tqfind(i))->hide();
}
adjustSize();
- setFixedSize(sizeHint());
+ setFixedSize(tqsizeHint());
KCalcSettings::setShowLogic(toggled);
}
@@ -2053,7 +2053,7 @@ void KCalculator::slotConstantsShow(bool toggled)
pbConstant[5]->hide();
}
adjustSize();
- setFixedSize(sizeHint());
+ setFixedSize(tqsizeHint());
KCalcSettings::setShowConstants(toggled);
}
@@ -2104,12 +2104,12 @@ void KCalculator::updateSettings()
}
else
{
- setCaption(TQString::null);
+ setCaption(TQString());
}
calc_display->changeSettings();
updateGeometry();
- resize(minimumSize());
+ resize(tqminimumSize());
//
// 1999-10-31 Espen Sand: Don't ask me why ;)
@@ -2145,7 +2145,7 @@ void KCalculator::set_colors()
TQPalette numPal(KCalcSettings::numberButtonsColor(), bg);
for(int i=0; i<10; i++)
{
- (NumButtonGroup->find(i))->setPalette(numPal);
+ (NumButtonGroup->tqfind(i))->setPalette(numPal);
}
TQPalette funcPal(KCalcSettings::functionButtonsColor(), bg);
@@ -2164,7 +2164,7 @@ void KCalculator::set_colors()
TQPalette hexPal(KCalcSettings::hexButtonsColor(), bg);
for(int i=10; i<16; i++)
{
- (NumButtonGroup->find(i))->setPalette(hexPal);
+ (NumButtonGroup->tqfind(i))->setPalette(hexPal);
}
TQPalette memPal(KCalcSettings::memoryButtonsColor(), bg);
@@ -2218,26 +2218,26 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
// Was it hex-button or normal digit??
if (num_but <10)
for(int i=0; i<10; i++)
- (NumButtonGroup->find(i))->setPalette(pal);
+ (NumButtonGroup->tqfind(i))->setPalette(pal);
else
for(int i=10; i<16; i++)
- (NumButtonGroup->find(i))->setPalette(pal);
+ (NumButtonGroup->tqfind(i))->setPalette(pal);
return true;
}
- else if( mFunctionButtonList.findRef((KCalcButton*)o) != -1)
+ else if( mFunctionButtonList.tqfindRef((KCalcButton*)o) != -1)
{
list = &mFunctionButtonList;
}
- else if( mStatButtonList.findRef((KCalcButton*)o) != -1)
+ else if( mStatButtonList.tqfindRef((KCalcButton*)o) != -1)
{
list = &mStatButtonList;
}
- else if( mMemButtonList.findRef((KCalcButton*)o) != -1)
+ else if( mMemButtonList.tqfindRef((KCalcButton*)o) != -1)
{
list = &mMemButtonList;
}
- else if( mOperationButtonList.findRef((KCalcButton*)o) != -1)
+ else if( mOperationButtonList.tqfindRef((KCalcButton*)o) != -1)
{
list = &mOperationButtonList;
}
@@ -2296,7 +2296,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
KCalculator *calc = new KCalculator;
app.setTopWidget(calc);
- calc->setCaption(TQString::null);
+ calc->setCaption(TQString());
calc->show();
int exitCode = app.exec();
diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h
index 87f389e..f135a3c 100644
--- a/kcalc/kcalc.h
+++ b/kcalc/kcalc.h
@@ -1,6 +1,6 @@
/*
KCalc, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
Copyright (C) 1996 Bernd Johannes Wuebben
wuebben@math.cornell.edu
@@ -61,9 +61,10 @@ class Constants;
class KCalculator : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCalculator(TQWidget *parent = 0, const char *name = 0);
+ KCalculator(TQWidget *tqparent = 0, const char *name = 0);
~KCalculator();
signals:
@@ -76,16 +77,16 @@ private:
void updateGeometry();
void setupMainActions(void);
void setupStatusbar(void);
- TQWidget *setupNumericKeys(TQWidget *parent);
- void setupLogicKeys(TQWidget *parent);
- void setupScientificKeys(TQWidget *parent);
- void setupStatisticKeys(TQWidget *parent);
- void setupConstantsKeys(TQWidget *parent);
+ TQWidget *setupNumericKeys(TQWidget *tqparent);
+ void setupLogicKeys(TQWidget *tqparent);
+ void setupScientificKeys(TQWidget *tqparent);
+ void setupStatisticKeys(TQWidget *tqparent);
+ void setupConstantsKeys(TQWidget *tqparent);
void keyPressEvent(TQKeyEvent *e);
void keyReleaseEvent(TQKeyEvent *e);
void set_precision();
void set_style();
- void resetBase(void) { (BaseChooseGroup->find(1))->animateClick();};
+ void resetBase(void) { (BaseChooseGroup->tqfind(1))->animateClick();};
void UpdateDisplay(bool get_amount_from_core = false,
bool store_result_in_history = false);
diff --git a/kcalc/kcalc_button.cpp b/kcalc/kcalc_button.cpp
index 7472f92..0bde80d 100644
--- a/kcalc/kcalc_button.cpp
+++ b/kcalc/kcalc_button.cpp
@@ -30,16 +30,16 @@
#include "kcalc_button.h"
-KCalcButton::KCalcButton(TQWidget * parent, const char * name)
- : KPushButton(parent, name), _show_accel_mode(false),
+KCalcButton::KCalcButton(TQWidget * tqparent, const char * name)
+ : KPushButton(tqparent, name), _show_accel_mode(false),
_mode_flags(ModeNormal)
{
setAutoDefault(false);
}
-KCalcButton::KCalcButton(const TQString &label, TQWidget * parent,
+KCalcButton::KCalcButton(const TQString &label, TQWidget * tqparent,
const char * name, const TQString &tooltip)
- : KPushButton(label, parent, name), _show_accel_mode(false), _mode_flags(ModeNormal)
+ : KPushButton(label, tqparent, name), _show_accel_mode(false), _mode_flags(ModeNormal)
{
setAutoDefault(false);
addMode(ModeNormal, label, tooltip);
@@ -47,7 +47,7 @@ KCalcButton::KCalcButton(const TQString &label, TQWidget * parent,
void KCalcButton::addMode(ButtonModeFlags mode, TQString label, TQString tooltip, bool is_label_richtext)
{
- if (_mode.contains(mode)) _mode.remove(mode);
+ if (_mode.tqcontains(mode)) _mode.remove(mode);
_mode[mode] = ButtonMode(label, tooltip, is_label_richtext);
@@ -67,7 +67,7 @@ void KCalcButton::slotSetMode(ButtonModeFlags mode, bool flag)
return; // nothing to do
}
- if (_mode.contains(new_mode)) {
+ if (_mode.tqcontains(new_mode)) {
// save accel, because setting label erases accel
TQKeySequence _accel = accel();
@@ -92,7 +92,7 @@ void KCalcButton::slotSetMode(ButtonModeFlags mode, bool flag)
static TQString escape(TQString str)
{
- str.replace('&', "&&");
+ str.tqreplace('&', "&&");
return str;
}
@@ -118,7 +118,7 @@ void KCalcButton::paintLabel(TQPainter *paint)
{
if (_mode[_mode_flags].is_label_richtext) {
TQSimpleRichText _text(_label, font());
- _text.draw(paint, width()/2-_text.width()/2, 0, childrenRegion(), colorGroup());
+ _text.draw(paint, width()/2-_text.width()/2, 0, tqchildrenRegion(), tqcolorGroup());
} else {
KPushButton::drawButtonLabel(paint);
}
@@ -128,7 +128,7 @@ void KCalcButton::drawButtonLabel(TQPainter *paint)
{
if (_show_accel_mode) {
KPushButton::drawButtonLabel(paint);
- } else if (_mode.contains(_mode_flags)) {
+ } else if (_mode.tqcontains(_mode_flags)) {
paintLabel(paint);
}
}
@@ -159,7 +159,7 @@ void KSquareButton::drawButtonLabel(TQPainter *paint)
{
if (_show_accel_mode) {
KPushButton::drawButtonLabel(paint);
- } else if (_mode.contains(_mode_flags)) {
+ } else if (_mode.tqcontains(_mode_flags)) {
paintLabel(paint);
}
}
diff --git a/kcalc/kcalc_button.h b/kcalc/kcalc_button.h
index f1a060f..60a7c30 100644
--- a/kcalc/kcalc_button.h
+++ b/kcalc/kcalc_button.h
@@ -1,6 +1,6 @@
/*
KCalc, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
Copyright (C) 1996 Bernd Johannes Wuebben
wuebben@math.cornell.edu
@@ -61,10 +61,11 @@ public:
class KCalcButton : public KPushButton
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCalcButton(TQWidget *parent, const char * name = 0);
- KCalcButton(const TQString &label, TQWidget *parent, const char * name = 0,
+ KCalcButton(TQWidget *tqparent, const char * name = 0);
+ KCalcButton(const TQString &label, TQWidget *tqparent, const char * name = 0,
const TQString &tooltip = TQString());
void addMode(ButtonModeFlags mode, TQString label, TQString tooltip, bool is_label_richtext = false);
@@ -89,13 +90,14 @@ protected:
class KSquareButton : public KCalcButton
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSquareButton(TQWidget *parent, const char * name = 0)
- : KCalcButton(parent, name) { };
- KSquareButton(const TQString &label, TQWidget *parent, const char * name = 0,
+ KSquareButton(TQWidget *tqparent, const char * name = 0)
+ : KCalcButton(tqparent, name) { };
+ KSquareButton(const TQString &label, TQWidget *tqparent, const char * name = 0,
const TQString &tooltip = TQString())
- : KCalcButton(label, parent, name, tooltip) { };
+ : KCalcButton(label, tqparent, name, tooltip) { };
protected:
virtual void drawButtonLabel(TQPainter *paint);
diff --git a/kcalc/kcalc_const_button.cpp b/kcalc/kcalc_const_button.cpp
index 071bb71..a8eb989 100644
--- a/kcalc/kcalc_const_button.cpp
+++ b/kcalc/kcalc_const_button.cpp
@@ -31,8 +31,8 @@
#include "kcalc_settings.h"
-KCalcConstButton::KCalcConstButton(TQWidget *parent, int but_num, const char * name)
- : KCalcButton(parent, name), _button_num(but_num)
+KCalcConstButton::KCalcConstButton(TQWidget *tqparent, int but_num, const char * name)
+ : KCalcButton(tqparent, name), _button_num(but_num)
{
addMode(ModeInverse, "Store", i18n("Write display data into memory"));
@@ -40,9 +40,9 @@ KCalcConstButton::KCalcConstButton(TQWidget *parent, int but_num, const char * n
}
-KCalcConstButton::KCalcConstButton(const TQString &label, TQWidget *parent, int but_num,
+KCalcConstButton::KCalcConstButton(const TQString &label, TQWidget *tqparent, int but_num,
const char * name, const TQString &tooltip)
- : KCalcButton(label, parent, name, tooltip), _button_num(but_num)
+ : KCalcButton(label, tqparent, name, tooltip), _button_num(but_num)
{
addMode(ModeInverse, "Store", i18n("Write display data into memory"));
diff --git a/kcalc/kcalc_const_button.h b/kcalc/kcalc_const_button.h
index 110df3c..916d7f6 100644
--- a/kcalc/kcalc_const_button.h
+++ b/kcalc/kcalc_const_button.h
@@ -1,6 +1,6 @@
/*
KCalc, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
Copyright (C) 1996 Bernd Johannes Wuebben
wuebben@math.cornell.edu
@@ -31,12 +31,13 @@
class KCalcConstButton : public KCalcButton
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCalcConstButton(TQWidget *parent, int but_num, const char * name = 0);
+ KCalcConstButton(TQWidget *tqparent, int but_num, const char * name = 0);
- KCalcConstButton(const TQString &label, TQWidget *parent, int but_num, const char * name = 0,
+ KCalcConstButton(const TQString &label, TQWidget *tqparent, int but_num, const char * name = 0,
const TQString &tooltip = TQString());
TQString constant(void) const;
diff --git a/kcalc/kcalc_const_menu.cpp b/kcalc/kcalc_const_menu.cpp
index f758c9f..7984daf 100644
--- a/kcalc/kcalc_const_menu.cpp
+++ b/kcalc/kcalc_const_menu.cpp
@@ -49,8 +49,8 @@ const struct science_constant KCalcConstMenu::Constants[] = {
{"N_A", I18N_NOOP("Avogadro's Number"), "", "6.0221415e23", Thermodynamics}
};
-KCalcConstMenu::KCalcConstMenu(TQWidget * parent, const char * name)
- : TQPopupMenu(parent, name)
+KCalcConstMenu::KCalcConstMenu(TQWidget * tqparent, const char * name)
+ : TQPopupMenu(tqparent, name)
{
TQPopupMenu *math_menu = new TQPopupMenu(this, "mathematical constants");
TQPopupMenu *em_menu = new TQPopupMenu(this, "electromagnetic constants");
diff --git a/kcalc/kcalc_const_menu.h b/kcalc/kcalc_const_menu.h
index 94c8412..331a6a1 100644
--- a/kcalc/kcalc_const_menu.h
+++ b/kcalc/kcalc_const_menu.h
@@ -1,6 +1,6 @@
/*
KCalc, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
Copyright (C) 2004 Klaus Niederkruger
@@ -36,12 +36,12 @@ struct science_constant{
ConstantCategory category;
};
-class KCalcConstMenu : public QPopupMenu
+class KCalcConstMenu : public TQPopupMenu
{
-Q_OBJECT
+TQ_OBJECT
public:
- KCalcConstMenu(TQWidget * parent = 0, const char * name = 0);
+ KCalcConstMenu(TQWidget * tqparent = 0, const char * name = 0);
static const struct science_constant Constants[];
diff --git a/kcalc/kcalc_core.cpp b/kcalc/kcalc_core.cpp
index 4270895..89a2438 100644
--- a/kcalc/kcalc_core.cpp
+++ b/kcalc/kcalc_core.cpp
@@ -1,6 +1,6 @@
/*
kCalculator, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
The stack engine contained in this file was take from
Martin Bartlett's xfrmcalc
@@ -209,7 +209,7 @@ CalcEngine::CalcEngine()
struct sigaction fpe_trap;
- sigemptyset(&fpe_trap.sa_mask);
+ sigemptyset(&fpe_trap.sa_tqmask);
fpe_trap.sa_handler = &fpe_handler;
#ifdef SA_RESTART
fpe_trap.sa_flags = SA_RESTART;
diff --git a/kcalc/kcalc_core.h b/kcalc/kcalc_core.h
index fe818e9..f02d880 100644
--- a/kcalc/kcalc_core.h
+++ b/kcalc/kcalc_core.h
@@ -1,7 +1,7 @@
/*
KCalc, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
Copyright (C) 1996 Bernd Johannes Wuebben
wuebben@math.cornell.edu
diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp
index 1f90e03..fb0595e 100644
--- a/kcalc/kcalcdisplay.cpp
+++ b/kcalc/kcalcdisplay.cpp
@@ -2,7 +2,7 @@
$Id$
KCalc, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
Copyright (C) 1996 Bernd Johannes Wuebben
wuebben@math.cornell.edu
@@ -39,17 +39,17 @@
#include "kcalcdisplay.moc"
-KCalcDisplay::KCalcDisplay(TQWidget *parent, const char *name)
- :TQLabel(parent,name), _beep(false), _groupdigits(false), _button(0), _lit(false),
+KCalcDisplay::KCalcDisplay(TQWidget *tqparent, const char *name)
+ :TQLabel(tqparent,name), _beep(false), _groupdigits(false), _button(0), _lit(false),
_num_base(NB_DECIMAL), _precision(9),
_fixed_precision(-1), _display_amount(0),
selection_timer(new TQTimer)
{
setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
- setAlignment(AlignRight | AlignVCenter);
+ tqsetAlignment(AlignRight | AlignVCenter);
setFocus();
- setFocusPolicy(TQWidget::StrongFocus);
- setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
+ setFocusPolicy(TQ_StrongFocus);
+ tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisplaySelected()));
@@ -71,7 +71,7 @@ bool KCalcDisplay::sendEvent(Event const event)
case EventReset:
_display_amount = 0;
_str_int = "0";
- _str_int_exp = TQString::null;
+ _str_int_exp = TQString();
_eestate = false;
_period = false;
@@ -105,13 +105,13 @@ void KCalcDisplay::slotCopy(void)
TQString txt = TQLabel::text();
if (_num_base == NB_HEX)
txt.prepend( "0x" );
- (TQApplication::clipboard())->setText(txt, QClipboard::Clipboard);
- (TQApplication::clipboard())->setText(txt, QClipboard::Selection);
+ (TQApplication::tqclipboard())->setText(txt, TQClipboard::Clipboard);
+ (TQApplication::tqclipboard())->setText(txt, TQClipboard::Selection);
}
void KCalcDisplay::slotPaste(bool bClipboard)
{
- TQString tmp_str = (TQApplication::clipboard())->text(bClipboard ? QClipboard::Clipboard : QClipboard::Selection);
+ TQString tmp_str = (TQApplication::tqclipboard())->text(bClipboard ? TQClipboard::Clipboard : TQClipboard::Selection);
if (tmp_str.isNull())
{
@@ -226,7 +226,7 @@ bool KCalcDisplay::setAmount(KNumber const & new_amount)
TQString display_str;
_str_int = "0";
- _str_int_exp = TQString::null;
+ _str_int_exp = TQString();
_period = false;
_neg_sign = false;
_eestate = false;
@@ -243,7 +243,7 @@ bool KCalcDisplay::setAmount(KNumber const & new_amount)
{
_display_amount = new_amount;
- display_str = _display_amount.toQString(KCalcSettings::precision(), _fixed_precision);
+ display_str = _display_amount.toTQString(KCalcSettings::precision(), _fixed_precision);
#if 0
else if (_display_amount > 1.0e+16)
display_str = TQCString().sprintf(PRINT_LONG_BIG, _precision + 1, _display_amount);
@@ -281,7 +281,7 @@ TQString KCalcDisplay::text() const
{
if (_num_base != NB_DECIMAL)
return TQLabel::text();
- TQString display_str = _display_amount.toQString(KCalcSettings::precision());
+ TQString display_str = _display_amount.toTQString(KCalcSettings::precision());
return display_str;
// return TQCString().sprintf(PRINT_LONG_BIG, 40, _display_amount);
@@ -584,7 +584,7 @@ void KCalcDisplay::drawContents(TQPainter *p)
// draw the status texts using half of the normal
// font size but not smaller than 7pt
TQFont f(font());
- f.setPointSize(QMAX((f.pointSize() / 2), 7));
+ f.setPointSize(TQMAX((f.pointSize() / 2), 7));
p->setFont(f);
TQFontMetrics fm(f);
uint w = fm.width("_____");
@@ -596,13 +596,13 @@ void KCalcDisplay::drawContents(TQPainter *p)
}
}
-// Return the QLabel's normal size hint vertically expanded
+// Return the TQLabel's normal size hint vertically expanded
// by half the font height to make room for the status texts
-TQSize KCalcDisplay::sizeHint() const
+TQSize KCalcDisplay::tqsizeHint() const
{
TQFont f(font());
- f.setPointSize(QMAX((f.pointSize() / 2), 7));
+ f.setPointSize(TQMAX((f.pointSize() / 2), 7));
TQFontMetrics fm(f);
- return TQLabel::sizeHint() + TQSize(0, fm.height());
+ return TQLabel::tqsizeHint() + TQSize(0, fm.height());
}
diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h
index 6f7233c..4c0371c 100644
--- a/kcalc/kcalcdisplay.h
+++ b/kcalc/kcalcdisplay.h
@@ -76,12 +76,13 @@ enum NumBase {
};
-class KCalcDisplay : public QLabel
+class KCalcDisplay : public TQLabel
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCalcDisplay(TQWidget *parent=0, const char *name=0);
+ KCalcDisplay(TQWidget *tqparent=0, const char *name=0);
~KCalcDisplay();
protected:
@@ -109,7 +110,7 @@ public:
TQString text() const;
bool updateDisplay(void);
void setStatusText(uint i, const TQString& text);
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
private:
bool _beep;
bool _groupdigits;
diff --git a/kcalc/kcalctype.h b/kcalc/kcalctype.h
index 8223e87..6c69aec 100644
--- a/kcalc/kcalctype.h
+++ b/kcalc/kcalctype.h
@@ -2,7 +2,7 @@
$Id$
KCalc, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
Copyright (C) 1996 Bernd Johannes Wuebben
wuebben@math.cornell.edu
diff --git a/kcalc/knumber/knumber.cpp b/kcalc/knumber/knumber.cpp
index 80bae1f..123fee7 100644
--- a/kcalc/knumber/knumber.cpp
+++ b/kcalc/knumber/knumber.cpp
@@ -276,7 +276,7 @@ static void _inc_by_one(TQString &str, int position)
// Cut off if more digits in fractional part than 'precision'
static void _round(TQString &str, int precision)
{
- int decimalSymbolPos = str.find('.');
+ int decimalSymbolPos = str.tqfind('.');
if (decimalSymbolPos == -1)
if (precision == 0) return;
@@ -312,7 +312,7 @@ static void _round(TQString &str, int precision)
break;
}
- decimalSymbolPos = str.find('.');
+ decimalSymbolPos = str.tqfind('.');
str.truncate(decimalSymbolPos + precision + 1);
// if precision == 0 delete also '.'
@@ -349,7 +349,7 @@ static TQString roundNumber(const TQString &numStr, int precision)
}
-TQString const KNumber::toQString(int width, int prec) const
+TQString const KNumber::toTQString(int width, int prec) const
{
TQString tmp_str;
@@ -360,7 +360,7 @@ TQString const KNumber::toQString(int width, int prec) const
if (width > 0) { //result needs to be cut-off
bool tmp_bool = _fraction_input; // stupid work-around
_fraction_input = false;
- tmp_str = (KNumber("1.0")*(*this)).toQString(width, -1);
+ tmp_str = (KNumber("1.0")*(*this)).toTQString(width, -1);
_fraction_input = tmp_bool;
} else
tmp_str = TQString(_num->ascii());
@@ -369,7 +369,7 @@ TQString const KNumber::toQString(int width, int prec) const
if (_float_output) {
bool tmp_bool = _fraction_input; // stupid work-around
_fraction_input = false;
- tmp_str = (KNumber("1.0")*(*this)).toQString(width, -1);
+ tmp_str = (KNumber("1.0")*(*this)).toTQString(width, -1);
_fraction_input = tmp_bool;
} else { // _float_output == false
if(_splitoffinteger_output) {
@@ -378,9 +378,9 @@ TQString const KNumber::toQString(int width, int prec) const
if (int_part == Zero)
tmp_str = TQString(_num->ascii());
else if (int_part < Zero)
- tmp_str = int_part.toQString() + " " + (int_part - *this)._num->ascii();
+ tmp_str = int_part.toTQString() + " " + (int_part - *this)._num->ascii();
else
- tmp_str = int_part.toQString() + " " + (*this - int_part)._num->ascii();
+ tmp_str = int_part.toTQString() + " " + (*this - int_part)._num->ascii();
} else
tmp_str = TQString(_num->ascii());
@@ -388,7 +388,7 @@ TQString const KNumber::toQString(int width, int prec) const
//result needs to be cut-off
bool tmp_bool = _fraction_input; // stupid work-around
_fraction_input = false;
- tmp_str = (KNumber("1.0")*(*this)).toQString(width, -1);
+ tmp_str = (KNumber("1.0")*(*this)).toTQString(width, -1);
_fraction_input = tmp_bool;
}
}
diff --git a/kcalc/knumber/knumber.h b/kcalc/knumber/knumber.h
index 02fce32..2ca3b5c 100644
--- a/kcalc/knumber/knumber.h
+++ b/kcalc/knumber/knumber.h
@@ -36,8 +36,8 @@ class TQString;
* KNumber is based on the GMP (GNU Multiprecision) library and
* provides transparent support to integer, fractional and floating
* point number. It contains rudimentary error handling, and also
- * includes methods for converting the numbers to QStrings for
- * output, and to read QStrings to obtain a KNumber.
+ * includes methods for converting the numbers to TQStrings for
+ * output, and to read TQStrings to obtain a KNumber.
*
* The different types of numbers that can be represented by objects
* of this class will be described below:
@@ -130,7 +130,7 @@ class KDE_EXPORT KNumber
NumType type(void) const;
/**
- * Set whether the output of numbers (with KNumber::toQString)
+ * Set whether the output of numbers (with KNumber::toTQString)
* should happen as floating point numbers or not. This method has
* in fact only an effect on numbers of type @p
* NumType::FractionType, which can be either displayed as fractions
@@ -179,7 +179,7 @@ class KDE_EXPORT KNumber
* is ignored.
*
*/
- TQString const toQString(int width = -1, int prec = -1) const;
+ TQString const toTQString(int width = -1, int prec = -1) const;
/**
* Compute the absolute value, i.e. @p x.abs() returns the value
diff --git a/kcalc/knumber/knumber_priv.cpp b/kcalc/knumber/knumber_priv.cpp
index 56de7d3..8f69a5d 100644
--- a/kcalc/knumber/knumber_priv.cpp
+++ b/kcalc/knumber/knumber_priv.cpp
@@ -190,7 +190,7 @@ TQString const _knumerror::ascii(int prec) const
case MinusInfinity:
return TQString("-inf");
default:
- return TQString::null;
+ return TQString();
}
}
diff --git a/kcalc/knumber/tests/knumbertest.cpp b/kcalc/knumber/tests/knumbertest.cpp
index e34d94d..0d45355 100644
--- a/kcalc/knumber/tests/knumbertest.cpp
+++ b/kcalc/knumber/tests/knumbertest.cpp
@@ -32,13 +32,13 @@ void checkResult(TQString const &string, KNumber const & result,
{
std::cout << "Testing result of: " << string.ascii() <<
" should give " << desired_string.ascii() << " and gives " <<
- result.toQString(8).ascii() << "....\n";
+ result.toTQString(8).ascii() << "....\n";
std::cout << "The type of the result should be " <<
numtypeToString(desired).ascii() << " and gives " <<
numtypeToString(result.type()).ascii() << ".... ";
if (result.type() == desired &&
- result.toQString(8) == desired_string) {
+ result.toTQString(8) == desired_string) {
std::cout << "OK\n";
return;
}
diff --git a/kcalc/stats.cpp b/kcalc/stats.cpp
index 45da5c3..57b3d55 100644
--- a/kcalc/stats.cpp
+++ b/kcalc/stats.cpp
@@ -2,7 +2,7 @@
$Id$
KCalc, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
Copyright (C) 1996 Bernd Johannes Wuebben
wuebben@math.cornell.edu
diff --git a/kcalc/stats.h b/kcalc/stats.h
index aba11f4..e8d1037 100644
--- a/kcalc/stats.h
+++ b/kcalc/stats.h
@@ -2,7 +2,7 @@
$Id$
KCalc, a scientific calculator for the X window system using the
- Qt widget libraries, available at no cost at http://www.troll.no
+ TQt widget libraries, available at no cost at http://www.troll.no
Copyright (C) 1996 Bernd Johannes Wuebben
wuebben@math.cornell.edu
diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc
index fec2f86..6537090 100644
--- a/kcharselect/kcharselectdia.cc
+++ b/kcharselect/kcharselectdia.cc
@@ -21,12 +21,12 @@
/******************************************************************/
//==================================================================
-KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
+KCharSelectDia::KCharSelectDia(TQWidget *tqparent,const char *name,
const TQChar &_chr,const TQString &_font,
int _tableNum, bool direction)
- : KMainWindow(parent,name), vChr(_chr), vFont(_font)
+ : KMainWindow(tqparent,name), vChr(_chr), vFont(_font)
{
- setCaption(TQString::null); // Standard caption
+ setCaption(TQString()); // Standard caption
TQWidget *mainWidget = new TQWidget(this);
setCentralWidget(mainWidget);
@@ -35,7 +35,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
// Add character selection widget from library kdeui
charSelect = new KCharSelect(mainWidget,"",vFont,vChr,_tableNum);
- charSelect->resize(charSelect->sizeHint());
+ charSelect->resize(charSelect->tqsizeHint());
connect(charSelect,TQT_SIGNAL(highlighted(const TQChar &)),
TQT_SLOT(charChanged(const TQChar &)));
connect(charSelect,TQT_SIGNAL(activated(const TQChar &)),
@@ -46,7 +46,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
// Build line editor
lined = new TQLineEdit(mainWidget);
- lined->resize(lined->sizeHint());
+ lined->resize(lined->tqsizeHint());
TQFont font = lined->font();
font.setFamily( vFont );
@@ -59,7 +59,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
// Build some buttons
bHelp = new KPushButton( KStdGuiItem::help(), mainWidget );
connect(bHelp,TQT_SIGNAL(clicked()),this,TQT_SLOT(help()));
- bHelp->setFixedSize( bHelp->sizeHint() );
+ bHelp->setFixedSize( bHelp->tqsizeHint() );
grid->addWidget( bHelp, 2, 0 );
TQSpacerItem *space = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding );
@@ -67,46 +67,46 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
bClear = new KPushButton( KStdGuiItem::clear(), mainWidget );
connect(bClear,TQT_SIGNAL(clicked()),this,TQT_SLOT(clear()));
- bClear->setFixedSize( bClear->sizeHint() );
+ bClear->setFixedSize( bClear->tqsizeHint() );
grid->addWidget( bClear, 2, 2 );
bClip = new KPushButton( KGuiItem( i18n( "&To Clipboard" ),
"editcopy" ), mainWidget );
- bClip->setFixedSize( bClip->sizeHint() );
+ bClip->setFixedSize( bClip->tqsizeHint() );
connect(bClip,TQT_SIGNAL(clicked()),this,TQT_SLOT(toClip()));
grid->addWidget( bClip, 2, 3 );
// Build menu
- KStdAction::quit( this, TQT_SLOT(_exit()), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(_exit()), actionCollection() );
new KAction(i18n("&To Clipboard"), "editcopy",
- KStdAccel::shortcut(KStdAccel::Copy), this, TQT_SLOT(toClip()), actionCollection(), "copy_clip" );
+ KStdAccel::shortcut(KStdAccel::Copy), TQT_TQOBJECT(this), TQT_SLOT(toClip()), actionCollection(), "copy_clip" );
- (void)new KAction(i18n("To Clipboard &UTF-8"), 0, this,
+ (void)new KAction(i18n("To Clipboard &UTF-8"), 0, TQT_TQOBJECT(this),
TQT_SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" );
- (void)new KAction(i18n("To Clipboard &HTML"), 0, this,
+ (void)new KAction(i18n("To Clipboard &HTML"), 0, TQT_TQOBJECT(this),
TQT_SLOT(toClipHTML()), actionCollection(), "copy_html" );
new KAction(i18n("&From Clipboard"), "editpaste",
- KStdAccel::shortcut(KStdAccel::Paste), this, TQT_SLOT(fromClip()), actionCollection(), "from_clip" );
- (void)new KAction(i18n("From Clipboard UTF-8"), 0, this,
+ KStdAccel::shortcut(KStdAccel::Paste), TQT_TQOBJECT(this), TQT_SLOT(fromClip()), actionCollection(), "from_clip" );
+ (void)new KAction(i18n("From Clipboard UTF-8"), 0, TQT_TQOBJECT(this),
TQT_SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" );
i18n("From Clipboard HTML"); // Intended for future use
- KStdAction::clear(this, TQT_SLOT(clear()), actionCollection(), "clear");
- (void)new KAction(i18n("&Flip"), 0, this,
+ KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(clear()), actionCollection(), "clear");
+ (void)new KAction(i18n("&Flip"), 0, TQT_TQOBJECT(this),
TQT_SLOT(flipText()), actionCollection(), "flip" );
- (void)new KAction(i18n("&Alignment"), 0, this,
- TQT_SLOT(toggleEntryDirection()), actionCollection(), "alignment" );
+ (void)new KAction(i18n("&Alignment"), 0, TQT_TQOBJECT(this),
+ TQT_SLOT(toggleEntryDirection()), actionCollection(), "tqalignment" );
charSelect->setFocus();
entryDirection = direction;
if( entryDirection )
- lined->setAlignment( Qt::AlignRight );
+ lined->tqsetAlignment( TQt::AlignRight );
else
- lined->setAlignment( Qt::AlignLeft );
+ lined->tqsetAlignment( TQt::AlignLeft );
setupGUI(Keys|StatusBar|Save|Create);
}
@@ -148,7 +148,7 @@ void KCharSelectDia::add(const TQChar &_chr)
//==================================================================
void KCharSelectDia::toClip()
{
- QClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
cb->setSelectionMode( true );
cb->setText(lined->text());
cb->setSelectionMode( false );
@@ -161,7 +161,7 @@ void KCharSelectDia::toClip()
//
void KCharSelectDia::toClipUTF8()
{
- QClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
TQString str = lined->text();
cb->setText(str.utf8());
}
@@ -174,7 +174,7 @@ void KCharSelectDia::toClipUTF8()
//
void KCharSelectDia::toClipHTML()
{
- QClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
TQString input;
TQString html;
TQString tempstring;
@@ -185,13 +185,13 @@ void KCharSelectDia::toClipHTML()
for(i=0; i< input.length(); i++ )
{
tempchar = input.at(i);
- if( tempchar.latin1() && ((tempchar.unicode() < 128) || (tempchar.unicode() >= 128+32)) )
+ if( tempchar.latin1() && ((tempchar.tqunicode() < 128) || (tempchar.tqunicode() >= 128+32)) )
{
html.append(input.at(i));
}
else
{
- html.append(tempstring.sprintf("&#x%x;", tempchar.unicode()));
+ html.append(tempstring.sprintf("&#x%x;", tempchar.tqunicode()));
}
}
cb->setText(html);
@@ -201,7 +201,7 @@ void KCharSelectDia::toClipHTML()
//
void KCharSelectDia::fromClip()
{
- QClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
lined->setText( cb->text() );
}
@@ -213,7 +213,7 @@ void KCharSelectDia::fromClip()
//
void KCharSelectDia::fromClipUTF8()
{
- QClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
TQString str = cb->text();
lined->setText( str.fromUtf8( str.latin1() ) );
@@ -244,9 +244,9 @@ void KCharSelectDia::toggleEntryDirection()
{
entryDirection ^= 1;
if( entryDirection )
- lined->setAlignment( Qt::AlignRight );
+ lined->tqsetAlignment( TQt::AlignRight );
else
- lined->setAlignment( Qt::AlignLeft );
+ lined->tqsetAlignment( TQt::AlignLeft );
}
//==================================================================
@@ -266,7 +266,7 @@ void KCharSelectDia::_exit()
config->setGroup("General");
config->writeEntry("selectedFont",vFont);
- config->writeEntry("char",static_cast<int>(vChr.unicode()));
+ config->writeEntry("char",static_cast<int>(vChr.tqunicode()));
config->writeEntry("table",charSelect->tableNum());
config->writeEntry("entryDirection",entryDirection);
config->sync();
diff --git a/kcharselect/kcharselectdia.h b/kcharselect/kcharselectdia.h
index 6427c40..3ba9c93 100644
--- a/kcharselect/kcharselectdia.h
+++ b/kcharselect/kcharselectdia.h
@@ -25,9 +25,10 @@ static const char *version = "v1.1";
class KCharSelectDia : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCharSelectDia(TQWidget *parent,const char *name,const TQChar &_chr,const TQString &_font,int _tableNum, bool direction);
+ KCharSelectDia(TQWidget *tqparent,const char *name,const TQChar &_chr,const TQString &_font,int _tableNum, bool direction);
static bool selectChar(TQString &_font,TQChar &_chr,int _tableNum);
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index fdcfa3a..036974c 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -44,10 +44,10 @@
void IRKTrayIcon::mousePressEvent(TQMouseEvent *e)
{
- KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == LeftButton ? RightButton : e->button(), e->state()));
+ KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == Qt::LeftButton ? Qt::RightButton : e->button(), e->state()));
}
-IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQString::null)
+IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQString())
{
kapp->dcopClient()->setDefaultObject(obj);
theClient = new KLircClient();
@@ -195,7 +195,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
for(QCStringList::iterator i = buf.begin(); i != buf.end(); ++i)
{
TQString program = TQString::fromUtf8(*i);
- if(program.contains(r))
+ if(program.tqcontains(r))
programs += program;
}
if(programs.size() > 1 && action.ifMulti() == IM_DONTSEND)
@@ -206,7 +206,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
for(TQValueList<WId>::iterator i = s.fromLast(); i != s.end(); i--)
{ int p = KWin::info(*i).pid;
TQString id = action.program() + "-" + TQString().setNum(p);
- if(programs.contains(id))
+ if(programs.tqcontains(id))
{ programs.clear();
programs += id;
break;
@@ -220,7 +220,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
for(TQValueList<WId>::iterator i = s.begin(); i != s.end(); ++i)
{ int p = KWin::info(*i).pid;
TQString id = action.program() + "-" + TQString().setNum(p);
- if(programs.contains(id))
+ if(programs.tqcontains(id))
{ programs.clear();
programs += id;
break;
@@ -244,7 +244,7 @@ void IRKick::executeAction(const IRAction &action)
{ TQString sname = ProfileServer::profileServer()->getServiceName(action.program());
if(!sname.isNull())
{
- KPassivePopup::message("IRKick", i18n("Starting <b>%1</b>...").arg(action.application()), SmallIcon("irkick"), theTrayIcon);
+ KPassivePopup::message("IRKick", i18n("Starting <b>%1</b>...").tqarg(action.application()), SmallIcon("irkick"), theTrayIcon);
KApplication::startServiceByDesktopName(sname);
}
}
@@ -282,7 +282,7 @@ void IRKick::gotMessage(const TQString &theRemote, const TQString &theButton, in
if(!npApp.isNull())
{
TQString theApp = npApp;
- npApp = TQString::null;
+ npApp = TQString();
// send notifier by DCOP to npApp/npModule/npMethod(theRemote, theButton);
TQByteArray data; TQDataStream arg(data, IO_WriteOnly);
arg << theRemote << theButton;
@@ -330,7 +330,7 @@ void IRKick::stealNextPress(TQString app, TQString module, TQString method)
void IRKick::dontStealNextPress()
{
- npApp = TQString::null;
+ npApp = TQString();
}
#include "irkick.moc"
diff --git a/kdelirc/irkick/irkick.h b/kdelirc/irkick/irkick.h
index 92c2d9c..d55dcee 100644
--- a/kdelirc/irkick/irkick.h
+++ b/kdelirc/irkick/irkick.h
@@ -36,12 +36,13 @@ public:
KPopupMenu* contextMenu() const { return KSystemTray::contextMenu(); }
KActionCollection* actionCollection() { return KSystemTray::actionCollection(); }
- IRKTrayIcon(TQWidget *parent = 0, const char *name = 0): KSystemTray(parent, name) {}
+ IRKTrayIcon(TQWidget *tqparent = 0, const char *name = 0): KSystemTray(tqparent, name) {}
};
class IRKick: public TQObject, public DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
TQString npApp, npModule, npMethod;
diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp
index 3ce33d6..544eb2a 100644
--- a/kdelirc/irkick/klircclient.cpp
+++ b/kdelirc/irkick/klircclient.cpp
@@ -43,7 +43,7 @@
#include "klircclient.h"
-KLircClient::KLircClient(TQWidget *parent, const char *name) : TQObject(parent, name), theSocket(0), listIsUpToDate(false)
+KLircClient::KLircClient(TQWidget *tqparent, const char *name) : TQObject(tqparent, name), theSocket(0), listIsUpToDate(false)
{
connectToLirc();
}
@@ -177,14 +177,14 @@ void KLircClient::slotRead()
{
// <code> <repeat> <button name> <remote control name>
line.remove(0, 17); // strip code
- int pos = line.find(' ');
+ int pos = line.tqfind(' ');
if (pos < 0) return;
bool ok;
int repeat = line.left(pos).toInt(&ok, 16);
if (!ok) return;
line.remove(0, pos + 1);
- pos = line.find(' ');
+ pos = line.tqfind(' ');
if (pos < 0) return;
TQString btn = line.left(pos);
if(btn.startsWith("'") && btn.endsWith("'"))
@@ -223,7 +223,7 @@ const TQString KLircClient::readLine()
theSocket->waitForMore(500, &timeout);
if (timeout)
{ // something's wrong. there ain't no line comin!
- return TQString::null;
+ return TQString();
}
}
TQString line = theSocket->readLine();
diff --git a/kdelirc/irkick/klircclient.h b/kdelirc/irkick/klircclient.h
index e271b23..24089c8 100644
--- a/kdelirc/irkick/klircclient.h
+++ b/kdelirc/irkick/klircclient.h
@@ -26,9 +26,10 @@ class TQSocketNotifier;
@author Gav Wood
*/
-class KLircClient: public QObject
+class KLircClient: public TQObject
{
Q_OBJECT
+ TQ_OBJECT
private:
struct lirc_config *theConfig;
@@ -107,7 +108,7 @@ public:
*/
bool connectToLirc();
- KLircClient(TQWidget *parent = 0, const char *name = 0);
+ KLircClient(TQWidget *tqparent = 0, const char *name = 0);
~KLircClient();
};
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp
index f2d6ad3..1d13f19 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/kdelirc/kcmlirc/addaction.cpp
@@ -32,7 +32,7 @@
#include "profileserver.h"
#include "remoteserver.h"
-AddAction::AddAction(TQWidget *parent, const char *name, const Mode &mode): AddActionBase(parent, name), theMode(mode)
+AddAction::AddAction(TQWidget *tqparent, const char *name, const Mode &mode): AddActionBase(tqparent, name), theMode(mode)
{
connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( updateForPageChange() ));
connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( slotCorrectPage() ));
@@ -92,12 +92,12 @@ void AddAction::updateButton(const TQString &remote, const TQString &button)
{
if(theMode.remote() == remote)
{ // note this isn't the "correct" way of doing it; really i should iterate throughg the items and try to find the item which when put through buttonMap[item] returns the current button name. but i cant be arsed.
- theButtons->setCurrentItem(theButtons->findItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
- theButtons->ensureItemVisible(theButtons->findItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
+ theButtons->setCurrentItem(theButtons->tqfindItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
+ theButtons->ensureItemVisible(theButtons->tqfindItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
}
else
KMessageBox::error(this, i18n( "You did not select a mode of that remote control. Please use %1, "
- "or revert back to select a different mode." ).arg( theMode.remoteName() ),
+ "or revert back to select a different mode." ).tqarg( theMode.remoteName() ),
i18n( "Incorrect Remote Control Detected" ));
if(indexOf(currentPage()) == 1)
@@ -149,7 +149,7 @@ const TQStringList AddAction::getFunctions(const TQString app, const TQString ob
if( *i != "QCStringList interfaces()" &&
*i != "QCStringList functions()" &&
*i != "QCStringList objects()" &&
- *i != "QCStringList find(TQCString)" )
+ *i != "QCStringList tqfind(TQCString)" )
ret += TQString::fromUtf8(*i);
return ret;
}
@@ -180,7 +180,7 @@ void AddAction::updateOptions()
else if(theUseDCOP->isChecked())
{
if(!theObjects->selectedItem()) return;
- TQListViewItem* i = theObjects->selectedItem()->parent();
+ TQListViewItem* i = theObjects->selectedItem()->tqparent();
if(!i) return;
isUnique = uniqueProgramMap[i];
TQRegExp r("(.*)-[0-9]+");
@@ -262,19 +262,19 @@ void AddAction::updateParameter()
if(theParameters->currentItem())
{ TQString type = theParameters->currentItem()->text(2);
int index = theParameters->currentItem()->text(3).toInt() - 1;
- if(type.find("int") != -1 || type.find("short") != -1 || type.find("long") != -1)
+ if(type.tqfind("int") != -1 || type.tqfind("short") != -1 || type.tqfind("long") != -1)
{ theValue->raiseWidget(2);
theValueIntNumInput->setValue(theArguments[index].toInt());
}
- else if(type.find("double") != -1 || type.find("float") != -1)
+ else if(type.tqfind("double") != -1 || type.tqfind("float") != -1)
{ theValue->raiseWidget(3);
theValueDoubleNumInput->setValue(theArguments[index].toDouble());
}
- else if(type.find("bool") != -1)
+ else if(type.tqfind("bool") != -1)
{ theValue->raiseWidget(1);
theValueCheckBox->setChecked(theArguments[index].toBool());
}
- else if(type.find("TQStringList") != -1)
+ else if(type.tqfind(TQSTRINGLIST_OBJECT_NAME_STRING) != -1)
{ theValue->raiseWidget(4);
TQStringList backup = theArguments[index].toStringList();
// backup needed because calling clear will kill what ever has been saved.
@@ -307,13 +307,13 @@ void AddAction::slotParameterChanged()
if(!theParameters->currentItem()) return;
int index = theParameters->currentItem()->text(3).toInt() - 1;
TQString type = theParameters->currentItem()->text(2);
- if(type.find("int") != -1 || type.find("short") != -1 || type.find("long") != -1)
+ if(type.tqfind("int") != -1 || type.tqfind("short") != -1 || type.tqfind("long") != -1)
theArguments[index].asInt() = theValueIntNumInput->value();
- else if(type.find("double") != -1 || type.find("float") != -1)
+ else if(type.tqfind("double") != -1 || type.tqfind("float") != -1)
theArguments[index].asDouble() = theValueDoubleNumInput->value();
- else if(type.find("bool") != -1)
+ else if(type.tqfind("bool") != -1)
theArguments[index].asBool() = theValueCheckBox->isChecked();
- else if(type.find("TQStringList") != -1)
+ else if(type.tqfind(TQSTRINGLIST_OBJECT_NAME_STRING) != -1)
theArguments[index].asStringList() = theValueEditListBox->items();
else
theArguments[index].asString() = theValueLineEdit->text();
@@ -339,11 +339,11 @@ void AddAction::updateObjects()
QCStringList theApps = theClient->registeredApplications();
for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
{
- if(!TQString(*i).find("anonymous")) continue;
- if(!TQString(*i).find(i18n( "anonymous" ))) continue;
+ if(!TQString(*i).tqfind("anonymous")) continue;
+ if(!TQString(*i).tqfind(i18n( "anonymous" ))) continue;
TQRegExp r("(.*)-[0-9]+");
TQString name = r.exactMatch(TQString(*i)) ? r.cap(1) : *i;
- if(names.contains(name)) continue;
+ if(names.tqcontains(name)) continue;
names += name;
KListViewItem *a = new KListViewItem(theObjects, name);
@@ -361,8 +361,8 @@ void AddAction::updateObjects()
void AddAction::updateFunctions()
{
theFunctions->clear();
- if(theObjects->currentItem() && theObjects->currentItem()->parent())
- { TQStringList functions = getFunctions(nameProgramMap[theObjects->currentItem()->parent()], theObjects->currentItem()->text(0));
+ if(theObjects->currentItem() && theObjects->currentItem()->tqparent())
+ { TQStringList functions = getFunctions(nameProgramMap[theObjects->currentItem()->tqparent()], theObjects->currentItem()->text(0));
for(TQStringList::iterator i = functions.begin(); i != functions.end(); ++i)
{ Prototype p((TQString)(*i));
new KListViewItem(theFunctions, p.name(), p.argumentList(), *i);
diff --git a/kdelirc/kcmlirc/addaction.h b/kdelirc/kcmlirc/addaction.h
index 821c6b5..b95fd17 100644
--- a/kdelirc/kcmlirc/addaction.h
+++ b/kdelirc/kcmlirc/addaction.h
@@ -27,6 +27,7 @@ class TQListViewItem;
class AddAction : public AddActionBase
{
Q_OBJECT
+ TQ_OBJECT
int curPage;
Mode theMode;
@@ -66,7 +67,7 @@ public:
TQMap<TQListViewItem *, bool> uniqueProgramMap;
TQMap<TQListViewItem *, TQString> nameProgramMap;
- AddAction(TQWidget *parent, const char *name, const Mode &mode);
+ AddAction(TQWidget *tqparent, const char *name, const Mode &mode);
~AddAction();
};
diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui
index 092463a..e60a89f 100644
--- a/kdelirc/kcmlirc/addactionbase.ui
+++ b/kdelirc/kcmlirc/addactionbase.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>AddActionBase</class>
<author>Gav Wood</author>
-<widget class="QWizard">
+<widget class="TQWizard">
<property name="name">
<cstring>AddActionBase</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="caption">
<string>Add Action</string>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -27,7 +27,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup" row="0" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>buttonGroup1</cstring>
</property>
@@ -52,7 +52,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theUseProfile</cstring>
</property>
@@ -63,9 +63,9 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout14</cstring>
+ <cstring>tqlayout14</cstring>
</property>
<hbox>
<property name="name">
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>81</width>
<height>31</height>
@@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>101</width>
<height>31</height>
@@ -144,14 +144,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>311</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theUseDCOP</cstring>
</property>
@@ -169,14 +169,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>321</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theChangeMode</cstring>
</property>
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -205,7 +205,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -216,20 +216,20 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theButtonText</cstring>
</property>
<property name="text">
<string>You are attempting to configure an action for a button on [remote] (in mode [mode]). Press a button on this remote control or select from the list.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
@@ -245,7 +245,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>41</height>
@@ -289,7 +289,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>31</height>
@@ -300,7 +300,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -311,7 +311,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QSplitter">
+ <widget class="TQSplitter">
<property name="name">
<cstring>splitter8</cstring>
</property>
@@ -412,9 +412,9 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<vbox>
<property name="name">
@@ -474,7 +474,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -485,7 +485,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup" row="0" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>buttonGroup4</cstring>
</property>
@@ -499,7 +499,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theNotJustStart</cstring>
</property>
@@ -510,9 +510,9 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout37</cstring>
+ <cstring>tqlayout37</cstring>
</property>
<hbox>
<property name="name">
@@ -528,7 +528,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -586,7 +586,7 @@
</widget>
</hbox>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theJustStart</cstring>
</property>
@@ -604,7 +604,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>81</height>
@@ -615,7 +615,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -675,17 +675,17 @@
<cstring>theParameters</cstring>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout35</cstring>
+ <cstring>tqlayout35</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout34</cstring>
+ <cstring>tqlayout34</cstring>
</property>
<vbox>
<property name="name">
@@ -701,14 +701,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>111</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theCurParameter</cstring>
</property>
@@ -739,14 +739,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>146</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QWidgetStack">
+ <widget class="TQWidgetStack">
<property name="name">
<cstring>theValue</cstring>
</property>
@@ -761,7 +761,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -785,7 +785,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>61</height>
@@ -802,7 +802,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -826,14 +826,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>61</height>
</size>
</property>
</spacer>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theValueCheckBox</cstring>
</property>
@@ -846,7 +846,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -870,7 +870,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>61</height>
@@ -884,7 +884,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -908,7 +908,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>51</height>
@@ -922,7 +922,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -957,7 +957,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>147</width>
<height>21</height>
@@ -968,7 +968,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -979,7 +979,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -1006,7 +1006,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theRepeat</cstring>
</property>
@@ -1014,7 +1014,7 @@
<string>This action is &amp;repeatable if the button is held down</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theAutoStart</cstring>
</property>
@@ -1035,14 +1035,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>670</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theIMTop</cstring>
</property>
@@ -1075,7 +1075,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theIMLabel</cstring>
</property>
@@ -1085,11 +1085,11 @@
<property name="text">
<string>This application may have multiple instances. In the case of having multiple instances at once when this action should be executed, choose a course of action:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>theIMGroup</cstring>
</property>
@@ -1112,7 +1112,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theDontSend</cstring>
</property>
@@ -1126,7 +1126,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToTop</cstring>
</property>
@@ -1137,7 +1137,7 @@
<string>Send the action to the instance hi&amp;ghest in the window stacking order</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToBottom</cstring>
</property>
@@ -1148,7 +1148,7 @@
<string>Send the action to the instance &amp;lowest in window stacking order</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToAll</cstring>
</property>
@@ -1171,7 +1171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>170</height>
@@ -1180,7 +1180,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -1191,7 +1191,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup" row="0" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>buttonGroup3</cstring>
</property>
@@ -1208,7 +1208,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSwitchMode</cstring>
</property>
@@ -1216,9 +1216,9 @@
<string>&amp;Switch to mode:</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
@@ -1234,7 +1234,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>131</width>
<height>31</height>
@@ -1278,7 +1278,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>131</width>
<height>31</height>
@@ -1287,7 +1287,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theExitMode</cstring>
</property>
@@ -1308,14 +1308,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>551</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -1337,7 +1337,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theDoBefore</cstring>
</property>
@@ -1348,7 +1348,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theDoAfter</cstring>
</property>
@@ -1366,7 +1366,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -1574,7 +1574,7 @@
<slot>accept()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot>updateFunctions()</slot>
<slot>updateParameter()</slot>
<slot>updateParameters()</slot>
@@ -1587,8 +1587,8 @@
<slot>updateForPageChange()</slot>
<slot>slotParameterChanged()</slot>
<slot>updateOptions()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp
index 594e4a2..a48ece9 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/kdelirc/kcmlirc/editaction.cpp
@@ -35,7 +35,7 @@
#include "editaction.h"
#include "addaction.h"
-EditAction::EditAction(IRAIt action, TQWidget *parent, const char *name) : EditActionBase(parent, name)
+EditAction::EditAction(IRAIt action, TQWidget *tqparent, const char *name) : EditActionBase(tqparent, name)
{
theAction = action;
@@ -175,7 +175,7 @@ void EditAction::updateArguments()
}
theArguments->setEnabled(p.count());
for(unsigned i = 0; i < p.count(); i++)
- { theArguments->insertItem(TQString().setNum(i + 1) + ": " + (p.name(i).isEmpty() ? p.type(i) : p.name(i) + " (" + p.type(i) + ")"));
+ { theArguments->insertItem(TQString(TQString().setNum(i + 1) + ": " + (p.name(i).isEmpty() ? p.type(i) : p.name(i) + " (" + p.type(i) + ")")));
arguments[i].cast(TQVariant::nameToType(p.type(i).utf8()));
}
if(p.count()) updateArgument(0); else updateArgument(-1);
@@ -319,10 +319,10 @@ void EditAction::updateDCOPApplications()
QCStringList theApps = theClient->registeredApplications();
for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
{
- if(!TQString(*i).find("anonymous")) continue;
+ if(!TQString(*i).tqfind("anonymous")) continue;
TQRegExp r("(.*)-[0-9]+");
TQString name = r.exactMatch(TQString(*i)) ? r.cap(1) : *i;
- if(names.contains(name)) continue;
+ if(names.tqcontains(name)) continue;
names += name;
theDCOPApplications->insertItem(name);
diff --git a/kdelirc/kcmlirc/editaction.h b/kdelirc/kcmlirc/editaction.h
index 7efa7ca..b3d3939 100644
--- a/kdelirc/kcmlirc/editaction.h
+++ b/kdelirc/kcmlirc/editaction.h
@@ -26,6 +26,7 @@
class EditAction : public EditActionBase
{
Q_OBJECT
+ TQ_OBJECT
IRAIt theAction;
TQMap<TQString, TQString> applicationMap, functionMap;
TQMap<TQString, TQString> nameProgramMap;
@@ -48,7 +49,7 @@ public:
virtual void updateDCOPObjects();
virtual void updateDCOPFunctions();
- EditAction(IRAIt action, TQWidget *parent = 0, const char *name = 0);
+ EditAction(IRAIt action, TQWidget *tqparent = 0, const char *name = 0);
~EditAction();
};
diff --git a/kdelirc/kcmlirc/editactionbase.ui b/kdelirc/kcmlirc/editactionbase.ui
index 02e238c..df4576f 100644
--- a/kdelirc/kcmlirc/editactionbase.ui
+++ b/kdelirc/kcmlirc/editactionbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>EditActionBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>EditActionBase</cstring>
</property>
@@ -22,11 +22,11 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QTabWidget">
+ <widget class="TQTabWidget">
<property name="name">
<cstring>tabWidget3</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -37,7 +37,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>buttonGroup3</cstring>
</property>
@@ -54,15 +54,15 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout40</cstring>
+ <cstring>tqlayout40</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QComboBox" row="2" column="3">
+ <widget class="TQComboBox" row="2" column="3">
<property name="name">
<cstring>theDCOPApplications</cstring>
</property>
@@ -78,7 +78,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QLabel" row="3" column="1" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="3" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel4_3</cstring>
</property>
@@ -92,7 +92,7 @@
<cstring>theDCOPObjects</cstring>
</property>
</widget>
- <widget class="QButtonGroup" row="1" column="1" rowspan="1" colspan="3">
+ <widget class="TQButtonGroup" row="1" column="1" rowspan="1" colspan="3">
<property name="name">
<cstring>buttonGroup5</cstring>
</property>
@@ -109,7 +109,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton" row="0" column="0">
+ <widget class="TQRadioButton" row="0" column="0">
<property name="name">
<cstring>theNotJustStart</cstring>
</property>
@@ -128,7 +128,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<property name="name">
<cstring>theFunctions</cstring>
</property>
@@ -141,7 +141,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="3">
+ <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>theJustStart</cstring>
</property>
@@ -151,7 +151,7 @@
</widget>
</grid>
</widget>
- <widget class="QLabel" row="4" column="1" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel4_2</cstring>
</property>
@@ -165,7 +165,7 @@
<cstring>theDCOPFunctions</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -176,7 +176,7 @@
<cstring>theApplications</cstring>
</property>
</widget>
- <widget class="QComboBox" row="0" column="2" rowspan="1" colspan="2">
+ <widget class="TQComboBox" row="0" column="2" rowspan="1" colspan="2">
<property name="name">
<cstring>theApplications</cstring>
</property>
@@ -189,7 +189,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QComboBox" row="4" column="3">
+ <widget class="TQComboBox" row="4" column="3">
<property name="name">
<cstring>theDCOPFunctions</cstring>
</property>
@@ -197,7 +197,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QRadioButton" row="0" column="0">
+ <widget class="TQRadioButton" row="0" column="0">
<property name="name">
<cstring>theUseProfile</cstring>
</property>
@@ -208,7 +208,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel5_2</cstring>
</property>
@@ -222,7 +222,7 @@
<cstring>theDCOPApplications</cstring>
</property>
</widget>
- <widget class="QRadioButton" row="2" column="0">
+ <widget class="TQRadioButton" row="2" column="0">
<property name="name">
<cstring>theUseDCOP</cstring>
</property>
@@ -230,7 +230,7 @@
<string>Use &amp;DCOP:</string>
</property>
</widget>
- <widget class="QComboBox" row="3" column="3">
+ <widget class="TQComboBox" row="3" column="3">
<property name="name">
<cstring>theDCOPObjects</cstring>
</property>
@@ -240,15 +240,15 @@
</widget>
</grid>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout36</cstring>
+ <cstring>tqlayout36</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QWidgetStack" row="0" column="2" rowspan="2" colspan="1">
+ <widget class="TQWidgetStack" row="0" column="2" rowspan="2" colspan="1">
<property name="name">
<cstring>theValue</cstring>
</property>
@@ -263,7 +263,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>91</height>
@@ -304,7 +304,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -318,7 +318,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theValueCheckBox</cstring>
</property>
@@ -339,7 +339,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>101</height>
@@ -348,7 +348,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -377,7 +377,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>101</height>
@@ -386,7 +386,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -415,7 +415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>101</height>
@@ -424,7 +424,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -467,14 +467,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>111</height>
</size>
</property>
</spacer>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<property name="name">
<cstring>theArguments</cstring>
</property>
@@ -486,7 +486,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>106</width>
<height>0</height>
@@ -503,14 +503,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>101</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel8</cstring>
</property>
@@ -533,22 +533,22 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>481</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout17</cstring>
+ <cstring>tqlayout17</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theChangeMode</cstring>
</property>
@@ -556,7 +556,7 @@
<string>Change &amp;mode to:</string>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<property name="name">
<cstring>theModes</cstring>
</property>
@@ -584,7 +584,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -595,7 +595,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -606,7 +606,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -628,7 +628,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theRepeat</cstring>
</property>
@@ -636,7 +636,7 @@
<string>&amp;Action repeats if button is held down</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theAutoStart</cstring>
</property>
@@ -654,14 +654,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>491</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -683,7 +683,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theDoBefore</cstring>
</property>
@@ -697,7 +697,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theDoAfter</cstring>
</property>
@@ -718,14 +718,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>670</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theIMTop</cstring>
</property>
@@ -758,7 +758,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theIMLabel</cstring>
</property>
@@ -768,11 +768,11 @@
<property name="text">
<string>This application may have multiple instances. In the case of having multiple instances at once when this action should be executed, choose a course of action:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>theIMGroup</cstring>
</property>
@@ -795,7 +795,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theDontSend</cstring>
</property>
@@ -809,7 +809,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToTop</cstring>
</property>
@@ -820,7 +820,7 @@
<string>Send the action to the instance hi&amp;ghest in window stacking order</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToBottom</cstring>
</property>
@@ -831,7 +831,7 @@
<string>Send the action to the instance &amp;lowest in window stacking order</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToAll</cstring>
</property>
@@ -854,7 +854,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -864,7 +864,7 @@
</vbox>
</widget>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout1</cstring>
</property>
@@ -878,7 +878,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonHelp</cstring>
</property>
@@ -902,14 +902,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -923,7 +923,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -1263,7 +1263,7 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
-<slots>
+<Q_SLOTS>
<slot>updateFunctions()</slot>
<slot>updateApplications()</slot>
<slot>updateDCOPApplications()</slot>
@@ -1273,8 +1273,8 @@
<slot>updateArgument(int)</slot>
<slot>slotParameterChanged()</slot>
<slot>updateOptions()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/kdelirc/kcmlirc/editmode.cpp b/kdelirc/kcmlirc/editmode.cpp
index aad27da..6092e96 100644
--- a/kdelirc/kcmlirc/editmode.cpp
+++ b/kdelirc/kcmlirc/editmode.cpp
@@ -16,7 +16,7 @@
#include "editmode.h"
-EditMode::EditMode(TQWidget *parent, const char *name, bool modal, WFlags fl) : EditModeBase(parent, name, modal, fl)
+EditMode::EditMode(TQWidget *tqparent, const char *name, bool modal, WFlags fl) : EditModeBase(tqparent, name, modal, fl)
{
theIcon->setIconType(KIcon::Panel, KIcon::Any);
}
diff --git a/kdelirc/kcmlirc/editmode.h b/kdelirc/kcmlirc/editmode.h
index df3c888..8ea0c45 100644
--- a/kdelirc/kcmlirc/editmode.h
+++ b/kdelirc/kcmlirc/editmode.h
@@ -21,12 +21,13 @@
class EditMode : public EditModeBase
{
Q_OBJECT
+ TQ_OBJECT
public:
void slotCheckText(const TQString &newText);
void slotClearIcon();
- EditMode(TQWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0);
+ EditMode(TQWidget *tqparent = 0, const char *name = 0, bool modal = false, WFlags fl = 0);
~EditMode();
};
diff --git a/kdelirc/kcmlirc/editmodebase.ui b/kdelirc/kcmlirc/editmodebase.ui
index dd26940..a0f4b27 100644
--- a/kdelirc/kcmlirc/editmodebase.ui
+++ b/kdelirc/kcmlirc/editmodebase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>EditModeBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>EditModeBase</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -41,15 +41,15 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout25</cstring>
+ <cstring>tqlayout25</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -60,9 +60,9 @@
<cstring>theIcon</cstring>
</property>
</widget>
- <widget class="QLayoutWidget" row="1" column="1">
+ <widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout24</cstring>
+ <cstring>tqlayout24</cstring>
</property>
<hbox>
<property name="name">
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>21</height>
@@ -114,7 +114,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLineEdit" row="0" column="1">
+ <widget class="TQLineEdit" row="0" column="1">
<property name="name">
<cstring>theName</cstring>
</property>
@@ -122,7 +122,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -145,14 +145,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>410</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -174,7 +174,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theDefault</cstring>
</property>
@@ -192,7 +192,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -213,9 +213,9 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout15</cstring>
+ <cstring>tqlayout15</cstring>
</property>
<hbox>
<property name="name">
@@ -231,7 +231,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>231</width>
<height>20</height>
@@ -289,11 +289,11 @@
<slot>slotClearIcon()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot>slotCheckText(const QString &amp;)</slot>
<slot>slotClearIcon()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kicondialog.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index b248127..2fc7313 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -49,7 +49,7 @@
typedef KGenericFactory<KCMLirc, TQWidget> theFactory;
K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc"))
-KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name)
+KCMLirc::KCMLirc(TQWidget *tqparent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(tqparent, name)
{
KGlobal::locale()->insertCatalogue( "kcmlirc" );
setAboutData(new KAboutData("kcmlirc", I18N_NOOP("KDE Lirc"), VERSION, I18N_NOOP("The KDE IR Remote Control System"), KAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure KDE's infrared remote control system in order to control any KDE application with your infrared remote control."), "http://www.kde.org"));
@@ -74,8 +74,8 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
(new TQHBoxLayout(this))->setAutoAdd(true);
theKCMLircBase = new KCMLircBase(this);
connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateActions() ));
- connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModesStatus(TQListViewItem *) ));
- connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionsStatus(TQListViewItem *) ));
+ connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModestqStatus(TQListViewItem *) ));
+ connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionstqStatus(TQListViewItem *) ));
connect(theKCMLircBase->theExtensions, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateInformation() ));
connect(theKCMLircBase->theModes, TQT_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQT_SLOT( slotRenamed(TQListViewItem *) ));
connect(theKCMLircBase->theModes, TQT_SIGNAL(dropped(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)));
@@ -94,17 +94,17 @@ KCMLirc::~KCMLirc()
{
}
-void KCMLirc::updateModesStatus(TQListViewItem *item)
+void KCMLirc::updateModestqStatus(TQListViewItem *item)
{
- theKCMLircBase->theModes->setItemsRenameable(item && item->parent());
+ theKCMLircBase->theModes->setItemsRenameable(item && item->tqparent());
theKCMLircBase->theAddActions->setEnabled(ProfileServer::profileServer()->profiles().count() && theKCMLircBase->theModes->selectedItem() && RemoteServer::remoteServer()->remotes()[modeMap[theKCMLircBase->theModes->selectedItem()].remote()]);
theKCMLircBase->theAddAction->setEnabled(item);
theKCMLircBase->theAddMode->setEnabled(item);
- theKCMLircBase->theRemoveMode->setEnabled(item && item->parent());
+ theKCMLircBase->theRemoveMode->setEnabled(item && item->tqparent());
theKCMLircBase->theEditMode->setEnabled(item);
}
-void KCMLirc::updateActionsStatus(TQListViewItem *item)
+void KCMLirc::updateActionstqStatus(TQListViewItem *item)
{
theKCMLircBase->theRemoveAction->setEnabled(item);
theKCMLircBase->theEditAction->setEnabled(item);
@@ -114,7 +114,7 @@ void KCMLirc::slotRenamed(TQListViewItem *item)
{
if(!item) return;
- if(item->parent() && item->text(0) != modeMap[item].name())
+ if(item->tqparent() && item->text(0) != modeMap[item].name())
{ allActions.renameMode(modeMap[item], item->text(0));
allModes.rename(modeMap[item], item->text(0));
emit changed(true);
@@ -128,7 +128,7 @@ void KCMLirc::slotEditAction()
EditAction theDialog(actionMap[theKCMLircBase->theActions->currentItem()], this);
TQListViewItem *item = theKCMLircBase->theModes->currentItem();
- if(item->parent()) item = item->parent();
+ if(item->tqparent()) item = item->tqparent();
theDialog.theModes->insertItem(i18n("[Exit current mode]"));
for(item = item->firstChild(); item; item = item->nextSibling())
theDialog.theModes->insertItem(item->text(0));
@@ -166,7 +166,7 @@ void KCMLirc::slotAddAction()
// populate the modes list box
TQListViewItem *item = theKCMLircBase->theModes->selectedItem();
- if(item->parent()) item = item->parent();
+ if(item->tqparent()) item = item->tqparent();
theDialog.theModes->setEnabled(item->firstChild());
theDialog.theSwitchMode->setEnabled(item->firstChild());
for(item = item->firstChild(); item; item = item->nextSibling())
@@ -202,7 +202,7 @@ void KCMLirc::slotAddAction()
a.setRepeat(false);
}
// DCOP?
- else if(theDialog.theUseDCOP->isChecked() && theDialog.theObjects->selectedItem() && theDialog.theObjects->selectedItem()->parent() && theDialog.theFunctions->selectedItem())
+ else if(theDialog.theUseDCOP->isChecked() && theDialog.theObjects->selectedItem() && theDialog.theObjects->selectedItem()->tqparent() && theDialog.theFunctions->selectedItem())
{
a.setProgram(theDialog.program);
a.setObject(theDialog.theObjects->selectedItem()->text(0));
@@ -267,7 +267,8 @@ void KCMLirc::autoPopulate(const Profile &profile, const Remote &remote, const T
Arguments l;
// argument count should be either 0 or 1. undefined if > 1.
if(Prototype(pa->prototype()).argumentCount() == 1)
- { l.append(TQString().setNum(i.current()->parameter().toFloat() * pa->multiplier()));
+ {
+ l.append(TQString(TQString().setNum(i.current()->parameter().toFloat() * pa->multiplier())));
l.back().cast(TQVariant::nameToType(Prototype(pa->prototype()).type(0).utf8()));
}
a.setArguments(l);
@@ -283,7 +284,7 @@ void KCMLirc::slotAddMode()
NewMode theDialog(this, 0);
TQMap<TQListViewItem *, TQString> remoteMap;
TQListViewItem *tr = theKCMLircBase->theModes->selectedItem();
- if(tr) if(tr->parent()) tr = tr->parent();
+ if(tr) if(tr->tqparent()) tr = tr->tqparent();
for(TQListViewItem *i = theKCMLircBase->theModes->firstChild(); i; i = i->nextSibling())
{ KListViewItem *a = new KListViewItem(theDialog.theRemotes, i->text(0));
remoteMap[a] = modeMap[i].remote();
@@ -304,7 +305,7 @@ void KCMLirc::slotEditMode()
EditMode theDialog(this, 0);
Mode &mode = modeMap[theKCMLircBase->theModes->selectedItem()];
- theDialog.theName->setEnabled(theKCMLircBase->theModes->selectedItem()->parent());
+ theDialog.theName->setEnabled(theKCMLircBase->theModes->selectedItem()->tqparent());
theDialog.theName->setText(mode.name().isEmpty() ? mode.remoteName() : mode.name());
if(!mode.iconFile().isNull())
theDialog.theIcon->setIcon(mode.iconFile());
@@ -315,7 +316,7 @@ void KCMLirc::slotEditMode()
if(theDialog.exec() == TQDialog::Accepted)
{ kdDebug() << "Setting icon : " << theDialog.theIcon->icon() << endl;
- mode.setIconFile(theDialog.theIcon->icon().isEmpty() ? TQString::null : theDialog.theIcon->icon());
+ mode.setIconFile(theDialog.theIcon->icon().isEmpty() ? TQString() : theDialog.theIcon->icon());
allModes.updateMode(mode);
if(!mode.name().isEmpty())
{ allActions.renameMode(mode, theDialog.theName->text());
@@ -330,9 +331,9 @@ void KCMLirc::slotEditMode()
void KCMLirc::slotRemoveMode()
{
if(!theKCMLircBase->theModes->selectedItem()) return;
- if(!theKCMLircBase->theModes->selectedItem()->parent()) return;
+ if(!theKCMLircBase->theModes->selectedItem()->tqparent()) return;
- if(KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove %1 and all its actions?").arg(theKCMLircBase->theModes->selectedItem()->text(0)), i18n("Erase Actions?")) == KMessageBox::Continue)
+ if(KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove %1 and all its actions?").tqarg(theKCMLircBase->theModes->selectedItem()->text(0)), i18n("Erase Actions?")) == KMessageBox::Continue)
{
allModes.erase(modeMap[theKCMLircBase->theModes->selectedItem()]);
updateModes();
@@ -373,10 +374,10 @@ void KCMLirc::updateActions()
theKCMLircBase->theActions->clear();
actionMap.clear();
- if(!theKCMLircBase->theModes->selectedItem()) { updateActionsStatus(0); return; }
+ if(!theKCMLircBase->theModes->selectedItem()) { updateActionstqStatus(0); return; }
Mode m = modeMap[theKCMLircBase->theModes->selectedItem()];
- theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions <i>always</i> available") : i18n("Actions available only in mode <b>%1</b>").arg(m.name())));
+ theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions <i>always</i> available") : i18n("Actions available only in mode <b>%1</b>").tqarg(m.name())));
IRAItList l = allActions.findByMode(m);
for(IRAItList::iterator i = l.begin(); i != l.end(); ++i)
{ TQListViewItem *b = new KListViewItem(theKCMLircBase->theActions, (**i).buttonName(), (**i).application(), (**i).function(), (**i).arguments().toString(), (**i).notes());
@@ -386,7 +387,7 @@ void KCMLirc::updateActions()
if(theKCMLircBase->theActions->currentItem())
theKCMLircBase->theActions->currentItem()->setSelected(true);
- updateActionsStatus(theKCMLircBase->theActions->currentItem());
+ updateActionstqStatus(theKCMLircBase->theActions->currentItem());
}
void KCMLirc::gotButton(TQString remote, TQString button)
@@ -428,7 +429,7 @@ void KCMLirc::updateModes()
}
if(theKCMLircBase->theModes->currentItem())
theKCMLircBase->theModes->currentItem()->setSelected(true);
- updateModesStatus(theKCMLircBase->theModes->currentItem());
+ updateModestqStatus(theKCMLircBase->theModes->currentItem());
updateActions();
}
@@ -464,15 +465,15 @@ void KCMLirc::updateInformation()
if(!theKCMLircBase->theExtensions->selectedItem()) return;
- if(!theKCMLircBase->theExtensions->selectedItem()->parent())
+ if(!theKCMLircBase->theExtensions->selectedItem()->tqparent())
{
- theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").arg(theKCMLircBase->theExtensions->selectedItem()->text(0)));
+ theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(theKCMLircBase->theExtensions->selectedItem()->text(0)));
if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Applications"))
new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Applications"), TQString().setNum(theKCMLircBase->theExtensions->selectedItem()->childCount()));
else if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Remote Controls"))
new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Remote Controls"), TQString().setNum(theKCMLircBase->theExtensions->selectedItem()->childCount()));
}
- else if(theKCMLircBase->theExtensions->selectedItem()->parent()->text(0) == i18n("Applications"))
+ else if(theKCMLircBase->theExtensions->selectedItem()->tqparent()->text(0) == i18n("Applications"))
{
ProfileServer *theServer = ProfileServer::profileServer();
const Profile *p = theServer->profiles()[profileMap[theKCMLircBase->theExtensions->selectedItem()]];
@@ -480,9 +481,9 @@ void KCMLirc::updateInformation()
new TQListViewItem(theKCMLircBase->theInformation, i18n("Extension Author"), p->author());
new TQListViewItem(theKCMLircBase->theInformation, i18n("Application Identifier"), p->id());
new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Actions"), TQString().setNum(p->actions().count()));
- theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").arg(p->name()));
+ theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(p->name()));
}
- else if(theKCMLircBase->theExtensions->selectedItem()->parent()->text(0) == i18n("Remote Controls"))
+ else if(theKCMLircBase->theExtensions->selectedItem()->tqparent()->text(0) == i18n("Remote Controls"))
{
RemoteServer *theServer = RemoteServer::remoteServer();
const Remote *p = theServer->remotes()[remoteMap[theKCMLircBase->theExtensions->selectedItem()]];
@@ -490,7 +491,7 @@ void KCMLirc::updateInformation()
new TQListViewItem(theKCMLircBase->theInformation, i18n("Extension Author"), p->author());
new TQListViewItem(theKCMLircBase->theInformation, i18n("Remote Control Identifier"), p->id());
new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Buttons"), TQString().setNum(p->buttons().count()));
- theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").arg(p->name()));
+ theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(p->name()));
}
}
@@ -533,9 +534,9 @@ void KCMLirc::configChanged()
// TODO: Take this out when I know how
extern "C"
{
- KDE_EXPORT KCModule *create_kcmlirc(TQWidget *parent, const char *)
+ KDE_EXPORT KCModule *create_kcmlirc(TQWidget *tqparent, const char *)
{ KGlobal::locale()->insertCatalogue("kcmlirc");
- return new KCMLirc(parent, "KCMLirc");
+ return new KCMLirc(tqparent, "KCMLirc");
}
}
diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h
index 468302b..4af2347 100644
--- a/kdelirc/kcmlirc/kcmlirc.h
+++ b/kdelirc/kcmlirc/kcmlirc.h
@@ -31,6 +31,7 @@ class Remote;
class KCMLirc: public KCModule, virtual public DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
private:
@@ -45,8 +46,8 @@ private:
public slots:
void updateActions();
- void updateModesStatus(TQListViewItem *);
- void updateActionsStatus(TQListViewItem *);
+ void updateModestqStatus(TQListViewItem *);
+ void updateActionstqStatus(TQListViewItem *);
void updateModes();
void updateExtensions();
void updateInformation();
@@ -61,10 +62,11 @@ public slots:
void slotRenamed(TQListViewItem *item);
void slotEditMode();
-
-// MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
+// QMOC_SKIP_BEGIN
k_dcop:
-// MOC_SKIP_END
+// QMOC_SKIP_END
+#endif
// now just used as a proxy to AddAction class
virtual void gotButton(TQString remote, TQString button);
signals:
@@ -76,7 +78,7 @@ public:
virtual void defaults();
virtual void configChanged();
- KCMLirc(TQWidget *parent = 0, const char *name = 0, TQStringList args = TQStringList());
+ KCMLirc(TQWidget *tqparent = 0, const char *name = 0, TQStringList args = TQStringList());
~KCMLirc();
};
diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui
index c4b0b81..eca2753 100644
--- a/kdelirc/kcmlirc/kcmlircbase.ui
+++ b/kdelirc/kcmlirc/kcmlircbase.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KCMLircBase</class>
<author>Gav Wood</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KCMLircBase</cstring>
</property>
@@ -23,14 +23,14 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QTabWidget" row="0" column="0">
+ <widget class="TQTabWidget" row="0" column="0">
<property name="name">
<cstring>tabWidget2</cstring>
</property>
<property name="margin">
<number>0</number>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -41,7 +41,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theMainLabel</cstring>
</property>
@@ -74,18 +74,18 @@
<property name="text">
<string>There are currently no remote controls available. You must first set up LIRC correctly; see www.lirc.org for more information.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
- <widget class="QSplitter">
+ <widget class="TQSplitter">
<property name="name">
<cstring>splitter4</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>modeLayout</cstring>
</property>
@@ -96,7 +96,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theRemotesLabel</cstring>
</property>
@@ -140,7 +140,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>modeButtonLayout</cstring>
</property>
@@ -158,7 +158,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>17</width>
<height>20</height>
@@ -202,9 +202,9 @@
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<vbox>
<property name="name">
@@ -213,7 +213,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theModeLabel</cstring>
</property>
@@ -298,9 +298,9 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
@@ -316,16 +316,16 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>240</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<grid>
<property name="name">
@@ -356,7 +356,7 @@
<string>A&amp;dd...</string>
</property>
</widget>
- <widget class="QPushButton" row="1" column="1">
+ <widget class="TQPushButton" row="1" column="1">
<property name="name">
<cstring>theEditAction</cstring>
</property>
@@ -387,7 +387,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -398,7 +398,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QSplitter" row="0" column="0">
+ <widget class="TQSplitter" row="0" column="0">
<property name="name">
<cstring>splitter5</cstring>
</property>
@@ -427,9 +427,9 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<vbox>
<property name="name">
@@ -438,7 +438,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theInformationLabel</cstring>
</property>
@@ -490,7 +490,7 @@
<functions>
<function access="private" specifier="non virtual">init()</function>
</functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kdelirc/kcmlirc/kcmlircbase.ui.h b/kdelirc/kcmlirc/kcmlircbase.ui.h
index 124ab3f..42faaab 100644
--- a/kdelirc/kcmlirc/kcmlircbase.ui.h
+++ b/kdelirc/kcmlirc/kcmlircbase.ui.h
@@ -12,7 +12,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
@@ -23,7 +23,7 @@ void KCMLircBase::init()
{
delete theModes;
modeLayout->removeItem(modeButtonLayout);
- theModes = new ModesList(dynamic_cast<TQWidget *>(modeLayout->parent()), "theModes");
+ theModes = new ModesList(TQT_TQWIDGET(modeLayout->parent()), "theModes");
theModes->addColumn(i18n("Remote Control"));
theModes->addColumn(i18n("Default"));
theModes->addColumn(i18n("Icon"));
@@ -32,6 +32,6 @@ void KCMLircBase::init()
theModes->setItemsRenameable(true);
modeLayout->addWidget(theModes);
modeLayout->addLayout(modeButtonLayout);
- modeLayout->invalidate();
+ modeLayout->tqinvalidate();
modeLayout->activate();
}
diff --git a/kdelirc/kcmlirc/modeslist.cpp b/kdelirc/kcmlirc/modeslist.cpp
index 83678d1..a182129 100644
--- a/kdelirc/kcmlirc/modeslist.cpp
+++ b/kdelirc/kcmlirc/modeslist.cpp
@@ -16,7 +16,7 @@
#include "modeslist.h"
-ModesList::ModesList(TQWidget *parent, const char *name) : KListView(parent, name)
+ModesList::ModesList(TQWidget *tqparent, const char *name) : KListView(tqparent, name)
{
setAcceptDrops(true);
setDropVisualizer(false);
diff --git a/kdelirc/kcmlirc/modeslist.h b/kdelirc/kcmlirc/modeslist.h
index 22e6cc0..5cc77a8 100644
--- a/kdelirc/kcmlirc/modeslist.h
+++ b/kdelirc/kcmlirc/modeslist.h
@@ -25,9 +25,10 @@
class ModesList : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
virtual bool acceptDrag(TQDropEvent *) const;
- ModesList(TQWidget *parent = 0, const char *name = 0);
+ ModesList(TQWidget *tqparent = 0, const char *name = 0);
};
#endif
diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui
index e3da8ef..90e91e8 100644
--- a/kdelirc/kcmlirc/newmode.ui
+++ b/kdelirc/kcmlirc/newmode.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>NewMode</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>NewMode</cstring>
</property>
@@ -38,15 +38,15 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout11</cstring>
+ <cstring>tqlayout11</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -54,7 +54,7 @@
<string>Name:</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>theName</cstring>
</property>
@@ -75,9 +75,9 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout12</cstring>
+ <cstring>tqlayout12</cstring>
</property>
<hbox>
<property name="name">
@@ -93,7 +93,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -138,18 +138,18 @@
</connection>
<connection>
<sender>theName</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>NewMode</receiver>
- <slot>slotTextChanged(const QString&amp;)</slot>
+ <slot>slotTextChanged(const TQString&amp;)</slot>
</connection>
</connections>
<includes>
<include location="local" impldecl="in implementation">newmode.ui.h</include>
</includes>
-<slots>
- <slot>slotTextChanged( const QString &amp; newText )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+<Q_SLOTS>
+ <slot>slotTextChanged( const TQString &amp; newText )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kdelirc/kcmlirc/newmode.ui.h b/kdelirc/kcmlirc/newmode.ui.h
index 2bb2f54..29c4166 100644
--- a/kdelirc/kcmlirc/newmode.ui.h
+++ b/kdelirc/kcmlirc/newmode.ui.h
@@ -12,7 +12,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui
index 2d4ac18..ad6867a 100644
--- a/kdelirc/kcmlirc/selectprofile.ui
+++ b/kdelirc/kcmlirc/selectprofile.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>SelectProfile</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>SelectProfile</cstring>
</property>
@@ -52,9 +52,9 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout47</cstring>
+ <cstring>tqlayout47</cstring>
</property>
<hbox>
<property name="name">
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -119,7 +119,7 @@
<slot>reject()</slot>
</connection>
</connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp
index ad558b5..f774bc4 100644
--- a/kdelirc/kdelirc/iraction.cpp
+++ b/kdelirc/kdelirc/iraction.cpp
@@ -97,7 +97,7 @@ const TQString IRAction::function() const
if(theObject.isEmpty())
return i18n("Exit mode");
else
- return i18n("Switch to %1").arg(theObject);
+ return i18n("Switch to %1").tqarg(theObject);
else
if(theObject.isEmpty())
return i18n("Just start");
diff --git a/kdelirc/kdelirc/iraction.h b/kdelirc/kdelirc/iraction.h
index 8fdd44e..7d70d6c 100644
--- a/kdelirc/kdelirc/iraction.h
+++ b/kdelirc/kdelirc/iraction.h
@@ -82,7 +82,7 @@ public:
void setUnique(const bool a) { theUnique = a; }
IRAction(const TQString &newProgram, const TQString &newObject, const TQString &newMethod, const Arguments &newArguments, const TQString &newRemote, const TQString &newMode, const TQString &newButton, const bool newRepeat, const bool newAutoStart, const bool newDoBefore, const bool newDoAfter, const bool newUnique, const IfMulti newIfMulti);
- IRAction() { theProgram = TQString::null; }
+ IRAction() { theProgram = TQString(); }
};
#endif
diff --git a/kdelirc/kdelirc/mode.cpp b/kdelirc/kdelirc/mode.cpp
index 71deea8..cd0dc4c 100644
--- a/kdelirc/kdelirc/mode.cpp
+++ b/kdelirc/kdelirc/mode.cpp
@@ -16,7 +16,7 @@
#include "modes.h"
#include "mode.h"
-Mode::Mode() : theName(TQString::null)
+Mode::Mode() : theName(TQString())
{
}
@@ -37,7 +37,7 @@ const Mode &Mode::loadFromConfig(KConfig &theConfig, int index)
theName = theConfig.readEntry(Prefix + "Name");
theRemote = theConfig.readEntry(Prefix + "Remote");
theIconFile = theConfig.readEntry(Prefix + "IconFile");
- if(theIconFile.isEmpty()) theIconFile = TQString::null;
+ if(theIconFile.isEmpty()) theIconFile = TQString();
return *this;
}
diff --git a/kdelirc/kdelirc/mode.h b/kdelirc/kdelirc/mode.h
index 9a73fbc..a2fa477 100644
--- a/kdelirc/kdelirc/mode.h
+++ b/kdelirc/kdelirc/mode.h
@@ -43,7 +43,7 @@ public:
bool operator==(const Mode &mode) const { return mode.theName == theName && mode.theRemote == theRemote; }
Mode();
- Mode(const TQString &remote, const TQString &name, const TQString &iconFile = TQString::null);
+ Mode(const TQString &remote, const TQString &name, const TQString &iconFile = TQString());
~Mode();
};
diff --git a/kdelirc/kdelirc/modes.cpp b/kdelirc/kdelirc/modes.cpp
index 5346837..5ecd418 100644
--- a/kdelirc/kdelirc/modes.cpp
+++ b/kdelirc/kdelirc/modes.cpp
@@ -41,8 +41,8 @@ void Modes::loadFromConfig(KConfig &theConfig)
void Modes::generateNulls(const TQStringList &theRemotes)
{
for(TQStringList::const_iterator i = theRemotes.begin(); i != theRemotes.end(); ++i)
- { if(!contains(*i) || !operator[](*i).contains("")) operator[](*i)[""] = Mode(*i, "");
- if(!theDefaults.contains(*i)) theDefaults[*i].isEmpty();
+ { if(!tqcontains(*i) || !operator[](*i).tqcontains("")) operator[](*i)[""] = Mode(*i, "");
+ if(!theDefaults.tqcontains(*i)) theDefaults[*i].isEmpty();
}
}
@@ -59,8 +59,8 @@ const Mode Modes::getDefault(const TQString &remote) const
{
// if(theDefaults[remote] == TQString())
// return Mode(remote, "");
- if(contains(remote))
- if(operator[](remote).contains(theDefaults[remote]))
+ if(tqcontains(remote))
+ if(operator[](remote).tqcontains(theDefaults[remote]))
return operator[](remote)[theDefaults[remote]];
else return Mode(remote, "");
else return Mode(remote, "");
diff --git a/kdelirc/kdelirc/profileserver.cpp b/kdelirc/kdelirc/profileserver.cpp
index 7a72c4d..d95c5d5 100644
--- a/kdelirc/kdelirc/profileserver.cpp
+++ b/kdelirc/kdelirc/profileserver.cpp
@@ -66,7 +66,7 @@ void Profile::loadFromFile(const TQString &fileName)
curPAA = 0;
TQFile xmlFile(fileName);
- TQXmlInputSource source(&xmlFile);
+ TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
TQXmlSimpleReader reader;
reader.setContentHandler(this);
reader.parse(source);
@@ -84,7 +84,7 @@ const TQString &ProfileServer::getServiceName(const TQString &appId) const
{
if(theProfiles[appId])
return theProfiles[appId]->serviceName();
- return TQString::null;
+ return TQString();
}
const ProfileAction *ProfileServer::getAction(const TQString &appId, const TQString &objId, const TQString &prototype) const
@@ -124,7 +124,7 @@ bool Profile::startElement(const TQString &, const TQString &, const TQString &n
curPAA->setType(attributes.value("type"));
}
else if(name == "range" && curPAA)
- curPAA->setRange(qMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
+ curPAA->setRange(tqMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
charBuffer = "";
return true;
diff --git a/kdelirc/kdelirc/profileserver.h b/kdelirc/kdelirc/profileserver.h
index 0228082..f049ad4 100644
--- a/kdelirc/kdelirc/profileserver.h
+++ b/kdelirc/kdelirc/profileserver.h
@@ -26,7 +26,7 @@
enum IfMulti {IM_DONTSEND, IM_SENDTOALL, IM_SENDTOTOP, IM_SENDTOBOTTOM};
-typedef QPair<int,int> Range;
+typedef TQPair<int,int> Range;
class ProfileAction;
class Profile;
@@ -35,8 +35,8 @@ class ProfileActionArgument
{
TQString theComment, theType;
Range theRange;
- TQString theDefault; // should be QVariant?
- const ProfileAction *parent;
+ TQString theDefault; // should be TQVariant?
+ const ProfileAction *tqparent;
friend class Profile;
public:
@@ -49,15 +49,15 @@ public:
const Range &range() const { return theRange; }
void setRange(const Range &a) { theRange = a; }
- const ProfileAction *action() const { return parent; }
- void setAction(const ProfileAction *a) { parent = a; }
+ const ProfileAction *action() const { return tqparent; }
+ void setAction(const ProfileAction *a) { tqparent = a; }
};
class ProfileAction
{
TQString theObjId, thePrototype, theName, theComment, theClass;
float theMultiplier;
- const Profile *parent;
+ const Profile *tqparent;
bool theRepeat, theAutoStart;
TQValueList<ProfileActionArgument> theArguments;
@@ -81,11 +81,11 @@ public:
void setAutoStart(bool a) { theAutoStart = a; }
const TQValueList<ProfileActionArgument> &arguments() const { return theArguments; }
- const Profile *profile() const { return parent; }
- void setProfile(const Profile *a) { parent = a; }
+ const Profile *profile() const { return tqparent; }
+ void setProfile(const Profile *a) { tqparent = a; }
};
-class Profile : public QXmlDefaultHandler
+class Profile : public TQXmlDefaultHandler
{
TQString theId, theName, theAuthor, theServiceName;
IfMulti theIfMulti;
@@ -112,7 +112,7 @@ public:
void setUnique(const bool a) { theUnique = a; }
const IfMulti ifMulti() const { return theIfMulti; }
void setIfMulti(const IfMulti a) { theIfMulti = a; }
- const TQString &serviceName() const { if(theServiceName != TQString::null) return theServiceName; return theName; }
+ const TQString &serviceName() const { if(theServiceName != TQString()) return theServiceName; return theName; }
void setServiceName(const TQString &a) { theServiceName = a; }
const TQDict<ProfileAction> &actions() const { return theActions; }
const ProfileAction *searchClass(const TQString &c) const;
diff --git a/kdelirc/kdelirc/prototype.h b/kdelirc/kdelirc/prototype.h
index 0a963f7..fa101b7 100644
--- a/kdelirc/kdelirc/prototype.h
+++ b/kdelirc/kdelirc/prototype.h
@@ -30,7 +30,7 @@ class Prototype
public:
unsigned count() const{ return theTypes.count(); }
- const QPair<TQString, TQString> operator[](int i) const { return qMakePair(theTypes[i], theNames[i]); }
+ const TQPair<TQString, TQString> operator[](int i) const { return tqMakePair(theTypes[i], theNames[i]); }
const TQString &name(int i) const { return theNames[i]; }
const TQString &type(int i) const { return theTypes[i]; }
const TQString &returnType() const { return theReturn; }
diff --git a/kdelirc/kdelirc/remoteserver.cpp b/kdelirc/kdelirc/remoteserver.cpp
index db33591..04fb290 100644
--- a/kdelirc/kdelirc/remoteserver.cpp
+++ b/kdelirc/kdelirc/remoteserver.cpp
@@ -58,7 +58,7 @@ void Remote::loadFromFile(const TQString &fileName)
curRB = 0;
TQFile xmlFile(fileName);
- TQXmlInputSource source(&xmlFile);
+ TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
TQXmlSimpleReader reader;
reader.setContentHandler(this);
reader.parse(source);
diff --git a/kdelirc/kdelirc/remoteserver.h b/kdelirc/kdelirc/remoteserver.h
index e74b02e..80891ba 100644
--- a/kdelirc/kdelirc/remoteserver.h
+++ b/kdelirc/kdelirc/remoteserver.h
@@ -38,7 +38,7 @@ public:
const TQString &id(void) const { return theId; }
};
-class Remote : public QXmlDefaultHandler
+class Remote : public TQXmlDefaultHandler
{
TQString theName, theId, theAuthor;
TQDict<RemoteButton> theButtons;
diff --git a/kdelirc/profiles/klauncher.profile.xml b/kdelirc/profiles/klauncher.profile.xml
index 436a04d..87f9035 100644
--- a/kdelirc/profiles/klauncher.profile.xml
+++ b/kdelirc/profiles/klauncher.profile.xml
@@ -6,13 +6,13 @@
<action objid="default" prototype="void kdeinit_exec(QString, QStringList)" repeat="0" autostart="0">
<name>Execute</name>
<comment>Runs a program or script</comment>
- <argument type="QString"><comment>The executable name and path of the program or script to run</comment></argument>
- <argument type="QStringList"><comment>Parameters for the program or script</comment></argument>
+ <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The executable name and path of the program or script to run</comment></argument>
+ <argument type=TQSTRINGLIST_OBJECT_NAME_STRING><comment>Parameters for the program or script</comment></argument>
</action>
<action objid="default" prototype="void kdeinit_exec_wait(QString, QStringList)" repeat="0" autostart="0">
<name>Execute and Wait</name>
<comment>Runs a program or script and waits for it to finish</comment>
- <argument type="QString"><comment>The executable name and path of the program or script to run</comment></argument>
- <argument type="QStringList"><comment>Parameters for the program or script</comment></argument>
+ <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The executable name and path of the program or script to run</comment></argument>
+ <argument type=TQSTRINGLIST_OBJECT_NAME_STRING><comment>Parameters for the program or script</comment></argument>
</action>
</profile>
diff --git a/kdelirc/profiles/konqueror.profile.xml b/kdelirc/profiles/konqueror.profile.xml
index 7dfd78c..0fdfdba 100644
--- a/kdelirc/profiles/konqueror.profile.xml
+++ b/kdelirc/profiles/konqueror.profile.xml
@@ -8,7 +8,7 @@
<action objid="KonquerorIface" prototype="void createNewWindow(QString)" repeat="0" autostart="0">
<name>Create New Window</name>
<comment>Creates a new window and loads an arbitrary URL.</comment>
- <argument type="QString"><comment>The URL to load in the window initially.</comment></argument>
+ <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The URL to load in the window initially.</comment></argument>
</action>
<action objid="MainApplication-Interface" prototype="void quit()" repeat="0" autostart="0">
<name>Quit</name>
diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp
index c449004..438aa33 100644
--- a/kdessh/kdessh.cpp
+++ b/kdessh/kdessh.cpp
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
KCmdLineArgs::usage(i18n("No command or host specified."));
// Check if ssh is available
- if (KStandardDirs::findExe(TQString::fromLatin1("ssh")).isEmpty())
+ if (KStandardDirs::findExe(TQString::tqfromLatin1("ssh")).isEmpty())
{
kdError(1511) << "ssh not found\n";
exit(1);
@@ -151,8 +151,8 @@ int main(int argc, char *argv[])
// Read configuration
KConfig *config = KGlobal::config();
- config->setGroup(TQString::fromLatin1("Passwords"));
- int timeout = config->readNumEntry(TQString::fromLatin1("Timeout"), defTimeout);
+ config->setGroup(TQString::tqfromLatin1("Passwords"));
+ int timeout = config->readNumEntry(TQString::tqfromLatin1("Timeout"), defTimeout);
SshProcess proc(host, user);
proc.setStub(stub);
diff --git a/kdessh/sshdlg.cpp b/kdessh/sshdlg.cpp
index bffc694..f95d04b 100644
--- a/kdessh/sshdlg.cpp
+++ b/kdessh/sshdlg.cpp
@@ -21,12 +21,12 @@ KDEsshDialog::KDEsshDialog(TQCString host, TQCString user, TQCString stub,
m_User = user;
m_Stub = stub;
- setCaption(TQString::fromLatin1("%1@%2").arg(m_User).arg(m_Host));
+ setCaption(TQString::tqfromLatin1("%1@%2").tqarg(m_User.data()).tqarg(m_Host.data()));
// Make the prompt a little more polite :-)
- if (prompt.lower().left(6) == TQString::fromLatin1("enter "))
+ if (prompt.lower().left(6) == TQString::tqfromLatin1("enter "))
prompt.remove(0, 6);
- int pos = prompt.find(':');
+ int pos = prompt.tqfind(':');
if (pos != -1)
prompt.remove(pos, 10);
prompt += '.';
diff --git a/kdessh/sshdlg.h b/kdessh/sshdlg.h
index c552548..644662f 100644
--- a/kdessh/sshdlg.h
+++ b/kdessh/sshdlg.h
@@ -15,6 +15,7 @@ class KDEsshDialog
: public KPasswordDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
KDEsshDialog(TQCString host, TQCString user, TQCString stub,
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index 3326320..b6c07b7 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -3,7 +3,7 @@
*
* Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -37,8 +37,8 @@
/***************************************************************************
* constructor
**/
-DiskList::DiskList(TQObject *parent, const char *name)
- : TQObject(parent,name)
+DiskList::DiskList(TQObject *tqparent, const char *name)
+ : TQObject(tqparent,name)
{
kdDebug() << k_funcinfo << endl;
@@ -183,27 +183,27 @@ TQFile f(FSTAB);
while (! t.eof()) {
s=t.readLine();
s=s.simplifyWhiteSpace();
- if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) ) {
+ if ( (!s.isEmpty() ) && (s.tqfind(DELIMITER)!=0) ) {
// not empty or commented out by '#'
// kdDebug() << "GOT: [" << s << "]" << endl;
disk = new DiskEntry();// Q_CHECK_PTR(disk);
disk->setMounted(FALSE);
- disk->setDeviceName(expandEscapes(s.left(s.find(BLANK))));
- s=s.remove(0,s.find(BLANK)+1 );
+ disk->setDeviceName(expandEscapes(s.left(s.tqfind(BLANK))));
+ s=s.remove(0,s.tqfind(BLANK)+1 );
// kdDebug() << " deviceName: [" << disk->deviceName() << "]" << endl;
#ifdef _OS_SOLARIS_
//device to fsck
- s=s.remove(0,s.find(BLANK)+1 );
+ s=s.remove(0,s.tqfind(BLANK)+1 );
#endif
- disk->setMountPoint(expandEscapes(s.left(s.find(BLANK))));
- s=s.remove(0,s.find(BLANK)+1 );
+ disk->setMountPoint(expandEscapes(s.left(s.tqfind(BLANK))));
+ s=s.remove(0,s.tqfind(BLANK)+1 );
//kdDebug() << " MountPoint: [" << disk->mountPoint() << "]" << endl;
//kdDebug() << " Icon: [" << disk->iconName() << "]" << endl;
- disk->setFsType(s.left(s.find(BLANK)) );
- s=s.remove(0,s.find(BLANK)+1 );
+ disk->setFsType(s.left(s.tqfind(BLANK)) );
+ s=s.remove(0,s.tqfind(BLANK)+1 );
//kdDebug() << " FS-Type: [" << disk->fsType() << "]" << endl;
- disk->setMountOptions(s.left(s.find(BLANK)) );
- s=s.remove(0,s.find(BLANK)+1 );
+ disk->setMountOptions(s.left(s.tqfind(BLANK)) );
+ s=s.remove(0,s.tqfind(BLANK)+1 );
//kdDebug() << " Mount-Options: [" << disk->mountOptions() << "]" << endl;
if ( (disk->deviceName() != "none")
&& (disk->fsType() != "swap")
@@ -211,7 +211,7 @@ TQFile f(FSTAB);
&& (disk->mountPoint() != "/dev/swap")
&& (disk->mountPoint() != "/dev/pts")
&& (disk->mountPoint() != "/dev/shm")
- && (disk->mountPoint().find("/proc") == -1 ) )
+ && (disk->mountPoint().tqfind("/proc") == -1 ) )
replaceDeviceEntry(disk);
else
delete disk;
@@ -243,7 +243,7 @@ void DiskList::receivedDFStdErrOut(KProcess *, char *data, int len )
*/
- TQString tmp = TQString::fromLatin1(data, len);
+ TQString tmp = TQString::tqfromLatin1(data, len);
dfStringErrOut.append(tmp);
}
@@ -295,7 +295,7 @@ void DiskList::dfDone()
if ( !s.isEmpty() ) {
disk = new DiskEntry(); Q_CHECK_PTR(disk);
- if (s.find(BLANK)<0) // devicename was too long, rest in next line
+ if (s.tqfind(BLANK)<0) // devicename was too long, rest in next line
if ( !t.eof() ) { // just appends the next line
v=t.readLine();
s=s.append(v.latin1() );
@@ -305,37 +305,37 @@ void DiskList::dfDone()
//kdDebug() << "EFFECTIVELY GOT " << s.length() << " chars: [" << s << "]" << endl;
- disk->setDeviceName(s.left(s.find(BLANK)) );
- s=s.remove(0,s.find(BLANK)+1 );
+ disk->setDeviceName(s.left(s.tqfind(BLANK)) );
+ s=s.remove(0,s.tqfind(BLANK)+1 );
//kdDebug() << " DeviceName: [" << disk->deviceName() << "]" << endl;
if (NO_FS_TYPE) {
//kdDebug() << "THERE IS NO FS_TYPE_FIELD!" << endl;
disk->setFsType("?");
} else {
- disk->setFsType(s.left(s.find(BLANK)) );
- s=s.remove(0,s.find(BLANK)+1 );
+ disk->setFsType(s.left(s.tqfind(BLANK)) );
+ s=s.remove(0,s.tqfind(BLANK)+1 );
};
//kdDebug() << " FS-Type: [" << disk->fsType() << "]" << endl;
//kdDebug() << " Icon: [" << disk->iconName() << "]" << endl;
- u=s.left(s.find(BLANK));
+ u=s.left(s.tqfind(BLANK));
disk->setKBSize(u.toInt() );
- s=s.remove(0,s.find(BLANK)+1 );
+ s=s.remove(0,s.tqfind(BLANK)+1 );
//kdDebug() << " Size: [" << disk->kBSize() << "]" << endl;
- u=s.left(s.find(BLANK));
+ u=s.left(s.tqfind(BLANK));
disk->setKBUsed(u.toInt() );
- s=s.remove(0,s.find(BLANK)+1 );
+ s=s.remove(0,s.tqfind(BLANK)+1 );
//kdDebug() << " Used: [" << disk->kBUsed() << "]" << endl;
- u=s.left(s.find(BLANK));
+ u=s.left(s.tqfind(BLANK));
disk->setKBAvail(u.toInt() );
- s=s.remove(0,s.find(BLANK)+1 );
+ s=s.remove(0,s.tqfind(BLANK)+1 );
//kdDebug() << " Avail: [" << disk->kBAvail() << "]" << endl;
- s=s.remove(0,s.find(BLANK)+1 ); // delete the capacity 94%
+ s=s.remove(0,s.tqfind(BLANK)+1 ); // delete the capacity 94%
disk->setMountPoint(s);
//kdDebug() << " MountPoint: [" << disk->mountPoint() << "]" << endl;
@@ -346,7 +346,7 @@ void DiskList::dfDone()
&& (disk->mountPoint() != "/dev/swap")
&& (disk->mountPoint() != "/dev/pts")
&& (disk->mountPoint() != "/dev/shm")
- && (disk->mountPoint().find("/proc") == -1 ) ) {
+ && (disk->mountPoint().tqfind("/proc") == -1 ) ) {
disk->setMounted(TRUE); // its now mounted (df lists only mounted)
replaceDeviceEntry(disk);
} else
@@ -391,10 +391,10 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk)
//
// 1999-27-11 Espen Sand:
- // I can't get find() to work. The Disks::compareItems(..) is
+ // I can't get tqfind() to work. The Disks::compareItems(..) is
// never called.
//
- //int pos=disks->find(disk);
+ //int pos=disks->tqfind(disk);
TQString deviceRealName = disk->deviceRealName();
TQString realMountPoint = disk->realMountPoint();
@@ -426,13 +426,13 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk)
// eg. /cache/cache/.cfs_mnt_points/srv:_home_jesus
// ^ ^
TQString odiskName = olddisk->deviceName();
- int ci=odiskName.find(':'); // goto host-column
- while ((ci =odiskName.find('/',ci)) > 0) {
- odiskName.replace(ci,1,"_");
+ int ci=odiskName.tqfind(':'); // goto host-column
+ while ((ci =odiskName.tqfind('/',ci)) > 0) {
+ odiskName.tqreplace(ci,1,"_");
}//while
// check if there is something that is exactly the tail
// eg. [srv:/tmp3] is exact tail of [/cache/.cfs_mnt_points/srv:_tmp3]
- if ( ( (p=disk->deviceName().findRev(odiskName
+ if ( ( (p=disk->deviceName().tqfindRev(odiskName
,disk->deviceName().length()) )
!= -1)
&& (p + odiskName.length()
@@ -455,10 +455,10 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk)
}
#endif
- if (pos != -1) { // replace
+ if (pos != -1) { // tqreplace
DiskEntry * olddisk = disks->at(pos);
- if ( (-1!=olddisk->mountOptions().find("user")) &&
- (-1==disk->mountOptions().find("user")) ) {
+ if ( (-1!=olddisk->mountOptions().tqfind("user")) &&
+ (-1==disk->mountOptions().tqfind("user")) ) {
// add "user" option to new diskEntry
TQString s=disk->mountOptions();
if (s.length()>0) s.append(",");
diff --git a/kdf/disklist.h b/kdf/disklist.h
index cd9613c..4f01d87 100644
--- a/kdf/disklist.h
+++ b/kdf/disklist.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -93,14 +93,15 @@ private:
};
/***************************************************************************/
-class DiskList : public QObject
+class DiskList : public TQObject
{ Q_OBJECT
+ TQ_OBJECT
public:
- DiskList( TQObject *parent=0, const char *name=0 );
+ DiskList( TQObject *tqparent=0, const char *name=0 );
~DiskList();
int readFSTAB();
int readDF();
- int find(const DiskEntry* disk) {return disks->find(disk);}
+ int tqfind(const DiskEntry* disk) {return disks->tqfind(disk);}
DiskEntry* at(uint index) {return disks->at(index);}
DiskEntry* first() {return disks->first();}
DiskEntry* next() {return disks->next();}
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index ca8f263..0ae7c2b 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -3,7 +3,7 @@
*
* Copyright (c) 1998 Michael Kropfberger <michael.kropfberger@gmx.net>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -65,14 +65,14 @@ void DiskEntry::init()
}
-DiskEntry::DiskEntry(TQObject *parent, const char *name)
- : TQObject (parent, name)
+DiskEntry::DiskEntry(TQObject *tqparent, const char *name)
+ : TQObject (tqparent, name)
{
init();
}
-DiskEntry::DiskEntry(const TQString & deviceName, TQObject *parent, const char *name)
- : TQObject (parent, name)
+DiskEntry::DiskEntry(const TQString & deviceName, TQObject *tqparent, const char *name)
+ : TQObject (tqparent, name)
{
init();
@@ -104,13 +104,13 @@ int DiskEntry::mount()
{
// FreeBSD's mount(8) is picky: -o _must_ go before
// the device and mountpoint.
- cmdS=TQString::fromLatin1("mount -t%t -o%o %d %m");
+ cmdS=TQString::tqfromLatin1("mount -t%t -o%o %d %m");
}
- cmdS.replace(TQString::fromLatin1("%d"),deviceName());
- cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
- cmdS.replace(TQString::fromLatin1("%t"),fsType());
- cmdS.replace(TQString::fromLatin1("%o"),mountOptions());
+ cmdS.tqreplace(TQString::tqfromLatin1("%d"),deviceName());
+ cmdS.tqreplace(TQString::tqfromLatin1("%m"),mountPoint());
+ cmdS.tqreplace(TQString::tqfromLatin1("%t"),fsType());
+ cmdS.tqreplace(TQString::tqfromLatin1("%o"),mountOptions());
kdDebug() << "mount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
@@ -126,8 +126,8 @@ int DiskEntry::umount()
if (cmdS.isEmpty()) // generate default umount cmd
cmdS="umount %d";
- cmdS.replace(TQString::fromLatin1("%d"),deviceName());
- cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
+ cmdS.tqreplace(TQString::tqfromLatin1("%d"),deviceName());
+ cmdS.tqreplace(TQString::tqfromLatin1("%m"),mountPoint());
kdDebug() << "umount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
@@ -193,23 +193,23 @@ TQString DiskEntry::guessIconName()
{
TQString iconName;
// try to be intelligent
- if (-1!=mountPoint().find("cdrom",0,FALSE)) iconName+="cdrom";
- else if (-1!=deviceName().find("cdrom",0,FALSE)) iconName+="cdrom";
- else if (-1!=mountPoint().find("writer",0,FALSE)) iconName+="cdwriter";
- else if (-1!=deviceName().find("writer",0,FALSE)) iconName+="cdwriter";
- else if (-1!=mountPoint().find("mo",0,FALSE)) iconName+="mo";
- else if (-1!=deviceName().find("mo",0,FALSE)) iconName+="mo";
- else if (-1!=deviceName().find("fd",0,FALSE)) {
- if (-1!=deviceName().find("360",0,FALSE)) iconName+="5floppy";
- if (-1!=deviceName().find("1200",0,FALSE)) iconName+="5floppy";
+ if (-1!=mountPoint().tqfind("cdrom",0,FALSE)) iconName+="cdrom";
+ else if (-1!=deviceName().tqfind("cdrom",0,FALSE)) iconName+="cdrom";
+ else if (-1!=mountPoint().tqfind("writer",0,FALSE)) iconName+="cdwriter";
+ else if (-1!=deviceName().tqfind("writer",0,FALSE)) iconName+="cdwriter";
+ else if (-1!=mountPoint().tqfind("mo",0,FALSE)) iconName+="mo";
+ else if (-1!=deviceName().tqfind("mo",0,FALSE)) iconName+="mo";
+ else if (-1!=deviceName().tqfind("fd",0,FALSE)) {
+ if (-1!=deviceName().tqfind("360",0,FALSE)) iconName+="5floppy";
+ if (-1!=deviceName().tqfind("1200",0,FALSE)) iconName+="5floppy";
else iconName+="3floppy";
}
- else if (-1!=mountPoint().find("floppy",0,FALSE)) iconName+="3floppy";
- else if (-1!=mountPoint().find("zip",0,FALSE)) iconName+="zip";
- else if (-1!=fsType().find("nfs",0,FALSE)) iconName+="nfs";
+ else if (-1!=mountPoint().tqfind("floppy",0,FALSE)) iconName+="3floppy";
+ else if (-1!=mountPoint().tqfind("zip",0,FALSE)) iconName+="zip";
+ else if (-1!=fsType().tqfind("nfs",0,FALSE)) iconName+="nfs";
else iconName+="hdd";
mounted() ? iconName+="_mount" : iconName+="_unmount";
-// if ( -1==mountOptions().find("user",0,FALSE) )
+// if ( -1==mountOptions().tqfind("user",0,FALSE) )
// iconName.prepend("root_"); // special root icon, normal user cant mount
//debug("device %s is %s",deviceName().latin1(),iconName.latin1());
@@ -226,11 +226,11 @@ int DiskEntry::sysCall(const TQString & command)
{
if (readingSysStdErrOut || sysProc->isRunning() ) return -1;
- sysStringErrOut=i18n("Called: %1\n\n").arg(command); // put the called command on ErrOut
+ sysStringErrOut=i18n("Called: %1\n\n").tqarg(command); // put the called command on ErrOut
sysProc->clearArguments();
(*sysProc) << command;
if (!sysProc->start( KProcess::Block, KProcess::AllOutput ))
- kdFatal() << i18n("could not execute %1").arg(command.local8Bit().data()) << endl;
+ kdFatal() << i18n("could not execute %1").tqarg(command.local8Bit().data()) << endl;
if (sysProc->exitStatus()!=0) emit sysCallError(this, sysProc->exitStatus());
diff --git a/kdf/disks.h b/kdf/disks.h
index ed80c3d..d27bc0b 100644
--- a/kdf/disks.h
+++ b/kdf/disks.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 1998 Michael Kropfberger <michael.kropfberger@gmx.net>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -37,12 +37,13 @@
#include <kprocess.h>
#include <klocale.h>
-class DiskEntry : public QObject
+class DiskEntry : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- DiskEntry(TQObject *parent=0, const char *name=0);
- DiskEntry(const TQString & deviceName, TQObject *parent=0, const char *name=0);
+ DiskEntry(TQObject *tqparent=0, const char *name=0);
+ DiskEntry(const TQString & deviceName, TQObject *tqparent=0, const char *name=0);
~DiskEntry();
TQString lastSysError() {return sysStringErrOut; }
TQString deviceName() const { return device; }
diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp
index 2e26113..72389ef 100644
--- a/kdf/kcmdf.cpp
+++ b/kdf/kcmdf.cpp
@@ -32,8 +32,8 @@
#include "kcmdf.h"
-KDiskFreeWidget::KDiskFreeWidget( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+KDiskFreeWidget::KDiskFreeWidget( TQWidget *tqparent, const char *name )
+ : KCModule( tqparent, name )
{
setButtons(Help);
@@ -57,9 +57,9 @@ TQString KDiskFreeWidget::quickHelp() const
extern "C"
{
- KDE_EXPORT KCModule* create_kdf( TQWidget *parent, const char * /*name*/ )
+ KDE_EXPORT KCModule* create_kdf( TQWidget *tqparent, const char * /*name*/ )
{
- return new KDiskFreeWidget( parent , "kdf" );
+ return new KDiskFreeWidget( tqparent , "kdf" );
}
}
diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h
index 030b7dd..a33739c 100644
--- a/kdf/kcmdf.h
+++ b/kdf/kcmdf.h
@@ -33,9 +33,10 @@
class KDiskFreeWidget : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KDiskFreeWidget( TQWidget *parent=0, const char *name=0 );
+ KDiskFreeWidget( TQWidget *tqparent=0, const char *name=0 );
~KDiskFreeWidget();
TQString quickHelp() const;
diff --git a/kdf/kconftest.cpp b/kdf/kconftest.cpp
index 6ee63f0..7c0d0a9 100644
--- a/kdf/kconftest.cpp
+++ b/kdf/kconftest.cpp
@@ -27,7 +27,7 @@
/* compile with
-* gcc -I$QTDIR/include -I$KDEDIR/include -L/opt/kde/lib -L/usr/X11R6/lib -lkfm -lkdeui -lkdecore -lqt -lX11 -lXext -fno-rtti kconftest.cpp
+* gcc -I$TQTDIR/include -I$KDEDIR/include -L/opt/kde/lib -L/usr/X11R6/lib -lkfm -lkdeui -lkdecore -lqt -lX11 -lXext -fno-rtti kconftest.cpp
*/
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index 606c44e..f963a12 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -41,15 +41,15 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name)
{
kdf = new KDFWidget(this,"kdf",FALSE);
Q_CHECK_PTR(kdf);
- (void) new KAction( i18n( "&Update" ), 0, kdf, TQT_SLOT( updateDF() ), actionCollection(), "updatedf" );
+ (void) new KAction( i18n( "&Update" ), 0, TQT_TQOBJECT(kdf), TQT_SLOT( updateDF() ), actionCollection(), "updatedf" );
- KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
- KStdAction::preferences(kdf, TQT_SLOT(settingsBtnClicked()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ KStdAction::preferences(TQT_TQOBJECT(kdf), TQT_SLOT(settingsBtnClicked()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
setCentralWidget(kdf);
- // kdf->setMinimumSize(kdf->sizeHint());
- kdf->resize(kdf->sizeHint());
+ // kdf->setMinimumSize(kdf->tqsizeHint());
+ kdf->resize(kdf->tqsizeHint());
setupGUI(KMainWindow::Keys | StatusBar | Save | Create);
}
diff --git a/kdf/kdf.h b/kdf/kdf.h
index 84c0411..176e7b0 100644
--- a/kdf/kdf.h
+++ b/kdf/kdf.h
@@ -31,9 +31,10 @@
class KDFTopLevel : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
- KDFTopLevel(TQWidget *parent=0, const char *name=0);
+ KDFTopLevel(TQWidget *tqparent=0, const char *name=0);
~KDFTopLevel() { };
protected slots:
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index e13ebcd..2478d28 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -3,7 +3,7 @@
*
* Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -50,8 +50,8 @@ static bool GUI;
#endif
-KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init)
- : TQWidget( parent, name)
+KDFConfigWidget::KDFConfigWidget(TQWidget *tqparent, const char *name, bool init)
+ : TQWidget( tqparent, name)
{
mTabName.resize(8);
@@ -99,7 +99,7 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init)
mScroll = new TQScrollBar( this );
Q_CHECK_PTR(mScroll);
- mScroll->setOrientation( TQScrollBar::Horizontal );
+ mScroll->setOrientation( Qt::Horizontal );
mScroll->setSteps(1,20);
mScroll->setRange(0, 180 );
gl->addWidget( mScroll, 1, 1 );
diff --git a/kdf/kdfconfig.h b/kdf/kdfconfig.h
index 832738a..b1d8821 100644
--- a/kdf/kdfconfig.h
+++ b/kdf/kdfconfig.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -39,9 +39,10 @@ class TQScrollBar;
class CListView;
-class KDFConfigWidget : public QWidget
+class KDFConfigWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
class CTabName
{
@@ -59,7 +60,7 @@ class KDFConfigWidget : public QWidget
};
public:
- KDFConfigWidget( TQWidget *parent=0, const char *name=0, bool init=false);
+ KDFConfigWidget( TQWidget *tqparent=0, const char *name=0, bool init=false);
~KDFConfigWidget();
public slots:
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index 00f1968..8fcc576 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -3,7 +3,7 @@
*
* Copyright (c) 1998-2001 Michael Kropfberger <michael.kropfberger@gmx.net>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -56,8 +56,8 @@ static bool GUI;
/**************************************************************/
-CListViewItem::CListViewItem( CListView * parent, TQListViewItem * after )
- :TQListViewItem( parent, after )
+CListViewItem::CListViewItem( CListView * tqparent, TQListViewItem * after )
+ :TQListViewItem( tqparent, after )
{}
int CListViewItem::compare ( TQListViewItem *i, int column, bool ) const
@@ -92,8 +92,8 @@ void CListViewItem::setKeys (int kb_size, int kb_avail, float percent_full)
/**************************************************************/
-KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init )
- : TQWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0)
+KDFWidget::KDFWidget( TQWidget *tqparent, const char *name, bool init )
+ : TQWidget(tqparent, name), mOptionDialog(0), mPopup(0), mTimer(0)
{
connect(&mDiskList , TQT_SIGNAL(readDFDone() ),
this, TQT_SLOT (updateDFDone()) );
@@ -131,7 +131,7 @@ KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init )
this, TQT_SLOT(columnSizeChanged(int, int, int)) );
makeColumns();
- mIsTopLevel = TQString(parent->className()) == "KDFTopLevel" ? true : false;
+ mIsTopLevel = TQString(tqparent->className()) == "KDFTopLevel" ? true : false;
}
loadSettings();
@@ -156,9 +156,9 @@ void KDFWidget::makeColumns( void )
// 1999-11-29 Espen Sand
// This smells like a bad hack but I need to remove the headers
// first. If I don't, the list look like shit afterwards. The iterator
- // is just used to prevent an endless loop. With my Qt (1999-11-10 ?)
+ // is just used to prevent an endless loop. With my TQt (1999-11-10 ?)
// I only need as many iterations as there are header items but who knows
- // what a new Qt can do!
+ // what a new TQt can do!
//
for( i=1000; mList->header()->count() > 0 && i>0; i-- )
{
@@ -283,7 +283,7 @@ void KDFWidget::setUpdateFrequency( int frequency )
// Kill current timer and restart it if the frequency is
// larger than zero.
//
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
if( frequency > 0 )
{
startTimer( frequency * 1000 );
@@ -343,7 +343,7 @@ void KDFWidget::updateDFDone( void ){
int k=0;
item = new CListViewItem( mList, item );
- bool root = disk->mountOptions().find("user",0,false)==-1 ? true : false;
+ bool root = disk->mountOptions().tqfind("user",0,false)==-1 ? true : false;
item->setPixmap( k++, mList->icon( disk->iconName(), root ) );
item->setText( k++, disk->deviceName() );
item->setText( k++, disk->fsType() );
@@ -377,7 +377,7 @@ void KDFWidget::criticallyFull( DiskEntry *disk )
if( mStd.popupIfFull() == true )
{
TQString msg = i18n("Device [%1] on [%2] is getting critically full!").
- arg(disk->deviceName()).arg(disk->mountPoint());
+ tqarg(disk->deviceName()).tqarg(disk->mountPoint());
KMessageBox::sorry( this, msg, i18n("Warning"));
}
}
@@ -400,10 +400,10 @@ DiskEntry *KDFWidget::selectedDisk( TQListViewItem *item )
DiskEntry disk(item->text(deviceCol));
disk.setMountPoint(item->text(mntCol));
- // I can't get find() to work. The Disks::compareItems(..) is
+ // I can't get tqfind() to work. The Disks::compareItems(..) is
// never called.
//
- //int pos=mDiskList->find(disk);
+ //int pos=mDiskList->tqfind(disk);
int pos = -1;
for( u_int i=0; i<mDiskList.count(); i++ )
@@ -515,10 +515,10 @@ void KDFWidget::popupMenu( TQListViewItem *item, const TQPoint &p )
if( mStd.fileManager().isEmpty() == false )
{
TQString cmd = mStd.fileManager();
- int pos = cmd.find("%m");
+ int pos = cmd.tqfind("%m");
if( pos > 0 )
{
- cmd = cmd.replace( pos, 2, KProcess::quote(disk->mountPoint()) ) + " &";
+ cmd = cmd.tqreplace( pos, 2, KProcess::quote(disk->mountPoint()) ) + " &";
}
else
{
@@ -543,7 +543,7 @@ void KDFWidget::popupMenu( TQListViewItem *item, const TQPoint &p )
/**************************************************************************
- * recalculates and repaints the pixBars
+ * recalculates and tqrepaints the pixBars
**/
void KDFWidget::updateDiskBarPixmaps( void )
{
@@ -569,10 +569,10 @@ void KDFWidget::updateDiskBarPixmaps( void )
int i=0;
for(TQListViewItem *it=mList->firstChild(); it!=0;it=it->nextSibling(),i++ )
{
- // I can't get find() to work. The Disks::compareItems(..) is
+ // I can't get tqfind() to work. The Disks::compareItems(..) is
// never called.
//
- //int pos=mDiskList->find(disk);
+ //int pos=mDiskList->tqfind(disk);
DiskEntry dummy(it->text(deviceCol));
dummy.setMountPoint(it->text(mntCol));
@@ -609,8 +609,8 @@ void KDFWidget::updateDiskBarPixmaps( void )
p.setPen(black);
p.drawRect(0,0,w,h);
TQColor c;
- if ( (disk->iconName().find("cdrom") != -1)
- || (disk->iconName().find("writer") != -1) )
+ if ( (disk->iconName().tqfind("cdrom") != -1)
+ || (disk->iconName().tqfind("writer") != -1) )
c = gray;
else
c = disk->percentFull() > FULL_PERCENT ? red : darkGreen;
diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h
index 8c16fb9..af2daa5 100644
--- a/kdf/kdfwidget.h
+++ b/kdf/kdfwidget.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 1998 Michael Kropfberger <michael.kropfberger@gmx.net>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -72,10 +72,10 @@ class CTabEntry
// columns with a numeric value are sorted by numerical value.
//
-class CListViewItem : public QListViewItem
+class CListViewItem : public TQListViewItem
{
public:
- CListViewItem ( CListView * parent, TQListViewItem * after );
+ CListViewItem ( CListView * tqparent, TQListViewItem * after );
virtual int compare ( TQListViewItem* i, int col, bool) const;
@@ -89,9 +89,10 @@ class CListViewItem : public QListViewItem
/**************************************************************/
-class KDFWidget : public QWidget
+class KDFWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
enum ColId
@@ -107,7 +108,7 @@ class KDFWidget : public QWidget
};
public:
- KDFWidget( TQWidget *parent=0, const char *name=0, bool init=false);
+ KDFWidget( TQWidget *tqparent=0, const char *name=0, bool init=false);
~KDFWidget( void );
public slots:
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index 5ca97f5..e6c4020 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -134,7 +134,7 @@ void KwikDisk::setUpdateFrequency(int frequency)
// Kill current timer and restart it if the frequency is
// larger than zero.
//
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
if( frequency > 0 )
{
startTimer(frequency * 1000);
@@ -176,13 +176,13 @@ void KwikDisk::updateDFDone()
{
// FIXME: tool tips are unused atm
TQString toolTipText = i18n("%1 (%2) %3 on %4")
- .arg( disk->mounted() ? i18n("Unmount") : i18n("Mount"))
- .arg(disk->fsType()).arg(disk->deviceName()).arg(disk->mountPoint());
+ .tqarg( disk->mounted() ? i18n("Unmount") : i18n("Mount"))
+ .tqarg(disk->fsType()).tqarg(disk->deviceName()).tqarg(disk->mountPoint());
TQString entryName = disk->mountPoint();
if( disk->mounted() )
{
- entryName += TQString("\t\t\t[%1]").arg(disk->prettyKBAvail());
+ entryName += TQString("\t\t\t[%1]").tqarg(disk->prettyKBAvail());
}
int id = contextMenu()->insertItem("", this, TQT_SLOT(toggleMount(int)) );
contextMenu()->setItemParameter(id, itemNo);
@@ -190,18 +190,18 @@ void KwikDisk::updateDFDone()
TQPixmap *pix = new TQPixmap(KSystemTray::loadIcon(disk->iconName()));
- if( getuid() !=0 && disk->mountOptions().find("user",0, false) == -1 )
+ if( getuid() !=0 && disk->mountOptions().tqfind("user",0, false) == -1 )
{
//
// Special root icon, normal user cant mount.
//
// 2000-01-23 Espen Sand
- // Careful here: If the mask has not been defined we can
- // not use TQPixmap::mask() because it returns 0 => segfault
+ // Careful here: If the tqmask has not been defined we can
+ // not use TQPixmap::tqmask() because it returns 0 => segfault
//
- if( pix->mask() != 0 )
+ if( pix->tqmask() != 0 )
{
- TQBitmap *bm = new TQBitmap(*(pix->mask()));
+ TQBitmap *bm = new TQBitmap(*(pix->tqmask()));
if( bm != 0 )
{
TQPainter qp( bm );
@@ -264,10 +264,10 @@ void KwikDisk::toggleMount(int item)
if( m_options.fileManager().isEmpty() == false )
{
TQString cmd = m_options.fileManager();
- int pos = cmd.find("%m");
+ int pos = cmd.tqfind("%m");
if( pos > 0 )
{
- cmd = cmd.replace( pos, 2, KProcess::quote(disk->mountPoint()) ) + " &";
+ cmd = cmd.tqreplace( pos, 2, KProcess::quote(disk->mountPoint()) ) + " &";
}
else
{
@@ -286,7 +286,7 @@ void KwikDisk::criticallyFull(DiskEntry *disk)
if( m_options.popupIfFull() == true )
{
TQString msg = i18n("Device [%1] on [%2] is getting critically full!")
- .arg(disk->deviceName()).arg(disk->mountPoint());
+ .tqarg(disk->deviceName()).tqarg(disk->mountPoint());
KMessageBox::sorry( this, msg, i18n("Warning"));
}
}
diff --git a/kdf/kwikdisk.h b/kdf/kwikdisk.h
index c404e84..7ac9576 100644
--- a/kdf/kwikdisk.h
+++ b/kdf/kwikdisk.h
@@ -42,6 +42,7 @@
class KwikDisk : public KSystemTray
{
Q_OBJECT
+ TQ_OBJECT
public:
KwikDisk();
diff --git a/kdf/listview.cpp b/kdf/listview.cpp
index 0334101..fc2dde6 100644
--- a/kdf/listview.cpp
+++ b/kdf/listview.cpp
@@ -20,7 +20,7 @@
//
// 1999-11-28 Espen Sand
// The purpose of this class is:
-// 1) Easily set minimum number of visible items and to adjust the sizeHint()
+// 1) Easily set minimum number of visible items and to adjust the tqsizeHint()
// 2) Provide a pixmap collection
//
@@ -34,8 +34,8 @@
template class TQDict<TQPixmap>;
-CListView::CListView( TQWidget *parent, const char *name, int visibleItem )
- :KListView( parent, name ), mVisibleItem(QMAX( 1, visibleItem ))
+CListView::CListView( TQWidget *tqparent, const char *name, int visibleItem )
+ :KListView( tqparent, name ), mVisibleItem(TQMAX( 1, visibleItem ))
{
setVisibleItem(visibleItem);
mPixDict.setAutoDelete(true);
@@ -43,23 +43,23 @@ CListView::CListView( TQWidget *parent, const char *name, int visibleItem )
void CListView::setVisibleItem( int visibleItem, bool updateSize )
{
- mVisibleItem = QMAX( 1, visibleItem );
+ mVisibleItem = TQMAX( 1, visibleItem );
if( updateSize == true )
{
- TQSize s = sizeHint();
- setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
+ TQSize s = tqsizeHint();
+ setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
lineWidth() * 2, s.height() );
}
}
-TQSize CListView::sizeHint( void ) const
+TQSize CListView::tqsizeHint( void ) const
{
- TQSize s = TQListView::sizeHint();
+ TQSize s = TQListView::tqsizeHint();
int h = fontMetrics().height() + 2*itemMargin();
if( h % 2 > 0 ) { h++; }
- s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
+ s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
return( s );
}
@@ -76,12 +76,12 @@ const TQPixmap &CListView::icon( const TQString &iconName, bool drawBorder )
{
//
// 2000-01-23 Espen Sand
- // Careful here: If the mask has not been defined we can
- // not use TQPixmap::mask() because it returns 0 => segfault
+ // Careful here: If the tqmask has not been defined we can
+ // not use TQPixmap::tqmask() because it returns 0 => segfault
//
- if( pix->mask() != 0 )
+ if( pix->tqmask() != 0 )
{
- TQBitmap *bm = new TQBitmap(*(pix->mask()));
+ TQBitmap *bm = new TQBitmap(*(pix->tqmask()));
if( bm != 0 )
{
TQPainter qp(bm);
@@ -99,7 +99,7 @@ const TQPixmap &CListView::icon( const TQString &iconName, bool drawBorder )
}
}
- mPixDict.replace( iconName, pix );
+ mPixDict.tqreplace( iconName, pix );
}
return( *pix );
diff --git a/kdf/listview.h b/kdf/listview.h
index d051fdf..c937539 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -28,12 +28,13 @@
class CListView : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
+ CListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 );
void setVisibleItem( int visibleItem, bool updateSize=true );
- virtual TQSize sizeHint( void ) const;
+ virtual TQSize tqsizeHint( void ) const;
const TQPixmap &icon( const TQString &iconName, bool drawBorder );
private:
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 0186cc4..caf584c 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -3,7 +3,7 @@
*
* Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -47,8 +47,8 @@ static bool GUI;
#endif
-MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
- : TQWidget(parent, name)
+MntConfigWidget::MntConfigWidget(TQWidget *tqparent, const char *name, bool init)
+ : TQWidget(tqparent, name)
{
mInitializing = false;
@@ -102,7 +102,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
mIconButton = new KIconButton(mGroupBox);
mIconButton->setIconType(KIcon::Small, KIcon::Device);
Q_CHECK_PTR(mIconButton);
- mIconButton->setFixedWidth( mIconButton->sizeHint().height() );
+ mIconButton->setFixedWidth( mIconButton->tqsizeHint().height() );
connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString)));
gl->addWidget( mIconButton, 2, 1 );
@@ -164,7 +164,7 @@ void MntConfigWidget::readDFDone( void )
TQListViewItem *item = 0;
for( DiskEntry *disk=mDiskList.first(); disk!=0; disk=mDiskList.next(),++i )
{
- item = new TQListViewItem( mList, item, TQString::null, disk->deviceName(),
+ item = new TQListViewItem( mList, item, TQString(), disk->deviceName(),
disk->mountPoint(), disk->mountCommand(), disk->umountCommand() );
item->setPixmap( ICONCOL, SmallIcon( disk->iconName() ) );
mDiskLookup[i] = item;
@@ -251,14 +251,14 @@ void MntConfigWidget::iconChangedButton(TQString iconName)
}
void MntConfigWidget::iconChanged(const TQString &iconName)
{
- if( iconName.findRev('_') == 0 ||
- (iconName.right(iconName.length()-iconName.findRev('_'))!="_mount" &&
- iconName.right(iconName.length()-iconName.findRev('_'))!="_unmount"))
+ if( iconName.tqfindRev('_') == 0 ||
+ (iconName.right(iconName.length()-iconName.tqfindRev('_'))!="_mount" &&
+ iconName.right(iconName.length()-iconName.tqfindRev('_'))!="_unmount"))
{
TQString msg = i18n(""
"This filename is not valid: %1\n"
"It must end with "
- "\"_mount\" or \"_unmount\".").arg(iconName);
+ "\"_mount\" or \"_unmount\".").tqarg(iconName);
KMessageBox::sorry( this, msg );
return;
}
diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h
index 931a109..f3f0d56 100644
--- a/kdf/mntconfig.h
+++ b/kdf/mntconfig.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
*
- * Requires the Qt widget libraries, available at no cost at
+ * Requires the TQt widget libraries, available at no cost at
* http://www.troll.no/
*
* This program is free software; you can redistribute it and/or modify
@@ -43,9 +43,10 @@ class TQListViewItem;
/**************************************************************/
-class MntConfigWidget : public QWidget
+class MntConfigWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
enum ColType
@@ -58,7 +59,7 @@ class MntConfigWidget : public QWidget
};
public:
- MntConfigWidget( TQWidget *parent=0, const char *name=0, bool init=false );
+ MntConfigWidget( TQWidget *tqparent=0, const char *name=0, bool init=false );
~MntConfigWidget();
public slots:
diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp
index 8da8dc2..39df7a0 100644
--- a/kdf/optiondialog.cpp
+++ b/kdf/optiondialog.cpp
@@ -23,11 +23,11 @@
#include "mntconfig.h"
#include "optiondialog.h"
-COptionDialog::COptionDialog( TQWidget *parent, const char *name, bool modal )
+COptionDialog::COptionDialog( TQWidget *tqparent, const char *name, bool modal )
:KDialogBase( Tabbed, i18n("Configure"), Help|Apply|Ok|Cancel, Ok,
- parent, name, modal )
+ tqparent, name, modal )
{
- setHelp( "kcontrol/kdf/index.html", TQString::null );
+ setHelp( "kcontrol/kdf/index.html", TQString() );
TQFrame *f1 = addPage( i18n("General Settings") );
TQVBoxLayout *l1 = new TQVBoxLayout( f1 );
diff --git a/kdf/optiondialog.h b/kdf/optiondialog.h
index 6a4bb74..ea3f4c3 100644
--- a/kdf/optiondialog.h
+++ b/kdf/optiondialog.h
@@ -28,9 +28,10 @@ class MntConfigWidget;
class COptionDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- COptionDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
+ COptionDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true );
~COptionDialog( void );
protected slots:
diff --git a/kedit/color.ui b/kedit/color.ui
index e171491..00f11c3 100644
--- a/kedit/color.ui
+++ b/kedit/color.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>Color</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Color</cstring>
</property>
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>111</height>
@@ -58,7 +58,7 @@
<string></string>
</property>
</widget>
- <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_CustomColor</cstring>
</property>
@@ -66,7 +66,7 @@
<string>Use &amp;custom colors</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -80,7 +80,7 @@
<cstring>kcfg_TextColor</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -122,7 +122,7 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index eb3c8af..d374987 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -84,7 +84,7 @@ TopLevel::TopLevel (TQWidget *, const char *name)
setupEditWidget();
if (!initialGeometrySet())
- resize( TQSize(550, 400).expandedTo(minimumSizeHint()));
+ resize( TQSize(550, 400).expandedTo(tqminimumSizeHint()));
setupGUI(ToolBar | Keys | StatusBar | Create);
setAutoSaveSettings();
@@ -195,42 +195,42 @@ void TopLevel::slotSelectionChanged()
void TopLevel::setupActions()
{
// setup File menu
- KStdAction::openNew(this, TQT_SLOT(file_new()), actionCollection());
- KStdAction::open(this, TQT_SLOT(file_open()), actionCollection());
- recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)),
+ KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection());
+ KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection());
+ recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)),
actionCollection());
- KStdAction::save(this, TQT_SLOT(file_save()), actionCollection());
- KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection());
- KStdAction::close(this, TQT_SLOT(file_close()), actionCollection());
- KStdAction::print(this, TQT_SLOT(print()), actionCollection());
- KStdAction::mail(this, TQT_SLOT(mail()), actionCollection());
- KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(file_save()), actionCollection());
+ KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(file_save_as()), actionCollection());
+ KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection());
+ KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
+ KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
// setup edit menu
- undoAction = KStdAction::undo(this, TQT_SLOT(undo()), actionCollection());
- redoAction = KStdAction::redo(this, TQT_SLOT(redo()), actionCollection());
- cutAction = KStdAction::cut(this, TQT_SLOT(cut()), actionCollection());
- copyAction = KStdAction::copy(this, TQT_SLOT(copy()), actionCollection());
- KStdAction::pasteText(this, TQT_SLOT(paste()), actionCollection());
- KStdAction::selectAll(this, TQT_SLOT(select_all()), actionCollection());
- KStdAction::find(this, TQT_SLOT(search()), actionCollection());
- KStdAction::findNext(this, TQT_SLOT(search_again()), actionCollection());
- KStdAction::replace(this, TQT_SLOT(replace()), actionCollection());
-
- (void)new KAction(i18n("&Insert File..."), 0, this, TQT_SLOT(file_insert()),
+ undoAction = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection());
+ redoAction = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(redo()), actionCollection());
+ cutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), actionCollection());
+ copyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection());
+ KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection());
+ KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(select_all()), actionCollection());
+ KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection());
+ KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(search_again()), actionCollection());
+ KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(tqreplace()), actionCollection());
+
+ (void)new KAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(file_insert()),
actionCollection(), "insert_file");
- (void)new KAction(i18n("In&sert Date"), 0, this, TQT_SLOT(insertDate()),
+ (void)new KAction(i18n("In&sert Date"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertDate()),
actionCollection(), "insert_date");
- (void)new KAction(i18n("Cl&ean Spaces"), 0, this, TQT_SLOT(clean_space()),
+ (void)new KAction(i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(clean_space()),
actionCollection(), "clean_spaces");
// setup Tools menu
- KStdAction::spelling(this, TQT_SLOT(spellcheck()), actionCollection());
+ KStdAction::spelling(TQT_TQOBJECT(this), TQT_SLOT(spellcheck()), actionCollection());
// setup Go menu
- KStdAction::gotoLine(this, TQT_SLOT(gotoLine()), actionCollection());
+ KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), actionCollection());
- KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection());
+ KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
}
void TopLevel::setupStatusBar()
@@ -265,7 +265,7 @@ void TopLevel::saveProperties(KConfig* config)
{
TQString name = m_url.url();
if (name.isEmpty())
- name = TQString("kedit%1-%2").arg(getpid()).arg((long)this);
+ name = TQString("kedit%1-%2").tqarg(getpid()).tqarg((long)this);
TQString tmplocation = kapp->tempSaveName(m_url.url());
config->writeEntry("saved_to",tmplocation);
saveFile(tmplocation, false, m_url.fileEncoding());
@@ -341,7 +341,7 @@ void TopLevel::insertDate(){
int line, column;
TQString string;
- TQDate dt = TQDate::currentDate();
+ TQDate dt = TQDate::tqcurrentDate();
string = KGlobal::locale()->formatDate(dt);
eframe->getCursorPosition(&line,&column);
@@ -390,7 +390,7 @@ void TopLevel::spellcheck()
statusBar()->changeItem(i18n("Spellcheck: Started."), ID_GENERAL);
initSpellConfig();
- kspell = new KSpell(this, i18n("Spellcheck"), this,
+ kspell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this),
TQT_SLOT( spell_started(KSpell *)), kspellconfigOptions);
connect (kspell, TQT_SIGNAL ( death()),
@@ -418,7 +418,7 @@ void TopLevel::spell_started( KSpell *)
void TopLevel::spell_progress (unsigned int percent)
{
TQString s;
- s = i18n("Spellcheck: %1% complete").arg(percent);
+ s = i18n("Spellcheck: %1% complete").tqarg(percent);
statusBar()->changeItem (s, ID_GENERAL);
}
@@ -445,11 +445,11 @@ TQString TopLevel::replaceISpell(TQString msg, int client)
{
switch(client)
{
- case KS_CLIENT_ISPELL: msg.replace("ISpell", "<b>ispell</b>"); break;
- case KS_CLIENT_ASPELL: msg.replace("ISpell", "<b>aspell</b>"); break;
- case KS_CLIENT_HSPELL: msg.replace("ISpell", "<b>hspell</b>"); break;
+ case KS_CLIENT_ISPELL: msg.tqreplace("ISpell", "<b>ispell</b>"); break;
+ case KS_CLIENT_ASPELL: msg.tqreplace("ISpell", "<b>aspell</b>"); break;
+ case KS_CLIENT_HSPELL: msg.tqreplace("ISpell", "<b>hspell</b>"); break;
}
- msg.replace("\n", "<p>");
+ msg.tqreplace("\n", "<p>");
return "<qt>"+msg+"</qt>";
}
@@ -479,7 +479,7 @@ void TopLevel::file_open( void )
while( 1 )
{
KURL url = KTextFileDialog::getOpenURLwithEncoding(
- TQString::null, TQString::null, this,
+ TQString(), TQString(), this,
i18n("Open File"));
if( url.isEmpty() )
{
@@ -549,7 +549,7 @@ void TopLevel::file_insert()
while( 1 )
{
KURL url = KTextFileDialog::getOpenURLwithEncoding(
- TQString::null, TQString::null, this,
+ TQString(), TQString(), this,
i18n("Insert File"), "", KStdGuiItem::insert().text());
if( url.isEmpty() )
{
@@ -597,7 +597,7 @@ bool TopLevel::queryClose()
TQString msg = i18n(""
"This document has been modified.\n"
"Would you like to save it?" );
- switch( KMessageBox::warningYesNoCancel( this, msg, TQString::null,
+ switch( KMessageBox::warningYesNoCancel( this, msg, TQString(),
KStdGuiItem::save(), KStdGuiItem::discard() ) )
{
case KMessageBox::Yes: // Save, then exit
@@ -618,7 +618,7 @@ bool TopLevel::queryClose()
msg = i18n(""
"Could not save the file.\n"
"Exit anyways?");
- switch( KMessageBox::warningContinueCancel( this, msg, TQString::null, KStdGuiItem::quit() ) )
+ switch( KMessageBox::warningContinueCancel( this, msg, TQString(), KStdGuiItem::quit() ) )
{
case KMessageBox::Continue:
return true; // Exit.
@@ -660,7 +660,7 @@ void TopLevel::file_close()
{
TQString msg = i18n("This document has been modified.\n"
"Would you like to save it?" );
- switch( KMessageBox::warningYesNoCancel( this, msg, TQString::null,
+ switch( KMessageBox::warningYesNoCancel( this, msg, TQString(),
KStdGuiItem::save(), KStdGuiItem::discard() ) )
{
case KMessageBox::Yes: // Save, then close
@@ -699,7 +699,7 @@ void TopLevel::file_save()
if ( result == KEDIT_OK ){
TQString string;
- string = i18n("Wrote: %1").arg(m_caption);
+ string = i18n("Wrote: %1").tqarg(m_caption);
setGeneralStatusField(string);
}
}
@@ -721,7 +721,7 @@ void TopLevel::file_save_as()
while(true)
{
u = KTextFileDialog::getSaveURLwithEncoding(
- m_url.url(), TQString::null, this,
+ m_url.url(), TQString(), this,
i18n("Save File As"),
m_url.fileEncoding());
@@ -732,7 +732,7 @@ void TopLevel::file_save_as()
{
int result = KMessageBox::warningContinueCancel( this,
i18n( "A file named \"%1\" already exists. "
- "Are you sure you want to overwrite it?" ).arg( u.prettyURL() ),
+ "Are you sure you want to overwrite it?" ).tqarg( u.prettyURL() ),
i18n( "Overwrite File?" ),
i18n( "Overwrite" ) );
@@ -748,7 +748,7 @@ void TopLevel::file_save_as()
{
m_url = u;
setFileCaption();
- TQString string = i18n("Saved as: %1").arg(m_caption);
+ TQString string = i18n("Saved as: %1").tqarg(m_caption);
setGeneralStatusField(string);
recent->addURL( u );
}
@@ -762,11 +762,11 @@ void TopLevel::mail()
// Default subject string
//
TQString defaultsubject = name();
- int index = defaultsubject.findRev('/');
+ int index = defaultsubject.tqfindRev('/');
if( index != -1)
defaultsubject = defaultsubject.right(defaultsubject.length() - index - 1 );
- kapp->invokeMailer( TQString::null, TQString::null, TQString::null,
+ kapp->invokeMailer( TQString(), TQString(), TQString(),
defaultsubject, eframe->text() );
}
@@ -788,7 +788,7 @@ void TopLevel::fancyprint(){
y += fm.ascent();
TQString line;
line = eframe->textLine(i);
- line.replace( TQRegExp("\t"), " " );
+ line.tqreplace( TQRegExp("\t"), " " );
strncpy(buf,line.local8Bit(),160);
for (int j = 0 ; j <150; j++){
if (!isprint(buf[j]))
@@ -818,7 +818,7 @@ void TopLevel::search(){
statusbar_slot();
}
-void TopLevel::replace(){
+void TopLevel::tqreplace(){
eframe->replace();
statusbar_slot();
}
@@ -867,12 +867,12 @@ void TopLevel::setFileCaption()
else
{
KURL url(m_url);
- url.setQuery(TQString::null);
+ url.setQuery(TQString());
m_caption = url.prettyURL();
}
TQString encoding = m_url.fileEncoding();
if (!encoding.isEmpty())
- m_caption += TQString(" (%1)").arg(encoding);
+ m_caption += TQString(" (%1)").tqarg(encoding);
}
setCaption(m_caption, eframe->isModified());
}
@@ -887,8 +887,8 @@ void TopLevel::statusbar_slot(){
TQString linenumber;
linenumber = i18n("Line: %1 Col: %2")
- .arg(eframe->currentLine() + 1)
- .arg(eframe->currentColumn() +1);
+ .tqarg(eframe->currentLine() + 1)
+ .tqarg(eframe->currentColumn() +1);
statusBar()->changeItem(linenumber,ID_LINE_COLUMN);
}
@@ -896,8 +896,8 @@ void TopLevel::statusbar_slot(){
void TopLevel::print()
{
bool aborted = false;
- TQString headerLeft = i18n("Date: %1").arg(KGlobal::locale()->formatDate(TQDate::currentDate(),true));
- TQString headerMid = i18n("File: %1").arg(m_caption);
+ TQString headerLeft = i18n("Date: %1").tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(),true));
+ TQString headerMid = i18n("File: %1").tqarg(m_caption);
TQString headerRight;
TQFont printFont = eframe->font();
@@ -908,7 +908,7 @@ void TopLevel::print()
TQFontMetrics headerFontMetrics(headerFont);
KPrinter *printer = new KPrinter;
- if(printer->setup(this, i18n("Print %1").arg(m_caption))) {
+ if(printer->setup(this, i18n("Print %1").tqarg(m_caption))) {
// set up KPrinter
printer->setFullPage(false);
printer->setCreator("KEdit");
@@ -932,13 +932,13 @@ void TopLevel::print()
while(true) {
- headerRight = TQString("#%1").arg(page);
+ headerRight = TQString("#%1").tqarg(page);
dy = headerFontMetrics.lineSpacing();
TQRect body( 0, dy*2, metrics.width(), metrics.height()-dy*2);
- p->drawText(0, 0, metrics.width(), dy, Qt::AlignLeft, headerLeft);
- p->drawText(0, 0, metrics.width(), dy, Qt::AlignHCenter, headerMid);
- p->drawText(0, 0, metrics.width(), dy, Qt::AlignRight, headerRight);
+ p->drawText(0, 0, metrics.width(), dy, TQt::AlignLeft, headerLeft);
+ p->drawText(0, 0, metrics.width(), dy, TQt::AlignHCenter, headerMid);
+ p->drawText(0, 0, metrics.width(), dy, TQt::AlignRight, headerRight);
TQPen pen;
pen.setWidth(3);
@@ -1125,7 +1125,7 @@ void TopLevel::openURL( const KURL& _url, int _mode )
if ( !_url.isValid() )
{
TQString string;
- string = i18n( "Malformed URL\n%1").arg(_url.url());
+ string = i18n( "Malformed URL\n%1").tqarg(_url.url());
KMessageBox::sorry(this, string);
return;
@@ -1204,7 +1204,7 @@ void TopLevel::timer_slot(){
void TopLevel::set_colors()
{
- TQPalette mypalette = (eframe->palette()).copy();
+ TQPalette mypalette = TQPalette((eframe->tqpalette()));
TQColorGroup ncgrp( mypalette.active() );
@@ -1317,8 +1317,8 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv)
return a.exec ();
}
-SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig)
- : KConfigDialog(parent, name, config),
+SettingsDialog::SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig)
+ : KConfigDialog(tqparent, name, config),
spellConfig(_spellConfig), spellConfigChanged(false)
{
// Font
diff --git a/kedit/kedit.h b/kedit/kedit.h
index 5e075c1..4ea6f36 100644
--- a/kedit/kedit.h
+++ b/kedit/kedit.h
@@ -48,6 +48,7 @@ namespace KIO { class Job; }
class TopLevel : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
enum { KEDIT_OK = 0,
@@ -61,7 +62,7 @@ public:
OPEN_INSERT = 4,
OPEN_NEW = 8 };
- TopLevel( TQWidget *parent=0, const char *name=0 );
+ TopLevel( TQWidget *tqparent=0, const char *name=0 );
~TopLevel();
/**
@@ -176,7 +177,7 @@ public slots:
void file_save_as();
void helpselected();
void search();
- void replace();
+ void tqreplace();
void search_again();
void toggle_overwrite();
@@ -205,9 +206,10 @@ private slots:
class SettingsDialog: public KConfigDialog {
Q_OBJECT
+ TQ_OBJECT
public:
- SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig);
+ SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig);
protected slots:
void updateSettings();
diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp
index 794fff9..11649a4 100644
--- a/kedit/ktextfiledlg.cpp
+++ b/kedit/ktextfiledlg.cpp
@@ -32,9 +32,9 @@
KTextFileDialog::KTextFileDialog(const TQString& startDir,
const TQString& filter,
- TQWidget *parent, const char* name,
+ TQWidget *tqparent, const char* name,
bool modal)
- : KFileDialog(startDir, filter, parent, name, modal)
+ : KFileDialog(startDir, filter, tqparent, name, modal)
{
/*
// insert encoding action into toolbar
@@ -50,7 +50,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir,
TQStringList::Iterator it;
int i = 0;
for( it = encodings.begin(); it != encodings.end(); ++it) {
- if ( (*it).contains( encodingStr ) ) {
+ if ( (*it).tqcontains( encodingStr ) ) {
mEncoding->setCurrentItem( i );
break;
}
@@ -63,9 +63,9 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir,
KAction* mEncoding = new KAction(
i18n("Select Encoding..."), 0,
- this, TQT_SLOT( slotShowEncCombo() ), this, "encoding");
+ TQT_TQOBJECT(this), TQT_SLOT( slotShowEncCombo() ), TQT_TQOBJECT(this), "encoding");
- mEncoding->setIcon( TQString::fromLatin1("charset") );
+ mEncoding->setIcon( TQString::tqfromLatin1("charset") );
KToolBar *tb = toolBar();
mEncoding->plug( tb, pathComboIndex() - 1 );
@@ -88,7 +88,7 @@ void KTextFileDialog::slotShowEncCombo()
TQComboBox *encCombo;
TQVBox *vbox;
- // Create widgets, and display using geometry management
+ // Create widgets, and display using tqgeometry management
encDlg = new KDialogBase( this,
"Encoding Dialog", true, i18n("Select Encoding"),
KDialogBase::Ok | KDialogBase::Cancel );
@@ -96,7 +96,7 @@ void KTextFileDialog::slotShowEncCombo()
vbox->setSpacing( KDialog::spacingHint() );
encDlg->setMainWidget( vbox );
label = new TQLabel( vbox );
- label->setAlignment( AlignLeft | AlignVCenter );
+ label->tqsetAlignment( AlignLeft | AlignVCenter );
label->setText(i18n("Select encoding for text file: "));
encCombo = new TQComboBox(vbox);
@@ -111,7 +111,7 @@ void KTextFileDialog::slotShowEncCombo()
int i = 1;
for( it = encodings.begin(); it != encodings.end(); ++it) {
- if ( (*it).contains( encoding() ) ) {
+ if ( (*it).tqcontains( encoding() ) ) {
encCombo->setCurrentItem( i );
break;
}
@@ -144,12 +144,12 @@ void KTextFileDialog::slotShowEncCombo()
KURL KTextFileDialog::getOpenURLwithEncoding(
const TQString& startDir,
const TQString& filter,
- TQWidget *parent,
+ TQWidget *tqparent,
const TQString& caption,
const TQString& encoding,
const TQString& buttontext)
{
- KTextFileDialog dlg(startDir, filter, parent, "filedialog", true);
+ KTextFileDialog dlg(startDir, filter, tqparent, "filedialog", true);
dlg.setEncoding(encoding);
dlg.setOperationMode( Opening );
@@ -175,11 +175,11 @@ KURL KTextFileDialog::getOpenURLwithEncoding(
KURL KTextFileDialog::getSaveURLwithEncoding(
const TQString& dir, const TQString& filter,
- TQWidget *parent,
+ TQWidget *tqparent,
const TQString& caption,
const TQString& encoding)
{
- KTextFileDialog dlg(dir, filter, parent, "filedialog", true);
+ KTextFileDialog dlg(dir, filter, tqparent, "filedialog", true);
dlg.setEncoding(encoding);
dlg.setOperationMode( Saving );
diff --git a/kedit/ktextfiledlg.h b/kedit/ktextfiledlg.h
index ba9ab4a..eda651a 100644
--- a/kedit/ktextfiledlg.h
+++ b/kedit/ktextfiledlg.h
@@ -38,27 +38,28 @@ class KURL;
class KTextFileDialog : public KFileDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
KTextFileDialog(const TQString& startDir, const TQString& filter,
- TQWidget *parent, const char *name,
+ TQWidget *tqparent, const char *name,
bool modal);
~KTextFileDialog();
static KURL getOpenURLwithEncoding(
- const TQString& startDir = TQString::null,
- const TQString& filter= TQString::null,
- TQWidget *parent= 0,
- const TQString& caption = TQString::null,
- const TQString& encoding = TQString::null,
- const TQString& buttonText = TQString::null);
+ const TQString& startDir = TQString(),
+ const TQString& filter= TQString(),
+ TQWidget *tqparent= 0,
+ const TQString& caption = TQString(),
+ const TQString& encoding = TQString(),
+ const TQString& buttonText = TQString());
static KURL getSaveURLwithEncoding(
const TQString& dir, const TQString& filter,
- TQWidget *parent,
+ TQWidget *tqparent,
const TQString& caption,
- const TQString& encoding = TQString::null);
+ const TQString& encoding = TQString());
TQString &encoding() { return enc; }
void setEncoding(const TQString& encoding);
diff --git a/kedit/misc.ui b/kedit/misc.ui
index 2a30333..fa1ac30 100644
--- a/kedit/misc.ui
+++ b/kedit/misc.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>Misc</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Misc</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -30,7 +30,7 @@
<cstring>kcfg_WrapMode</cstring>
</property>
</widget>
- <widget class="QSpinBox" row="1" column="1">
+ <widget class="TQSpinBox" row="1" column="1">
<property name="name">
<cstring>kcfg_WrapColumn</cstring>
</property>
@@ -41,7 +41,7 @@
<number>999999999</number>
</property>
</widget>
- <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_BackupCopies</cstring>
</property>
@@ -52,7 +52,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<item>
<property name="text">
<string>Disable Wrapping</string>
@@ -82,14 +82,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>101</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>wrapLabel</cstring>
</property>
@@ -116,8 +116,8 @@
<includes>
<include location="local" impldecl="in implementation">misc.ui.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot>settingsWrapMode( int mode )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kedit/misc.ui.h b/kedit/misc.ui.h
index 339c944..1a87350 100644
--- a/kedit/misc.ui.h
+++ b/kedit/misc.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index 5075025..110bc20 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -48,8 +48,8 @@
#include "floppy.h"
#include "format.h"
-FloppyData::FloppyData(TQWidget * parent, const char * name)
- : KDialog( parent, name ),
+FloppyData::FloppyData(TQWidget * tqparent, const char * name)
+ : KDialog( tqparent, name ),
formatActions(0L), m_canLowLevel(false), m_canZeroOut( false )
{
@@ -288,7 +288,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name)
frame = new TQLabel( this, "NewsWindow" );
frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
- frame->setAlignment(WordBreak|ExpandTabs);
+ frame->tqsetAlignment(WordBreak|ExpandTabs);
TQWhatsThis::add( frame,
i18n("<qt>This is the status window, where error messages are displayed.</qt>") );
@@ -334,7 +334,7 @@ void FloppyData::closeEvent(TQCloseEvent*)
void FloppyData::keyPressEvent(TQKeyEvent *e)
{
switch(e->key()) {
- case Qt::Key_F1:
+ case TQt::Key_F1:
kapp->invokeHelp();
break;
default:
@@ -497,7 +497,7 @@ void FloppyData::format(){
if (KMessageBox::warningContinueCancel( this,
i18n("<qt>Formatting will erase all data on the device:<br/><b>%1</b><br/>"
"(Please check the correctness of the device name.)<br/>"
- "Are you sure you wish to proceed?</qt>").arg( currentComboBoxDevice )
+ "Are you sure you wish to proceed?</qt>").tqarg( currentComboBoxDevice )
, i18n("Proceed?") ) != KMessageBox::Continue)
{
return;
@@ -524,7 +524,7 @@ void FloppyData::format(){
setEnabled(false);
// Erase text box
- frame->setText( TQString::null );
+ frame->setText( TQString() );
if ( !userDevice )
{
@@ -536,10 +536,10 @@ void FloppyData::format(){
}
if (formatActions) delete formatActions;
- formatActions = new KFActionQueue(this);
+ formatActions = new KFActionQueue(TQT_TQOBJECT(this));
connect(formatActions,TQT_SIGNAL(status(const TQString &,int)),
- this,TQT_SLOT(formatStatus(const TQString &,int)));
+ this,TQT_SLOT(formattqStatus(const TQString &,int)));
connect(formatActions,TQT_SIGNAL(done(KFAction *,bool)),
this,TQT_SLOT(reset()));
@@ -550,7 +550,7 @@ void FloppyData::format(){
}
else if ( zerooutformat->isChecked() )
{
- DDZeroOut* f = new DDZeroOut( this );
+ DDZeroOut* f = new DDZeroOut( TQT_TQOBJECT(this) );
if ( userDevice )
{
f->configureDevice( currentComboBoxDevice );
@@ -569,7 +569,7 @@ void FloppyData::format(){
}
else
{
- FDFormat *f = new FDFormat(this);
+ FDFormat *f = new FDFormat(TQT_TQOBJECT(this));
f->configureDevice(drive,blocks);
f->configure(verifylabel->isChecked());
formatActions->queue(f);
@@ -577,7 +577,7 @@ void FloppyData::format(){
if ( filesystemComboBox->currentText() == i18n("DOS") )
{
- FATFilesystem *f = new FATFilesystem(this);
+ FATFilesystem *f = new FATFilesystem(TQT_TQOBJECT(this));
f->configure(verifylabel->isChecked(),
labellabel->isChecked(),
lineedit->text());
@@ -594,7 +594,7 @@ void FloppyData::format(){
else if ( filesystemComboBox->currentText() == i18n("ext2") )
{
- Ext2Filesystem *f = new Ext2Filesystem(this);
+ Ext2Filesystem *f = new Ext2Filesystem(TQT_TQOBJECT(this));
f->configure(verifylabel->isChecked(),
labellabel->isChecked(),
lineedit->text());
@@ -612,7 +612,7 @@ void FloppyData::format(){
#ifdef ANY_BSD
else if ( filesystemComboBox->currentText() == i18n("UFS") )
{
- FloppyAction *f = new UFSFilesystem(this);
+ FloppyAction *f = new UFSFilesystem(TQT_TQOBJECT(this));
f->configureDevice(drive,blocks);
formatActions->queue(f);
}
@@ -621,7 +621,7 @@ void FloppyData::format(){
#ifdef ANY_LINUX
else if ( filesystemComboBox->currentText() == i18n("Minix") )
{
- MinixFilesystem *f = new MinixFilesystem(this);
+ MinixFilesystem *f = new MinixFilesystem(TQT_TQOBJECT(this));
f->configure(verifylabel->isChecked(),
labellabel->isChecked(),
lineedit->text());
@@ -642,9 +642,9 @@ void FloppyData::format(){
formatActions->exec();
}
-void FloppyData::formatStatus(const TQString &s,int p)
+void FloppyData::formattqStatus(const TQString &s,int p)
{
- kdDebug(2002) << "FloppyData::formatStatus: " << s << " : " << p << endl;
+ kdDebug(2002) << "FloppyData::formattqStatus: " << s << " : " << p << endl;
if (!s.isEmpty())
{
const TQString oldText ( frame->text() );
diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h
index 49b0766..c95dbc6 100644
--- a/kfloppy/floppy.h
+++ b/kfloppy/floppy.h
@@ -44,9 +44,10 @@ class KFActionQueue;
class FloppyData : public KDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- FloppyData(TQWidget* parent = 0, const char * name = 0);
+ FloppyData(TQWidget* tqparent = 0, const char * name = 0);
virtual ~FloppyData();
/// Need to overload normal show() in order to mangle caption
@@ -64,7 +65,7 @@ public:
void readSettings();
/// Map stored settings to widget status
void setWidgets();
- /// A kind of TQString::find()
+ /// A kind of TQString::tqfind()
int findKeyWord(TQString &, const TQString &);
/// Enable/disable all UI elements
void setEnabled(bool);
@@ -74,7 +75,7 @@ public slots:
void format();
void reset();
- void formatStatus(const TQString &,int);
+ void formattqStatus(const TQString &,int);
protected slots:
diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp
index 485acc3..ea98530 100644
--- a/kfloppy/format.cpp
+++ b/kfloppy/format.cpp
@@ -34,7 +34,7 @@
#include "format.h"
-static TQString extPath = TQString::null;
+static TQString extPath = TQString();
/* static */ TQString findExecutable(const TQString &e)
{
@@ -51,8 +51,8 @@ static TQString extPath = TQString::null;
-KFAction::KFAction(TQObject *parent) :
- TQObject(parent)
+KFAction::KFAction(TQObject *tqparent) :
+ TQObject(tqparent)
{
DEBUGSETUP;
}
@@ -79,8 +79,8 @@ public:
TQPtrList<KFAction> list;
} ;
-KFActionQueue::KFActionQueue(TQObject *parent) :
- KFAction(parent),
+KFActionQueue::KFActionQueue(TQObject *tqparent) :
+ KFAction(tqparent),
d(new KFActionQueue_p)
{
DEBUGSETUP;
@@ -262,11 +262,11 @@ bool FloppyAction::configureDevice(int drive,int density)
const char *devicename = 0L;
deviceInfo=0L;
- deviceName = TQString::null;
+ deviceName = TQString();
if ((drive<0) || (drive>1))
{
- emit status(i18n("Unexpected drive number %1.").arg(drive),-1);
+ emit status(i18n("Unexpected drive number %1.").tqarg(drive),-1);
return false;
}
@@ -278,7 +278,7 @@ bool FloppyAction::configureDevice(int drive,int density)
}
if (!deviceinfo)
{
- emit status(i18n("Unexpected density number %1.").arg(density),-1);
+ emit status(i18n("Unexpected density number %1.").tqarg(density),-1);
return false;
}
@@ -294,7 +294,7 @@ bool FloppyAction::configureDevice(int drive,int density)
if (!deviceinfo || !deviceinfo->devices)
{
emit status(i18n("Cannot find a device for drive %1 and density %2.")
- .arg(drive).arg(density),-1);
+ .tqarg(drive).tqarg(density),-1);
return false;
}
@@ -313,7 +313,7 @@ bool FloppyAction::configureDevice(int drive,int density)
{
const TQString str = i18n(
"Cannot access %1\nMake sure that the device exists and that "
- "you have write permission to it.").arg(deviceinfo->devices[0]);
+ "you have write permission to it.").tqarg(deviceinfo->devices[0]);
emit status(str,-1);
return false;
}
@@ -338,18 +338,18 @@ void FloppyAction::processDone(KProcess *p)
{
if (p->exitStatus() == 0)
{
- emit status(TQString::null,100);
+ emit status(TQString(),100);
emit done(this,true);
}
else
{
- emit status(i18n("The program %1 terminated with an error.").arg(theProcessName),100);
+ emit status(i18n("The program %1 terminated with an error.").tqarg(theProcessName),100);
emit done(this,false);
}
}
else
{
- emit status(i18n("The program %1 terminated abnormally.").arg(theProcessName),100);
+ emit status(i18n("The program %1 terminated abnormally.").tqarg(theProcessName),100);
emit done(this,false);
}
}
@@ -358,7 +358,7 @@ void FloppyAction::processStdOut(KProcess *, char *b, int l)
{
Q_UNUSED(b);
Q_UNUSED(l);
- kdDebug(KFAREA) << "stdout:" << TQString::fromLatin1(b,l) << endl;
+ kdDebug(KFAREA) << "stdout:" << TQString::tqfromLatin1(b,l) << endl;
}
void FloppyAction::processStdErr(KProcess *p, char *b, int l)
@@ -383,14 +383,14 @@ bool FloppyAction::startProcess()
}
-/* static */ TQString FDFormat::fdformatName = TQString::null;
+/* static */ TQString FDFormat::fdformatName = TQString();
FDFormat::FDFormat(TQObject *p) :
FloppyAction(p),
doVerify(true)
{
DEBUGSETUP;
- theProcessName = TQString::fromLatin1("fdformat");
+ theProcessName = TQString::tqfromLatin1("fdformat");
setName("FDFormat");
}
@@ -473,17 +473,17 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
if (b[0]=='F')
{
formatTrackCount++;
- emit status(TQString::null,
+ emit status(TQString(),
formatTrackCount * 100 / deviceInfo->tracks);
}
else if (b[0]=='E')
{
- emit status(i18n("Error formatting track %1.").arg(formatTrackCount),-1);
+ emit status(i18n("Error formatting track %1.").tqarg(formatTrackCount),-1);
}
else
{
- s = TQString::fromLatin1(b,l);
- if (s.contains("ioctl(FD_FORM)"))
+ s = TQString::tqfromLatin1(b,l);
+ if (s.tqcontains("ioctl(FD_FORM)"))
{
emit status (i18n(
"Cannot access floppy or floppy drive.\n"
@@ -491,7 +491,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
"have selected a valid floppy drive."),-1);
return;
}
- if (s.find("/dev/")>=0)
+ if (s.tqfind("/dev/")>=0)
{
emit status(s,-1);
return;
@@ -499,24 +499,24 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
DEBUGS(s);
}
#elif defined(ANY_LINUX)
- s = TQString::fromLatin1(b,l);
+ s = TQString::tqfromLatin1(b,l);
DEBUGS(s);
TQRegExp regexp( "([0-9]+)" );
- if ( s.startsWith( "bad data at cyl" ) || ( s.find( "Problem reading cylinder" ) != -1 ) )
+ if ( s.startsWith( "bad data at cyl" ) || ( s.tqfind( "Problem reading cylinder" ) != -1 ) )
{
if ( regexp.search( s ) > -1 )
{
const int track = regexp.cap(1).toInt();
- emit status(i18n("Low-level formatting error at track %1.").arg(track), -1);
+ emit status(i18n("Low-level formatting error at track %1.").tqarg(track), -1);
}
else
{
// This error should not happen
- emit status(i18n("Low-level formatting error: %1").arg(s), -1);
+ emit status(i18n("Low-level formatting error: %1").tqarg(s), -1);
}
return;
}
- else if (s.find("ioctl(FDFMTBEG)")!=-1)
+ else if (s.tqfind("ioctl(FDFMTBEG)")!=-1)
{
emit status (i18n(
"Cannot access floppy or floppy drive.\n"
@@ -524,15 +524,15 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
"have selected a valid floppy drive."),-1);
return;
}
- else if (s.find("busy")!=-1) // "Device or resource busy"
+ else if (s.tqfind("busy")!=-1) // "Device or resource busy"
{
emit status(i18n("Device busy.\nPerhaps you need to unmount the floppy first."),-1);
return;
}
// Be careful to leave "iotcl" as last before checking numbers
- else if (s.find("ioctl")!=-1)
+ else if (s.tqfind("ioctl")!=-1)
{
- emit status(i18n("Low-level format error: %1").arg(s),-1);
+ emit status(i18n("Low-level format error: %1").tqarg(s),-1);
return;
}
// Check for numbers at last (as /dev/fd0u1440 has numbers too)
@@ -542,7 +542,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
const int p = regexp.cap(1).toInt();
if ((p>=0) && (p<deviceInfo->tracks))
{
- emit status(TQString::null,
+ emit status(TQString(),
p * 100 / deviceInfo->tracks);
}
}
@@ -551,13 +551,13 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
}
-/* static */ TQString DDZeroOut::m_ddName = TQString::null;
+/* static */ TQString DDZeroOut::m_ddName = TQString();
DDZeroOut::DDZeroOut(TQObject *p) :
FloppyAction(p)
{
kdDebug(KFAREA) << (__PRETTY_FUNCTION__) << endl;
- theProcessName = TQString::fromLatin1("dd");
+ theProcessName = TQString::tqfromLatin1("dd");
setName("DD");
}
@@ -617,16 +617,16 @@ void DDZeroOut::processDone(KProcess *p)
*
* ### TODO: really check if the exit is not on an other error and then abort the formatting
*/
- emit status(TQString::null,100);
+ emit status(TQString(),100);
emit done(this,true);
}
-/* static */ TQString FATFilesystem::newfs_fat = TQString::null ;
+/* static */ TQString FATFilesystem::newfs_fat = TQString() ;
-FATFilesystem::FATFilesystem(TQObject *parent) :
- FloppyAction(parent)
+FATFilesystem::FATFilesystem(TQObject *tqparent) :
+ FloppyAction(tqparent)
{
DEBUGSETUP;
runtimeCheck();
@@ -656,7 +656,7 @@ bool FATFilesystem::configure(bool v,bool l,const TQString &lbl)
if (l)
label=lbl.simplifyWhiteSpace();
else
- label=TQString::null;
+ label=TQString();
return true;
}
@@ -720,20 +720,20 @@ void FATFilesystem::processStdOut(KProcess *, char *b, int l)
#ifdef ANY_BSD
// ### TODO: do some checks
#elif defined(ANY_LINUX)
- TQString s ( TQString::fromLatin1( b, l ) );
+ TQString s ( TQString::tqfromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
- if (s.find("mounted file system")!=-1) // "/dev/fd0 contains a mounted file system
+ if (s.tqfind("mounted file system")!=-1) // "/dev/fd0 contains a mounted file system
{
emit status(i18n("Floppy is mounted.\nYou need to unmount the floppy first."),-1);
return;
}
- else if (s.find("busy")!=-1) // "Device or resource busy"
+ else if (s.tqfind("busy")!=-1) // "Device or resource busy"
{
emit status(i18n("Device busy.\nPerhaps you need to unmount the floppy first."),-1);
return;
}
# if 0
- else if ( s.find( "mkdosfs" ) != -1 ) // DEBUG: get the program header and show it!
+ else if ( s.tqfind( "mkdosfs" ) != -1 ) // DEBUG: get the program header and show it!
{
emit status( s, -1 );
return;
@@ -747,10 +747,10 @@ void FATFilesystem::processStdOut(KProcess *, char *b, int l)
#ifdef ANY_BSD
-/* static */ TQString UFSFilesystem::newfs = TQString::null ;
+/* static */ TQString UFSFilesystem::newfs = TQString() ;
-UFSFilesystem::UFSFilesystem(TQObject *parent) :
- FloppyAction(parent)
+UFSFilesystem::UFSFilesystem(TQObject *tqparent) :
+ FloppyAction(tqparent)
{
DEBUGSETUP;
runtimeCheck();
@@ -792,7 +792,7 @@ void UFSFilesystem::exec()
// ### TODO: is it still needed? (FreeBSD 5.3's man page says: "For backward compatibility.")
if ( deviceInfo )
- *p << "-T" << TQString("fd%1").arg(deviceInfo->blocks);
+ *p << "-T" << TQString("fd%1").tqarg(deviceInfo->blocks);
*p << deviceName;
@@ -806,10 +806,10 @@ void UFSFilesystem::exec()
-/* static */ TQString Ext2Filesystem::newfs = TQString::null ;
+/* static */ TQString Ext2Filesystem::newfs = TQString() ;
-Ext2Filesystem::Ext2Filesystem(TQObject *parent) :
- FloppyAction(parent)
+Ext2Filesystem::Ext2Filesystem(TQObject *tqparent) :
+ FloppyAction(tqparent)
{
DEBUGSETUP;
runtimeCheck();
@@ -836,7 +836,7 @@ bool Ext2Filesystem::configure(bool v,bool l,const TQString &lbl)
}
else
{
- label=TQString::null;
+ label=TQString();
}
return true;
@@ -886,14 +886,14 @@ void Ext2Filesystem::processStdOut(KProcess *, char *b, int l)
#ifdef ANY_BSD
// ### TODO: do some checks
#elif defined(ANY_LINUX)
- TQString s ( TQString::fromLatin1( b, l ) );
+ TQString s ( TQString::tqfromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
- if (s.find("mounted")!=-1) // "/dev/fd0 is mounted; will not make a filesystem here!"
+ if (s.tqfind("mounted")!=-1) // "/dev/fd0 is mounted; will not make a filesystem here!"
{
emit status(i18n("Floppy is mounted.\nYou need to unmount the floppy first."),-1);
return;
}
- else if (s.find("busy")!=-1) // "Device or resource busy"
+ else if (s.tqfind("busy")!=-1) // "Device or resource busy"
{
emit status(i18n("Device busy.\nPerhaps you need to unmount the floppy first."),-1);
return;
@@ -904,10 +904,10 @@ void Ext2Filesystem::processStdOut(KProcess *, char *b, int l)
#ifdef ANY_LINUX
-/* static */ TQString MinixFilesystem::newfs = TQString::null ;
+/* static */ TQString MinixFilesystem::newfs = TQString() ;
-MinixFilesystem::MinixFilesystem(TQObject *parent) :
- FloppyAction(parent)
+MinixFilesystem::MinixFilesystem(TQObject *tqparent) :
+ FloppyAction(tqparent)
{
DEBUGSETUP;
runtimeCheck();
@@ -934,7 +934,7 @@ bool MinixFilesystem::configure(bool v,bool l,const TQString &lbl)
}
else
{
- label=TQString::null;
+ label=TQString();
}
return true;
@@ -977,14 +977,14 @@ void MinixFilesystem::exec()
void MinixFilesystem::processStdOut(KProcess *, char *b, int l)
{
- TQString s ( TQString::fromLatin1( b, l ) );
+ TQString s ( TQString::tqfromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
- if (s.find("mounted")!=-1) // "mkfs.minix: /dev/fd0 is mounted; will not make a filesystem here!"
+ if (s.tqfind("mounted")!=-1) // "mkfs.minix: /dev/fd0 is mounted; will not make a filesystem here!"
{
emit status(i18n("Floppy is mounted.\nYou need to unmount the floppy first."),-1);
return;
}
- else if (s.find("busy")!=-1) // "Device or resource busy"
+ else if (s.tqfind("busy")!=-1) // "Device or resource busy"
{
emit status(i18n("Device busy.\nPerhaps you need to unmount the floppy first."),-1);
return;
diff --git a/kfloppy/format.h b/kfloppy/format.h
index 6f8de58..f4c57c8 100644
--- a/kfloppy/format.h
+++ b/kfloppy/format.h
@@ -63,12 +63,13 @@
* and push a bunch of actions on it, then run exec()
* on the stack and wait for the done() signal.
*/
-class KFAction : public QObject
+class KFAction : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- KFAction(TQObject *parent = 0L);
+ KFAction(TQObject *tqparent = 0L);
virtual ~KFAction();
public slots:
@@ -115,9 +116,10 @@ signals:
class KFActionQueue : public KFAction
{
Q_OBJECT
+ TQ_OBJECT
public:
- KFActionQueue(TQObject *parent = 0L);
+ KFActionQueue(TQObject *tqparent = 0L);
virtual ~KFActionQueue();
/**
@@ -174,9 +176,10 @@ class KProcess;
class FloppyAction : public KFAction
{
Q_OBJECT
+ TQ_OBJECT
public:
- FloppyAction(TQObject *parent = 0L);
+ FloppyAction(TQObject *tqparent = 0L);
/**
* Kills the running process, if one exists.
@@ -249,7 +252,7 @@ protected:
class FDFormat : public FloppyAction
{
public:
- FDFormat(TQObject *parent = 0L);
+ FDFormat(TQObject *tqparent = 0L);
virtual void exec();
@@ -285,7 +288,7 @@ protected:
class DDZeroOut : public FloppyAction
{
public:
- DDZeroOut(TQObject *parent = 0L);
+ DDZeroOut(TQObject *tqparent = 0L);
virtual void exec();
@@ -315,7 +318,7 @@ protected:
class FATFilesystem : public FloppyAction
{
public:
- FATFilesystem(TQObject *parent = 0L);
+ FATFilesystem(TQObject *tqparent = 0L);
virtual void exec();
@@ -346,7 +349,7 @@ protected:
class Ext2Filesystem : public FloppyAction
{
public:
- Ext2Filesystem(TQObject *parent = 0L);
+ Ext2Filesystem(TQObject *tqparent = 0L);
virtual void exec();
@@ -374,7 +377,7 @@ protected:
class UFSFilesystem : public FloppyAction
{
public:
- UFSFilesystem(TQObject *parent = 0L);
+ UFSFilesystem(TQObject *tqparent = 0L);
virtual void exec();
@@ -396,7 +399,7 @@ protected:
class MinixFilesystem : public FloppyAction
{
public:
- MinixFilesystem(TQObject *parent = 0L);
+ MinixFilesystem(TQObject *tqparent = 0L);
virtual void exec();
diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp
index 51da7ef..e774a8f 100644
--- a/kfloppy/zip.cpp
+++ b/kfloppy/zip.cpp
@@ -188,7 +188,7 @@ void ZipFormat::transition()
<< "if=/dev/zero"
<< "of=/dev/afd0c"
<< "bs=8192" ;
- *p << TQString("count=%1").arg(totalBlocks);
+ *p << TQString("count=%1").tqarg(totalBlocks);
if (!p->start(KProcess::NotifyOnExit,KProcess::AllOutput))
{
emit statusMessage(i18n("Cannot start dd to zero disk."));
@@ -250,8 +250,8 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
DEBUGSETUP;
#ifdef DEBUG
- TQString o = TQString::fromLatin1(b,l);
- DEBUGS(TQString(" %1").arg(o).latin1());
+ TQString o = TQString::tqfromLatin1(b,l);
+ DEBUGS(TQString(" %1").tqarg(o).latin1());
#endif
switch(formatStep)
@@ -264,8 +264,8 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
if (totalBlocks>10000)
{
emit statusMessage(i18n("Zeroing block %1 of %2...")
- .arg(currentblock)
- .arg(totalBlocks));
+ .tqarg(currentblock)
+ .tqarg(totalBlocks));
}
}
break;
@@ -283,7 +283,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
//
emit setProgress(1);
- // TQString myBuf = TQString::fromLatin1(b, l);
+ // TQString myBuf = TQString::tqfromLatin1(b, l);
// DEBUGS(myBuf.latin1());
}
break;
diff --git a/kfloppy/zip.h b/kfloppy/zip.h
index 93cb234..b422c92 100644
--- a/kfloppy/zip.h
+++ b/kfloppy/zip.h
@@ -47,6 +47,7 @@ class KConfig;
class ZipFormat : public DiskFormat
{
Q_OBJECT
+ TQ_OBJECT
public:
ZipFormat(TQWidget *w, const char *n);
diff --git a/kgpg/adduid.ui b/kgpg/adduid.ui
index b7e5b1b..0fbaa39 100644
--- a/kgpg/adduid.ui
+++ b/kgpg/adduid.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>AddUid</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>AddUid</cstring>
</property>
@@ -34,7 +34,7 @@
<cstring>kLineEdit3</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -42,7 +42,7 @@
<string>Name (minimum 5 characters):</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -50,7 +50,7 @@
<string>Email:</string>
</property>
</widget>
- <widget class="QLabel" row="4" column="0">
+ <widget class="TQLabel" row="4" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -60,5 +60,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui
index bec30e9..4034ba5 100644
--- a/kgpg/conf_decryption.ui
+++ b/kgpg/conf_decryption.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>Decryption</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Decryption</cstring>
</property>
@@ -40,14 +40,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>155</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1_4_2</cstring>
</property>
@@ -62,8 +62,8 @@
</widget>
</grid>
</widget>
-<slots>
+<Q_SLOTS>
<slot>use_agent_toggled( bool isOn )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui
index c4d9f7f..184acf9 100644
--- a/kgpg/conf_encryption.ui
+++ b/kgpg/conf_encryption.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>Encryption</class>
<author>bj@altern.org</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Encryption</cstring>
</property>
@@ -23,7 +23,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="4">
+ <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>kcfg_PgpCompatibility</cstring>
</property>
@@ -38,11 +38,11 @@
&lt;p&gt;Checking this option forces GnuPG to output encrypted packets that are as compliant with PGP (Pretty Good Privacy) 6 standards as possible thus allowing GnuPG users to inter operate with PGP 6 users.&lt;/p&gt;&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="4">
+ <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>kcfg_AsciiArmor</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -56,7 +56,7 @@
&lt;p&gt;Checking this option outputs all encrypted files in a format that can be opened by a text editor and as such the output is suitable for placing in the body of an e-mail message.&lt;/p&gt;&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="4">
+ <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>kcfg_HideUserID</cstring>
</property>
@@ -68,7 +68,7 @@
&lt;p&gt;Checking this option will remove the keyid of the recipient from all encrypted packets. The advantage: traffic analysis of the encrypted packets cannot be performed as easily because the recipient is unknown. The disadvantage: the receiver of the encrypted packets is forced to try all secret keys before being able to decrypt the packets. This can be a lengthy process depending on the number of secret keys the receiver holds.&lt;/p&gt;&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="4">
+ <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>kcfg_ShredSource</cstring>
</property>
@@ -80,7 +80,7 @@
&lt;p&gt;Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered. But &lt;b&gt;you must be aware that this is not 100% secure&lt;/b&gt; on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).&lt;/p&gt;&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="4">
+ <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>kcfg_AllowUntrustedKeys</cstring>
</property>
@@ -102,22 +102,22 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>72</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="4">
+ <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="4">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_AllowCustomEncryptionOptions</cstring>
</property>
@@ -155,7 +155,7 @@
</widget>
</hbox>
</widget>
- <widget class="QCheckBox" row="8" column="0" rowspan="1" colspan="4">
+ <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>kcfg_PgpExtension</cstring>
</property>
@@ -167,7 +167,7 @@
&lt;p&gt;Checking this option will append a .pgp extension to all encrypted files instead of a .gpg extension. This option will maintain compatibility with users of PGP (Pretty Good Privacy) software.&lt;/p&gt;&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QLabel" row="6" column="0">
+ <widget class="TQLabel" row="6" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -193,7 +193,7 @@
&lt;p&gt;Checking this option and selecting a key will force any file encryption operation to use the selected key. KGpg will not query for a recipient and the default key will be bypassed.&lt;/p&gt;&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QToolButton" row="6" column="2">
+ <widget class="TQToolButton" row="6" column="2">
<property name="name">
<cstring>clear_fkey</cstring>
</property>
@@ -225,7 +225,7 @@
<string>Change...</string>
</property>
</widget>
- <widget class="QLabel" row="5" column="0">
+ <widget class="TQLabel" row="5" column="0">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -267,7 +267,7 @@
<string>Change...</string>
</property>
</widget>
- <widget class="QToolButton" row="5" column="2">
+ <widget class="TQToolButton" row="5" column="2">
<property name="name">
<cstring>clear_akey</cstring>
</property>
@@ -310,10 +310,10 @@
<includes>
<include location="local" impldecl="in implementation">conf_encryption.ui.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot>allow_custom_option_toggled( bool isOn )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kgpg/conf_encryption.ui.h b/kgpg/conf_encryption.ui.h
index 15310b6..2221856 100644
--- a/kgpg/conf_encryption.ui.h
+++ b/kgpg/conf_encryption.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui
index 9cbf931..d919ded 100644
--- a/kgpg/conf_gpg.ui
+++ b/kgpg/conf_gpg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>GPGConf</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>GPGConf</cstring>
</property>
@@ -24,7 +24,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QGroupBox" row="0" column="0">
+ <widget class="TQGroupBox" row="0" column="0">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -35,7 +35,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1_5_2</cstring>
</property>
@@ -43,7 +43,7 @@
<string>Configuration file:</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1_5_2_2</cstring>
</property>
@@ -68,7 +68,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton" row="1" column="3">
+ <widget class="TQPushButton" row="1" column="3">
<property name="name">
<cstring>changeHome</cstring>
</property>
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>190</width>
<height>20</height>
@@ -122,14 +122,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>54</height>
</size>
</property>
</spacer>
- <widget class="QCheckBox" row="2" column="0">
+ <widget class="TQCheckBox" row="2" column="0">
<property name="name">
<cstring>use_agent</cstring>
</property>
@@ -137,7 +137,7 @@
<string>&amp;Use GnuPG agent</string>
</property>
</widget>
- <widget class="QGroupBox" row="1" column="0">
+ <widget class="TQGroupBox" row="1" column="0">
<property name="name">
<cstring>groupBox2_2</cstring>
</property>
@@ -148,7 +148,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox" row="0" column="0">
+ <widget class="TQCheckBox" row="0" column="0">
<property name="name">
<cstring>kcfg_PubKeyring</cstring>
</property>
@@ -156,7 +156,7 @@
<string>Pu&amp;blic:</string>
</property>
</widget>
- <widget class="QCheckBox" row="1" column="0">
+ <widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>kcfg_PrivKeyring</cstring>
</property>
@@ -164,9 +164,9 @@
<string>Private:</string>
</property>
</widget>
- <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
+ <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<vbox>
<property name="name">
@@ -190,7 +190,7 @@
</widget>
</vbox>
</widget>
- <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_OnlyAdditional</cstring>
</property>
@@ -205,7 +205,7 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kgpg/conf_misc.ui b/kgpg/conf_misc.ui
index bfeb9c8..5b8548d 100644
--- a/kgpg/conf_misc.ui
+++ b/kgpg/conf_misc.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>MiscConf</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>MiscConf</cstring>
</property>
@@ -19,11 +19,11 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QTabWidget">
+ <widget class="TQTabWidget">
<property name="name">
<cstring>miscWidget</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -34,7 +34,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox" row="0" column="0">
+ <widget class="TQCheckBox" row="0" column="0">
<property name="name">
<cstring>kcfg_AutoStart</cstring>
</property>
@@ -49,11 +49,11 @@
&lt;p&gt;If checked KGpg will start automatically each time that KDE starts up.&lt;/p&gt;&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QCheckBox" row="1" column="0">
+ <widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>kcfg_UseMouseSelection</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -67,11 +67,11 @@
&lt;p&gt;If checked, clipboard operations in KGpg will use the selection clipboard, that means highlighting a text to copy, and middle button (or right+left together) to paste. If this option is not checked, the clipboard will work with Key shortcuts (Ctrl-c, Ctrl-v).&lt;/p&gt;&lt;/qt&gt; </string>
</property>
</widget>
- <widget class="QCheckBox" row="2" column="0">
+ <widget class="TQCheckBox" row="2" column="0">
<property name="name">
<cstring>kcfg_RemoteFileWarn</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -86,7 +86,7 @@
&lt;p&gt;&lt;/p&gt;&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QGroupBox" row="3" column="0">
+ <widget class="TQGroupBox" row="3" column="0">
<property name="name">
<cstring>groupShred</cstring>
</property>
@@ -107,14 +107,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>91</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton" row="2" column="1">
+ <widget class="TQPushButton" row="2" column="1">
<property name="name">
<cstring>pushShredder</cstring>
</property>
@@ -122,7 +122,7 @@
<string>Install Shredder</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel6</cstring>
</property>
@@ -132,18 +132,18 @@ It will shred (overwrite several times before erasing) the
files you drop on it, making it almost impossible to recover
the original file.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignJustify|AlignTop</set>
</property>
</widget>
- <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>shredInfo</cstring>
</property>
<property name="text">
<string>textLabel5</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
@@ -159,7 +159,7 @@ the original file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>71</height>
@@ -168,7 +168,7 @@ the original file.</string>
</spacer>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>TabPage</cstring>
</property>
@@ -179,7 +179,7 @@ the original file.</string>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -187,7 +187,7 @@ the original file.</string>
<string>Left mouse click opens (restart KGpg to apply):</string>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<item>
<property name="text">
<string>Key Manager</string>
@@ -220,14 +220,14 @@ the original file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>91</height>
</size>
</property>
</spacer>
- <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>groupBox11</cstring>
</property>
@@ -238,7 +238,7 @@ the original file.</string>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -259,7 +259,7 @@ the original file.</string>
&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1_3</cstring>
</property>
@@ -325,7 +325,7 @@ the original file.</string>
</widget>
</grid>
</widget>
- <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>groupBox3</cstring>
</property>
@@ -336,7 +336,7 @@ the original file.</string>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1_3_2</cstring>
</property>
@@ -349,7 +349,7 @@ the original file.</string>
&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1_2_2</cstring>
</property>
@@ -409,5 +409,5 @@ the original file.</string>
</widget>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui
index 022eca7..075d782 100644
--- a/kgpg/conf_servers.ui
+++ b/kgpg/conf_servers.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ServerConf</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ServerConf</cstring>
</property>
@@ -80,15 +80,15 @@
</sizepolicy>
</property>
</widget>
- <widget class="QLayoutWidget" row="4" column="0">
+ <widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1_4</cstring>
</property>
@@ -98,7 +98,7 @@ Only the default server will be stored in GnuPG's configuration file,
all others will be stored for use by KGpg only.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_UseProxy</cstring>
</property>
@@ -110,7 +110,7 @@ all others will be stored for use by KGpg only.</string>
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>klistbox.h</includehint>
diff --git a/kgpg/conf_ui2.ui b/kgpg/conf_ui2.ui
index 98e622b..26e3d79 100644
--- a/kgpg/conf_ui2.ui
+++ b/kgpg/conf_ui2.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>UIConf</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>UIConf</cstring>
</property>
@@ -19,11 +19,11 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QTabWidget" row="0" column="0">
+ <widget class="TQTabWidget" row="0" column="0">
<property name="name">
<cstring>tabWidget3</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -42,7 +42,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel1_3_3</cstring>
</property>
@@ -65,7 +65,7 @@
</color>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1_4</cstring>
</property>
@@ -73,7 +73,7 @@
<string>Trusted keys:</string>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel1_4_2</cstring>
</property>
@@ -81,7 +81,7 @@
<string>Expired/disabled keys:</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1_2_3</cstring>
</property>
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>210</height>
@@ -146,7 +146,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>140</width>
<height>20</height>
@@ -155,7 +155,7 @@
</spacer>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>TabPage</cstring>
</property>
@@ -168,7 +168,7 @@
</widget>
<customwidgets>
</customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/kgpg/detailedconsole.cpp b/kgpg/detailedconsole.cpp
index 3251056..308eec8 100644
--- a/kgpg/detailedconsole.cpp
+++ b/kgpg/detailedconsole.cpp
@@ -30,8 +30,8 @@
#include "detailedconsole.h"
-KDetailedConsole::KDetailedConsole(TQWidget *parent, const char *name,const TQString &boxLabel,const TQString &errormessage)
- : KDialogBase(parent,name,true,i18n("Sorry"),KDialogBase::Details|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok)
+KDetailedConsole::KDetailedConsole(TQWidget *tqparent, const char *name,const TQString &boxLabel,const TQString &errormessage)
+ : KDialogBase(tqparent,name,true,i18n("Sorry"),KDialogBase::Details|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok)
{
TQWidget *page = new TQWidget( this );
setMainWidget(page);
@@ -42,7 +42,7 @@ KDetailedConsole::KDetailedConsole(TQWidget *parent, const char *name,const TQSt
TQVGroupBox *detailsGroup = new TQVGroupBox( i18n("Details"), page);
(void) new TQLabel(errormessage,detailsGroup);
- //labdetails->setMinimumSize(labdetails->sizeHint());
+ //labdetails->setMinimumSize(labdetails->tqsizeHint());
setDetailsWidget(detailsGroup);
vbox->addWidget(lab1);
@@ -51,12 +51,12 @@ KDetailedConsole::KDetailedConsole(TQWidget *parent, const char *name,const TQSt
KDetailedConsole::~KDetailedConsole()
{}
-KDetailedInfo::KDetailedInfo(TQWidget *parent, const char *name , const TQString &boxLabel,const TQString &errormessage,TQStringList keysList)
- : KDialogBase(Swallow, i18n("Info"),KDialogBase::Details|KDialogBase::Ok, KDialogBase::Ok,parent,name,true)
+KDetailedInfo::KDetailedInfo(TQWidget *tqparent, const char *name , const TQString &boxLabel,const TQString &errormessage,TQStringList keysList)
+ : KDialogBase(Swallow, i18n("Info"),KDialogBase::Details|KDialogBase::Ok, KDialogBase::Ok,tqparent,name,true)
{
bool checkboxResult;
KMessageBox::createKMessageBox(this, TQMessageBox::Information,
- boxLabel, keysList,TQString::null,&checkboxResult, 0,errormessage);
+ boxLabel, keysList,TQString(),&checkboxResult, 0,errormessage);
}
KDetailedInfo::~KDetailedInfo()
diff --git a/kgpg/detailedconsole.h b/kgpg/detailedconsole.h
index 282516c..ef91446 100644
--- a/kgpg/detailedconsole.h
+++ b/kgpg/detailedconsole.h
@@ -24,7 +24,7 @@ class KDetailedConsole : public KDialogBase
{
public:
- KDetailedConsole(TQWidget *parent=0, const char *name=0,const TQString &boxLabel=TQString::null,const TQString &errormessage=TQString::null);
+ KDetailedConsole(TQWidget *tqparent=0, const char *name=0,const TQString &boxLabel=TQString(),const TQString &errormessage=TQString());
~KDetailedConsole();
};
@@ -34,7 +34,7 @@ class KDetailedInfo : public KDialogBase
{
public:
- KDetailedInfo(TQWidget *parent=0, const char *name=0,const TQString &boxLabel=TQString::null,const TQString &errormessage=TQString::null,TQStringList keysList=TQStringList());
+ KDetailedInfo(TQWidget *tqparent=0, const char *name=0,const TQString &boxLabel=TQString(),const TQString &errormessage=TQString(),TQStringList keysList=TQStringList());
~KDetailedInfo();
};
diff --git a/kgpg/groupedit.ui b/kgpg/groupedit.ui
index ca96e4b..41e66fe 100644
--- a/kgpg/groupedit.ui
+++ b/kgpg/groupedit.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>groupEdit</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>groupEdit</cstring>
</property>
@@ -85,7 +85,7 @@
</color>
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -101,7 +101,7 @@
<string>Available Trusted Keys</string>
</property>
</widget>
- <widget class="QPushButton" row="2" column="1">
+ <widget class="TQPushButton" row="2" column="1">
<property name="name">
<cstring>buttonAdd</cstring>
</property>
@@ -109,7 +109,7 @@
<string></string>
</property>
</widget>
- <widget class="QPushButton" row="2" column="2">
+ <widget class="TQPushButton" row="2" column="2">
<property name="name">
<cstring>buttonRemove</cstring>
</property>
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -205,7 +205,7 @@
</widget>
<customwidgets>
</customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kactivelabel.h</includehint>
</includehints>
diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui
index 35f4128..6ac8100 100644
--- a/kgpg/keyexport.ui
+++ b/kgpg/keyexport.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KeyExport</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KeyExport</cstring>
</property>
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -33,7 +33,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QCheckBox" row="1" column="0">
+ <widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>exportAttributes</cstring>
</property>
@@ -54,14 +54,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QButtonGroup" row="0" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>buttonGroup2</cstring>
</property>
@@ -72,7 +72,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>checkMail</cstring>
</property>
@@ -80,7 +80,7 @@
<string>Email</string>
</property>
</widget>
- <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>checkServer</cstring>
</property>
@@ -88,7 +88,7 @@
<string>Default key server</string>
</property>
</widget>
- <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>checkClipboard</cstring>
</property>
@@ -104,7 +104,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton" row="3" column="0">
+ <widget class="TQRadioButton" row="3" column="0">
<property name="name">
<cstring>checkFile</cstring>
</property>
@@ -132,10 +132,10 @@
<includes>
<include location="local" impldecl="in implementation">keyexport.ui.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot>checkFile_toggled( bool isOn )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/kgpg/keyexport.ui.h b/kgpg/keyexport.ui.h
index 89ef491..ac06c1f 100644
--- a/kgpg/keyexport.ui.h
+++ b/kgpg/keyexport.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp
index 26ecebe..5dfd9c7 100644
--- a/kgpg/keygener.cpp
+++ b/kgpg/keygener.cpp
@@ -34,7 +34,7 @@
#include "keygener.h"
/////////////////////// main window
-keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent, name, true,i18n("Key Generation"),Apply | Ok | Cancel)
+keyGenerate::keyGenerate(TQWidget *tqparent, const char *name):KDialogBase( tqparent, name, true,i18n("Key Generation"),Apply | Ok | Cancel)
{
expert=false;
setButtonApply(i18n("Expert Mode"));
@@ -64,7 +64,7 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent
keyexp->insertItem(i18n("Weeks"),2);
keyexp->insertItem(i18n("Months"),3);
keyexp->insertItem(i18n("Years"),4);
- keyexp->setMinimumSize(keyexp->sizeHint());
+ keyexp->setMinimumSize(keyexp->tqsizeHint());
connect(keyexp,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activateexp(int)));
(void) new TQLabel(i18n("Key size:"),bgroup1);
@@ -74,17 +74,17 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent
keysize->insertItem("2048");
keysize->insertItem("4096");
keysize->setCurrentItem("1024");
- keysize->setMinimumSize(keysize->sizeHint());
+ keysize->setMinimumSize(keysize->tqsizeHint());
(void) new TQLabel(i18n("Algorithm:"),bgroup1);
keykind = new KComboBox(bgroup1);
keykind->insertItem("DSA & ElGamal");
keykind->insertItem("RSA");
- keykind->setMinimumSize(keykind->sizeHint());
+ keykind->setMinimumSize(keykind->tqsizeHint());
vbox->addWidget(bgroup1);
page->show();
- page->resize(page->maximumSize());
+ page->resize(page->tqmaximumSize());
setMainWidget(page);
}
@@ -99,7 +99,7 @@ void keyGenerate::slotOk()
{
if (KMessageBox::warningContinueCancel(this,i18n("You are about to create a key with no email address"))!=KMessageBox::Continue) return;
}
- else if ((vmail.find(" ")!=-1) || (vmail.find(".")==-1) || (vmail.find("@")==-1)) {
+ else if ((vmail.tqfind(" ")!=-1) || (vmail.tqfind(".")==-1) || (vmail.tqfind("@")==-1)) {
KMessageBox::sorry(this,i18n("Email address not valid"));
return;
}
diff --git a/kgpg/keygener.h b/kgpg/keygener.h
index f9d662d..ba8c03c 100644
--- a/kgpg/keygener.h
+++ b/kgpg/keygener.h
@@ -25,8 +25,9 @@ class KLineEdit;
class keyGenerate : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- keyGenerate(TQWidget *parent=0, const char *name=0);
+ keyGenerate(TQWidget *tqparent=0, const char *name=0);
KComboBox *keykind,*keysize,*keyexp;
KLineEdit *numb,*comment,*kname,*mail;
diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp
index 21dbb1c..1264673 100644
--- a/kgpg/keyinfowidget.cpp
+++ b/kgpg/keyinfowidget.cpp
@@ -43,7 +43,7 @@
#include "kgpgsettings.h"
#include "kgpginterface.h"
-KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDialogBase( Swallow, i18n("Key Properties"), Close, Close, parent, name,true)
+KgpgKeyInfo::KgpgKeyInfo(TQWidget *tqparent, const char *name,TQString sigkey):KDialogBase( Swallow, i18n("Key Properties"), Close, Close, tqparent, name,true)
{
FILE *pass;
@@ -85,7 +85,7 @@ KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDi
connect(prop->kCOwnerTrust,TQT_SIGNAL(activated (int)),this,TQT_SLOT(slotChangeTrust(int)));
connect(this,TQT_SIGNAL(changeMainPhoto(const TQPixmap&)),this,TQT_SLOT(slotSetPhoto(const TQPixmap&)));
- //prop->setMinimumSize(prop->sizeHint());
+ //prop->setMinimumSize(prop->tqsizeHint());
}
void KgpgKeyInfo::slotDisableKey(bool isOn)
@@ -107,7 +107,7 @@ keyWasChanged=true;
void KgpgKeyInfo::loadKey(TQString Keyid)
{
TQColor trustColor;
-TQString fingervalue=TQString::null;
+TQString fingervalue=TQString();
FILE *pass;
char line[200]="";
TQString gpgOutput,fullID;
@@ -188,7 +188,7 @@ TQString gpgcmd="gpg --no-tty --no-secmem-warning --with-colon --with-fingerprin
break;
}
- if (gpgOutput.section(':',11,11).find("D",0,true)!=-1) // disabled key
+ if (gpgOutput.section(':',11,11).tqfind("D",0,true)!=-1) // disabled key
{
tr=i18n("Disabled");
trustColor=KGpgSettings::colorBad();
@@ -241,15 +241,15 @@ TQString gpgcmd="gpg --no-tty --no-secmem-warning --with-colon --with-fingerprin
}
prop->kCOwnerTrust->setCurrentItem(ownerTrust);
- if (fullname.find("<")!=-1) {
+ if (fullname.tqfind("<")!=-1) {
TQString kmail=fullname;
- if (fullname.find(")")!=-1)
+ if (fullname.tqfind(")")!=-1)
kmail=kmail.section(')',1);
kmail=kmail.section('<',1);
kmail.truncate(kmail.length()-1);
- if (kmail.find("<")!=-1) //////// several email addresses in the same key
+ if (kmail.tqfind("<")!=-1) //////// several email addresses in the same key
{
- kmail=kmail.replace(">",";");
+ kmail=kmail.tqreplace(">",";");
kmail.remove("<");
}
prop->tLMail->setText("<qt><a href=mailto:"+kmail+">"+kmail+"</a></qt>");
@@ -257,7 +257,7 @@ TQString gpgcmd="gpg --no-tty --no-secmem-warning --with-colon --with-fingerprin
prop->tLMail->setText(i18n("none"));
TQString kname=fullname.section('<',0,0);
- if (fullname.find("(")!=-1) {
+ if (fullname.tqfind("(")!=-1) {
kname=kname.section('(',0,0);
TQString comment=fullname.section('(',1,1);
comment=comment.section(')',0,0);
@@ -265,7 +265,7 @@ TQString gpgcmd="gpg --no-tty --no-secmem-warning --with-colon --with-fingerprin
} else
prop->tLComment->setText(i18n("none"));
- prop->tLName->setText("<qt><b>"+KgpgInterface::checkForUtf8(kname).replace(TQRegExp("<"),"&lt;")+"</b></qt>");
+ prop->tLName->setText("<qt><b>"+KgpgInterface::checkForUtf8(kname).tqreplace(TQRegExp("<"),"&lt;")+"</b></qt>");
}
if (gpgOutput.startsWith("fpr") && (fingervalue.isNull())) {
@@ -294,7 +294,7 @@ void KgpgKeyInfo::reloadMainPhoto(const TQString &uid)
kgpginfotmp->setAutoDelete(true);
TQString pgpgOutput="cp %i "+kgpginfotmp->name();
KProcIO *p=new KProcIO();
- *p<<"gpg"<<"--no-tty"<<"--show-photos"<<"--photo-viewer"<<TQFile::encodeName(pgpgOutput);
+ *p<<"gpg"<<"--no-tty"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput));
*p<<"--edit-key"<<displayedKeyID<<"uid"<<uid<<"showphoto";
TQObject::connect(p, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(finishphotoreadprocess(KProcIO *)));
TQObject::connect(p, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotMainImageRead(KProcess *)));
@@ -321,7 +321,7 @@ void KgpgKeyInfo::slotSetPhoto(const TQPixmap &pix)
{
TQImage dup=pix.convertToImage();
TQPixmap dup2;
-dup2.convertFromImage(dup.scale(prop->pLPhoto->width(),prop->pLPhoto->height(),TQImage::ScaleMin));
+dup2.convertFromImage(dup.scale(prop->pLPhoto->width(),prop->pLPhoto->height(),TQ_ScaleMin));
prop->pLPhoto->setPixmap(dup2);
}
@@ -330,10 +330,10 @@ prop->pLPhoto->setPixmap(dup2);
void KgpgKeyInfo::finishphotoreadprocess(KProcIO *p)
{
- TQString required=TQString::null;
+ TQString required=TQString();
while (p->readln(required,true)!=-1)
- if (required.find("keyedit.prompt")!=-1) {
- p->writeStdin("quit");
+ if (required.tqfind("keyedit.prompt")!=-1) {
+ p->writeStdin(TQString("quit"));
p->closeWhenDone();
}
@@ -346,7 +346,7 @@ void KgpgKeyInfo::openPhoto()
KService::Ptr ptr = offers.first();
//KMessageBox::sorry(0,ptr->desktopEntryName());
KProcIO *p=new KProcIO();
- *p<<"gpg"<<"--show-photos"<<"--photo-viewer"<<TQFile::encodeName(ptr->desktopEntryName()+" %i")<<"--list-keys"<<displayedKeyID;
+ *p<<"gpg"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(ptr