summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--arts/builder/TODO4
-rw-r--r--arts/builder/createtool.cpp12
-rw-r--r--arts/builder/dirmanager.cpp2
-rw-r--r--arts/builder/drawutils.cpp2
-rw-r--r--arts/builder/execdlg.cpp62
-rw-r--r--arts/builder/execdlg.h5
-rw-r--r--arts/builder/interfacedlg.cpp62
-rw-r--r--arts/builder/interfacedlg.h3
-rw-r--r--arts/builder/main.cpp86
-rw-r--r--arts/builder/main.h1
-rw-r--r--arts/builder/menumaker.cpp10
-rw-r--r--arts/builder/menumaker.h8
-rw-r--r--arts/builder/module.cpp10
-rw-r--r--arts/builder/module.h4
-rw-r--r--arts/builder/mwidget.cpp10
-rw-r--r--arts/builder/mwidget.h3
-rw-r--r--arts/builder/portposdlg.cpp58
-rw-r--r--arts/builder/portposdlg.h3
-rw-r--r--arts/builder/propertypanel.cpp16
-rw-r--r--arts/builder/propertypanel.h3
-rw-r--r--arts/builder/propertypanelbase.ui64
-rw-r--r--arts/builder/qttableview.cpp160
-rw-r--r--arts/builder/qttableview.h45
-rw-r--r--arts/builder/retrievedlg.cpp48
-rw-r--r--arts/builder/retrievedlg.h3
-rw-r--r--arts/builder/structureport.cpp12
-rw-r--r--arts/examples/README2
-rw-r--r--arts/examples/instrument_flexible_slide_GUI.arts14
-rw-r--r--arts/examples/instrument_moog_vcf_tune_GUI.arts10
-rw-r--r--arts/examples/mixer_element_eq.arts4
-rw-r--r--arts/examples/mixer_element_eqfx.arts20
-rw-r--r--arts/examples/mixer_element_simple.arts6
-rw-r--r--arts/examples/template_Instrument_GUI.arts4
-rw-r--r--arts/examples/template_Mixer_Element.arts6
-rw-r--r--arts/gui/common/artsgui.idl34
-rw-r--r--arts/gui/kde/artstestgui.cpp12
-rw-r--r--arts/gui/kde/dbtest.h1
-rw-r--r--arts/gui/kde/kartswidget.cpp32
-rw-r--r--arts/gui/kde/kartswidget.h14
-rw-r--r--arts/gui/kde/kbutton_impl.cpp4
-rw-r--r--arts/gui/kde/kbutton_impl.h3
-rw-r--r--arts/gui/kde/kcombobox_impl.cpp2
-rw-r--r--arts/gui/kde/kcombobox_impl.h3
-rw-r--r--arts/gui/kde/kfader.cpp8
-rw-r--r--arts/gui/kde/kfader.h7
-rw-r--r--arts/gui/kde/kfader_impl.h3
-rw-r--r--arts/gui/kde/kframe_impl.cpp4
-rw-r--r--arts/gui/kde/kframe_impl.h6
-rw-r--r--arts/gui/kde/kgraph.cpp12
-rw-r--r--arts/gui/kde/kgraph.h5
-rw-r--r--arts/gui/kde/kgraph_impl.h2
-rw-r--r--arts/gui/kde/kgraphline_impl.cpp2
-rw-r--r--arts/gui/kde/klabel_impl.cpp4
-rw-r--r--arts/gui/kde/klabel_impl.h3
-rw-r--r--arts/gui/kde/klayoutbox_impl.cpp26
-rw-r--r--arts/gui/kde/klayoutbox_impl.h10
-rw-r--r--arts/gui/kde/klevelmeter_firebars.cpp6
-rw-r--r--arts/gui/kde/klevelmeter_firebars.h2
-rw-r--r--arts/gui/kde/klevelmeter_impl.cpp4
-rw-r--r--arts/gui/kde/klevelmeter_linebars.cpp14
-rw-r--r--arts/gui/kde/klevelmeter_linebars.h1
-rw-r--r--arts/gui/kde/klevelmeter_normalbars.cpp4
-rw-r--r--arts/gui/kde/klevelmeter_normalbars.h4
-rw-r--r--arts/gui/kde/klevelmeter_private.h1
-rw-r--r--arts/gui/kde/klevelmeter_small.cpp4
-rw-r--r--arts/gui/kde/klevelmeter_small.h1
-rw-r--r--arts/gui/kde/klevelmeter_template.h1
-rw-r--r--arts/gui/kde/klineedit_impl.h3
-rw-r--r--arts/gui/kde/kpopupbox_impl.cpp12
-rw-r--r--arts/gui/kde/kpopupbox_private.h38
-rw-r--r--arts/gui/kde/kpoti.cpp94
-rw-r--r--arts/gui/kde/kpoti.h15
-rw-r--r--arts/gui/kde/kpoti_impl.h1
-rw-r--r--arts/gui/kde/kspinbox_impl.h3
-rw-r--r--arts/gui/kde/ktickmarks_impl.cpp12
-rw-r--r--arts/gui/kde/ktickmarks_impl.h1
-rw-r--r--arts/gui/kde/kvolumefader_impl.cpp10
-rw-r--r--arts/gui/kde/kvolumefader_impl.h1
-rw-r--r--arts/gui/kde/kwidget_impl.cpp26
-rw-r--r--arts/gui/kde/kwidget_impl.h5
-rw-r--r--arts/gui/kde/kwidgetrepo.cpp2
-rw-r--r--arts/gui/kde/kwidgetrepo.h2
-rw-r--r--arts/midi/Makefile.am4
-rw-r--r--arts/midi/artsmidi.idl2
-rw-r--r--arts/midi/audiosync_impl.cc2
-rw-r--r--arts/midi/audiosync_impl.h2
-rw-r--r--arts/midi/midisyncgroup_impl.cc4
-rw-r--r--arts/modules/README.environments2
-rw-r--r--arts/modules/common/artsmodulescommon.idl4
-rw-r--r--arts/modules/common/effectrackslot_impl.cc16
-rw-r--r--arts/modules/common/env_effectrackitem_impl.cc6
-rw-r--r--arts/modules/common/env_instrumentitem_impl.cc2
-rw-r--r--arts/modules/common/env_item_impl.cc2
-rw-r--r--arts/modules/common/env_item_impl.h2
-rw-r--r--arts/modules/common/env_mixeritem_impl.cc24
-rw-r--r--arts/modules/effects/fivebandmonocomplexeq_impl.cc22
-rw-r--r--arts/modules/effects/freeverb/Makefile.am8
-rw-r--r--arts/modules/effects/freeverb/revmodel.cpp2
-rw-r--r--arts/modules/effects/freeverb/revmodel.hpp2
-rw-r--r--arts/modules/effects/freeverbguifactory_impl.cc10
-rw-r--r--arts/modules/effects/kstereovolumecontrolgui_impl.cpp4
-rw-r--r--arts/modules/effects/kstereovolumecontrolgui_impl.h3
-rw-r--r--arts/modules/effects/stereocompressorguifactory_impl.cc2
-rw-r--r--arts/modules/effects/synth_freeverb_impl.cc2
-rw-r--r--arts/modules/effects/synth_stereo_fir_equalizer_impl.cc4
-rw-r--r--arts/modules/effects/voiceremovalguifactory_impl.cc4
-rw-r--r--arts/modules/synth/Makefile.am4
-rw-r--r--arts/modules/synth/c_filter_stuff.h12
-rw-r--r--arts/modules/synth/synth_cdelay_impl.cc20
-rw-r--r--arts/modules/synth/synth_delay_impl.cc20
-rw-r--r--arts/runtime/artsbuilder.idl16
-rw-r--r--arts/runtime/moduleinfo.cc4
-rw-r--r--arts/runtime/moduleinfo.h4
-rw-r--r--arts/runtime/structurebuilder_impl.cc12
-rw-r--r--arts/runtime/structures_impl.cc60
-rw-r--r--arts/tools/Makefile.am4
-rw-r--r--arts/tools/artsactions.cpp6
-rw-r--r--arts/tools/artsactions.h5
-rw-r--r--arts/tools/artscontrolapplet.cpp42
-rw-r--r--arts/tools/artscontrolapplet.h7
-rw-r--r--arts/tools/artscontrolapplet_private.h17
-rw-r--r--arts/tools/audiomanager.cpp28
-rw-r--r--arts/tools/audiomanager.h6
-rw-r--r--arts/tools/choosebusdlg.cpp62
-rw-r--r--arts/tools/choosebusdlg.h3
-rw-r--r--arts/tools/environmentview.cpp10
-rw-r--r--arts/tools/environmentview.h1
-rw-r--r--arts/tools/fftscopeview.cpp10
-rw-r--r--arts/tools/fftscopeview.h1
-rw-r--r--arts/tools/levelmeters.cpp50
-rw-r--r--arts/tools/levelmeters.h25
-rw-r--r--arts/tools/main.cpp10
-rw-r--r--arts/tools/main.h5
-rw-r--r--arts/tools/mediatypesview.cpp2
-rw-r--r--arts/tools/mediatypesview.h1
-rw-r--r--arts/tools/midiinstdlg.cpp56
-rw-r--r--arts/tools/midiinstdlg.h3
-rw-r--r--arts/tools/midimanagerdlg.ui30
-rw-r--r--arts/tools/midimanagerview.cpp24
-rw-r--r--arts/tools/midimanagerview.h5
-rw-r--r--arts/tools/midimanagerwidget.ui26
-rw-r--r--arts/tools/midiportdlg.cpp44
-rw-r--r--arts/tools/midiportdlg.h3
-rw-r--r--arts/tools/statusview.cpp12
-rw-r--r--arts/tools/statusview.h3
-rw-r--r--arts/tools/templateview.cpp2
-rw-r--r--arts/tools/templateview.h3
-rw-r--r--juk/HACKING12
-rw-r--r--juk/advancedsearchdialog.cpp4
-rw-r--r--juk/advancedsearchdialog.h3
-rw-r--r--juk/akodeplayer.h5
-rw-r--r--juk/artsplayer.h5
-rw-r--r--juk/cache.cpp32
-rw-r--r--juk/cache.h2
-rw-r--r--juk/categoryreaderinterface.cpp2
-rw-r--r--juk/collectionlist.cpp36
-rw-r--r--juk/collectionlist.h15
-rw-r--r--juk/coverdialog.cpp12
-rw-r--r--juk/coverdialog.h3
-rw-r--r--juk/coverdialogbase.ui38
-rw-r--r--juk/covericonview.cpp8
-rw-r--r--juk/covericonview.h4
-rw-r--r--juk/coverinfo.cpp12
-rw-r--r--juk/covermanager.cpp60
-rw-r--r--juk/covermanager.h6
-rw-r--r--juk/deletedialog.cpp8
-rw-r--r--juk/deletedialog.h6
-rw-r--r--juk/deletedialogbase.ui36
-rw-r--r--juk/directorylist.cpp10
-rw-r--r--juk/directorylist.h3
-rw-r--r--juk/directorylistbase.ui18
-rw-r--r--juk/dynamicplaylist.cpp4
-rw-r--r--juk/dynamicplaylist.h3
-rw-r--r--juk/exampleoptions.cpp8
-rw-r--r--juk/exampleoptions.h8
-rw-r--r--juk/exampleoptionsbase.ui46
-rw-r--r--juk/filehandle.h2
-rw-r--r--juk/filehandleproperties.h4
-rw-r--r--juk/filerenamer.cpp80
-rw-r--r--juk/filerenamer.h15
-rw-r--r--juk/filerenamerbase.ui50
-rw-r--r--juk/filerenamerconfigdlg.cpp4
-rw-r--r--juk/filerenamerconfigdlg.h3
-rw-r--r--juk/filerenameroptions.cpp28
-rw-r--r--juk/filerenameroptions.h6
-rw-r--r--juk/filerenameroptionsbase.ui76
-rw-r--r--juk/folderplaylist.h5
-rw-r--r--juk/gstreamerplayer.cpp12
-rw-r--r--juk/gstreamerplayer.h5
-rw-r--r--juk/historyplaylist.cpp16
-rw-r--r--juk/historyplaylist.h5
-rw-r--r--juk/juk.cpp90
-rw-r--r--juk/juk.h3
-rw-r--r--juk/k3bexporter.cpp8
-rw-r--r--juk/k3bexporter.h6
-rw-r--r--juk/keydialog.cpp50
-rw-r--r--juk/keydialog.h7
-rw-r--r--juk/ktrm.cpp28
-rw-r--r--juk/mediafiles.cpp8
-rw-r--r--juk/mediafiles.h8
-rw-r--r--juk/musicbrainzquery.cpp10
-rw-r--r--juk/musicbrainzquery.h4
-rw-r--r--juk/nowplaying.cpp78
-rw-r--r--juk/nowplaying.h23
-rw-r--r--juk/player.h2
-rw-r--r--juk/playermanager.cpp10
-rw-r--r--juk/playermanager.h3
-rw-r--r--juk/playlist.cpp64
-rw-r--r--juk/playlist.h15
-rw-r--r--juk/playlistbox.cpp38
-rw-r--r--juk/playlistbox.h12
-rw-r--r--juk/playlistcollection.cpp36
-rw-r--r--juk/playlistcollection.h9
-rw-r--r--juk/playlistexporter.h4
-rw-r--r--juk/playlistitem.cpp40
-rw-r--r--juk/playlistitem.h6
-rw-r--r--juk/playlistsearch.cpp22
-rw-r--r--juk/playlistsearch.h1
-rw-r--r--juk/playlistsplitter.cpp10
-rw-r--r--juk/playlistsplitter.h7
-rw-r--r--juk/searchplaylist.cpp2
-rw-r--r--juk/searchplaylist.h3
-rw-r--r--juk/searchwidget.cpp16
-rw-r--r--juk/searchwidget.h8
-rw-r--r--juk/slideraction.cpp74
-rw-r--r--juk/slideraction.h14
-rw-r--r--juk/sortedstringlist.cpp28
-rw-r--r--juk/sortedstringlist.h4
-rw-r--r--juk/splashscreen.cpp4
-rw-r--r--juk/splashscreen.h2
-rw-r--r--juk/statuslabel.cpp28
-rw-r--r--juk/statuslabel.h3
-rw-r--r--juk/stringhash.h8
-rw-r--r--juk/stringshare.cpp2
-rw-r--r--juk/systemtray.cpp80
-rw-r--r--juk/systemtray.h18
-rw-r--r--juk/tag.cpp30
-rw-r--r--juk/tag.h2
-rw-r--r--juk/tageditor.cpp104
-rw-r--r--juk/tageditor.h9
-rw-r--r--juk/tagguesser.cpp32
-rw-r--r--juk/tagguesserconfigdlg.cpp4
-rw-r--r--juk/tagguesserconfigdlg.h3
-rw-r--r--juk/tagguesserconfigdlgwidget.ui14
-rw-r--r--juk/tagguessertest.cpp34
-rw-r--r--juk/tagrenameroptions.cpp26
-rw-r--r--juk/tagtransactionmanager.cpp8
-rw-r--r--juk/tagtransactionmanager.h15
-rw-r--r--juk/trackpickerdialog.cpp10
-rw-r--r--juk/trackpickerdialog.h3
-rw-r--r--juk/trackpickerdialogbase.ui22
-rw-r--r--juk/tracksequencemanager.h3
-rw-r--r--juk/treeviewitemplaylist.cpp2
-rw-r--r--juk/treeviewitemplaylist.h3
-rw-r--r--juk/upcomingplaylist.cpp8
-rw-r--r--juk/upcomingplaylist.h4
-rw-r--r--juk/viewmode.cpp28
-rw-r--r--juk/viewmode.h9
-rw-r--r--juk/webimagefetcher.cpp6
-rw-r--r--juk/webimagefetcher.h5
-rw-r--r--juk/webimagefetcherdialog.cpp20
-rw-r--r--juk/webimagefetcherdialog.h6
-rw-r--r--kaboodle/conf.cpp2
-rw-r--r--kaboodle/conf.h1
-rw-r--r--kaboodle/controls.cpp24
-rw-r--r--kaboodle/controls.h12
-rw-r--r--kaboodle/engine.cpp4
-rw-r--r--kaboodle/engine.h5
-rw-r--r--kaboodle/kaboodle_factory.cpp6
-rw-r--r--kaboodle/kaboodle_factory.h3
-rw-r--r--kaboodle/kaboodleapp.h1
-rw-r--r--kaboodle/main.cpp6
-rw-r--r--kaboodle/player.cpp16
-rw-r--r--kaboodle/player.h8
-rw-r--r--kaboodle/userinterface.cpp20
-rw-r--r--kaboodle/userinterface.h3
-rw-r--r--kaboodle/view.cpp18
-rw-r--r--kaboodle/view.h3
-rw-r--r--kaudiocreator/cdconfig.ui16
-rw-r--r--kaudiocreator/encodefile.ui80
-rw-r--r--kaudiocreator/encodefileimp.cpp6
-rw-r--r--kaudiocreator/encodefileimp.h3
-rw-r--r--kaudiocreator/encoder.cpp32
-rw-r--r--kaudiocreator/encoder.h3
-rw-r--r--kaudiocreator/encoderconfig.ui56
-rw-r--r--kaudiocreator/encoderconfig.ui.h2
-rw-r--r--kaudiocreator/encoderconfigimp.cpp12
-rw-r--r--kaudiocreator/encoderconfigimp.h3
-rw-r--r--kaudiocreator/encoderedit.ui22
-rw-r--r--kaudiocreator/encoderoutput.ui14
-rw-r--r--kaudiocreator/general.ui60
-rw-r--r--kaudiocreator/general.ui.h4
-rw-r--r--kaudiocreator/infodialog.ui72
-rw-r--r--kaudiocreator/job.cpp16
-rw-r--r--kaudiocreator/jobque.ui20
-rw-r--r--kaudiocreator/jobqueimp.cpp28
-rw-r--r--kaudiocreator/jobqueimp.h7
-rw-r--r--kaudiocreator/kaudiocreator.cpp98
-rw-r--r--kaudiocreator/kaudiocreator.h8
-rw-r--r--kaudiocreator/kaudiocreator.kcfg2
-rw-r--r--kaudiocreator/ripconfig.ui26
-rw-r--r--kaudiocreator/ripper.cpp14
-rw-r--r--kaudiocreator/ripper.h3
-rw-r--r--kaudiocreator/tracks.ui26
-rw-r--r--kaudiocreator/tracksimp.cpp28
-rw-r--r--kaudiocreator/tracksimp.h7
-rw-r--r--kaudiocreator/wizard.ui64
-rw-r--r--kaudiocreator/wizard.ui.h6
-rw-r--r--kfile-plugins/au/kfile_au.cpp6
-rw-r--r--kfile-plugins/au/kfile_au.h3
-rw-r--r--kfile-plugins/avi/kfile_avi.cpp6
-rw-r--r--kfile-plugins/avi/kfile_avi.h3
-rw-r--r--kfile-plugins/flac/kfile_flac.cpp24
-rw-r--r--kfile-plugins/flac/kfile_flac.h5
-rw-r--r--kfile-plugins/m3u/kfile_m3u.cpp6
-rw-r--r--kfile-plugins/m3u/kfile_m3u.h3
-rw-r--r--kfile-plugins/mp3/kfile_mp3.cpp30
-rw-r--r--kfile-plugins/mp3/kfile_mp3.h5
-rw-r--r--kfile-plugins/mpc/kfile_mpc.cpp24
-rw-r--r--kfile-plugins/mpc/kfile_mpc.h5
-rw-r--r--kfile-plugins/mpeg/kfile_mpeg.cpp8
-rw-r--r--kfile-plugins/mpeg/kfile_mpeg.h3
-rw-r--r--kfile-plugins/ogg/kfile_ogg.cpp14
-rw-r--r--kfile-plugins/ogg/kfile_ogg.h5
-rw-r--r--kfile-plugins/sid/kfile_sid.cpp8
-rw-r--r--kfile-plugins/sid/kfile_sid.h5
-rw-r--r--kfile-plugins/theora/kfile_theora.cpp6
-rw-r--r--kfile-plugins/theora/kfile_theora.h3
-rw-r--r--kfile-plugins/wav/kfile_wav.cpp6
-rw-r--r--kfile-plugins/wav/kfile_wav.h3
-rw-r--r--kioslave/audiocd/audiocd.cpp78
-rw-r--r--kioslave/audiocd/kcmaudiocd/audiocdconfig.ui132
-rw-r--r--kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp16
-rw-r--r--kioslave/audiocd/kcmaudiocd/kcmaudiocd.h7
-rw-r--r--kioslave/audiocd/plugins/audiocdencoder.cpp4
-rw-r--r--kioslave/audiocd/plugins/audiocdencoder.h4
-rw-r--r--kioslave/audiocd/plugins/flac/encoderflac.cpp10
-rw-r--r--kioslave/audiocd/plugins/lame/collectingprocess.cpp10
-rw-r--r--kioslave/audiocd/plugins/lame/collectingprocess.h9
-rw-r--r--kioslave/audiocd/plugins/lame/encoderlame.cpp28
-rw-r--r--kioslave/audiocd/plugins/lame/encoderlame.h1
-rw-r--r--kioslave/audiocd/plugins/lame/encoderlameconfig.ui84
-rw-r--r--kioslave/audiocd/plugins/vorbis/encodervorbis.cpp2
-rw-r--r--kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui34
-rw-r--r--kioslave/audiocd/plugins/wav/encoderwav.cpp2
-rw-r--r--kmid/README2
-rw-r--r--kmid/channel.cpp10
-rw-r--r--kmid/channel.h3
-rw-r--r--kmid/channel3d.cpp2
-rw-r--r--kmid/channel3d.h2
-rw-r--r--kmid/channel4d.cpp2
-rw-r--r--kmid/channel4d.h2
-rw-r--r--kmid/channelcfgdlg.cpp2
-rw-r--r--kmid/channelcfgdlg.h3
-rw-r--r--kmid/channelview.cpp2
-rw-r--r--kmid/channelview.h1
-rw-r--r--kmid/collectdlg.cpp14
-rw-r--r--kmid/collectdlg.h5
-rw-r--r--kmid/kdisptext.cpp20
-rw-r--r--kmid/kdisptext.h5
-rw-r--r--kmid/klcdnumber.cpp18
-rw-r--r--kmid/klcdnumber.h9
-rw-r--r--kmid/kmid_part.cpp20
-rw-r--r--kmid/kmid_part.h15
-rw-r--r--kmid/kmidbutton.h4
-rw-r--r--kmid/kmidclient.cpp54
-rw-r--r--kmid/kmidclient.h7
-rw-r--r--kmid/kmidframe.cpp58
-rw-r--r--kmid/kmidframe.h5
-rw-r--r--kmid/ktrianglebutton.cpp24
-rw-r--r--kmid/ktrianglebutton.h3
-rw-r--r--kmid/main.cpp2
-rw-r--r--kmid/midicfgdlg.cpp6
-rw-r--r--kmid/midicfgdlg.h3
-rw-r--r--kmid/qslidertime.cpp12
-rw-r--r--kmid/qslidertime.h7
-rw-r--r--kmid/rhythmview.cpp6
-rw-r--r--kmid/rhythmview.h6
-rw-r--r--kmix/KMixApp.h1
-rw-r--r--kmix/colorwidget.ui26
-rw-r--r--kmix/dialogselectmaster.cpp14
-rw-r--r--kmix/dialogselectmaster.h1
-rw-r--r--kmix/dialogviewconfiguration.cpp10
-rw-r--r--kmix/dialogviewconfiguration.h5
-rw-r--r--kmix/kledbutton.cpp20
-rw-r--r--kmix/kledbutton.h9
-rw-r--r--kmix/kmix.cpp52
-rw-r--r--kmix/kmix.h3
-rw-r--r--kmix/kmixapplet.cpp60
-rw-r--r--kmix/kmixapplet.h10
-rw-r--r--kmix/kmixdockwidget.cpp30
-rw-r--r--kmix/kmixdockwidget.h3
-rw-r--r--kmix/kmixerwidget.cpp24
-rw-r--r--kmix/kmixerwidget.h3
-rw-r--r--kmix/kmixprefdlg.cpp32
-rw-r--r--kmix/kmixprefdlg.h3
-rw-r--r--kmix/ksmallslider.cpp34
-rw-r--r--kmix/ksmallslider.h15
-rw-r--r--kmix/mdwenum.cpp36
-rw-r--r--kmix/mdwenum.h5
-rw-r--r--kmix/mdwslider.cpp136
-rw-r--r--kmix/mdwslider.h5
-rw-r--r--kmix/mdwswitch.cpp36
-rw-r--r--kmix/mdwswitch.h5
-rw-r--r--kmix/mixdevice.cpp4
-rw-r--r--kmix/mixdevice.h5
-rw-r--r--kmix/mixdevicewidget.cpp8
-rw-r--r--kmix/mixdevicewidget.h5
-rw-r--r--kmix/mixer.cpp4
-rw-r--r--kmix/mixer.h3
-rw-r--r--kmix/mixer_alsa9.cpp26
-rw-r--r--kmix/mixer_hpux.cpp20
-rw-r--r--kmix/mixer_hpux.h2
-rw-r--r--kmix/mixer_irix.cpp4
-rw-r--r--kmix/mixer_oss.cpp18
-rw-r--r--kmix/mixer_oss4.cpp12
-rw-r--r--kmix/mixer_sun.cpp4
-rw-r--r--kmix/mixertoolbox.cpp16
-rw-r--r--kmix/verticaltext.cpp8
-rw-r--r--kmix/verticaltext.h6
-rw-r--r--kmix/viewapplet.cpp28
-rw-r--r--kmix/viewapplet.h7
-rw-r--r--kmix/viewbase.cpp10
-rw-r--r--kmix/viewbase.h5
-rw-r--r--kmix/viewdockareapopup.cpp26
-rw-r--r--kmix/viewdockareapopup.h5
-rw-r--r--kmix/viewgrid.cpp42
-rw-r--r--kmix/viewgrid.h7
-rw-r--r--kmix/viewinput.cpp4
-rw-r--r--kmix/viewinput.h3
-rw-r--r--kmix/viewoutput.cpp4
-rw-r--r--kmix/viewoutput.h3
-rw-r--r--kmix/viewsliders.cpp16
-rw-r--r--kmix/viewsliders.h5
-rw-r--r--kmix/viewsurround.cpp42
-rw-r--r--kmix/viewsurround.h5
-rw-r--r--kmix/viewswitches.cpp20
-rw-r--r--kmix/viewswitches.h5
-rw-r--r--kmix/volume.cpp40
-rw-r--r--kmix/volume.h14
-rw-r--r--krec/krecconfig_files.h1
-rw-r--r--krec/krecconfig_fileswidget.cpp18
-rw-r--r--krec/krecconfig_fileswidget.h1
-rw-r--r--krec/krecconfigure.cpp24
-rw-r--r--krec/krecconfigure.h1
-rw-r--r--krec/krecexport_template.cpp8
-rw-r--r--krec/krecexport_template.h7
-rw-r--r--krec/krecexport_wave.h1
-rw-r--r--krec/krecfile.cpp24
-rw-r--r--krec/krecfile.h2
-rw-r--r--krec/krecfileview.cpp2
-rw-r--r--krec/krecfileview.h1
-rw-r--r--krec/krecfileviewhelpers.cpp24
-rw-r--r--krec/krecfileviewhelpers.h3
-rw-r--r--krec/krecfilewidgets.cpp34
-rw-r--r--krec/krecfilewidgets.h3
-rw-r--r--krec/krecglobal.cpp4
-rw-r--r--krec/krecglobal.h3
-rw-r--r--krec/krecnewproperties.cpp8
-rw-r--r--krec/krecnewproperties.h1
-rw-r--r--krec/krecord.cpp28
-rw-r--r--krec/krecord.h3
-rw-r--r--krec/krecord_private.h2
-rw-r--r--krec/mp3_export/krecexport_mp3.h1
-rw-r--r--krec/ogg_export/krecexport_ogg.cpp2
-rw-r--r--krec/ogg_export/krecexport_ogg.h1
-rw-r--r--kscd/ChangeLog4
-rw-r--r--kscd/TODO2
-rw-r--r--kscd/bwlednum.cpp68
-rw-r--r--kscd/bwlednum.h7
-rw-r--r--kscd/cddbdlg.cpp6
-rw-r--r--kscd/cddbdlg.h3
-rw-r--r--kscd/configWidget.cpp10
-rw-r--r--kscd/configWidget.h3
-rw-r--r--kscd/configWidgetUI.ui54
-rw-r--r--kscd/docking.cpp20
-rw-r--r--kscd/docking.h3
-rw-r--r--kscd/kcompactdisc.cpp44
-rw-r--r--kscd/kcompactdisc.h21
-rw-r--r--kscd/kscd.cpp132
-rw-r--r--kscd/kscd.h9
-rw-r--r--kscd/kscdmagic/README6
-rw-r--r--kscd/kscdmagic/syna.h2
-rw-r--r--kscd/kscdmagic/xlib.c10
-rw-r--r--kscd/kscdmagic/xlib.h6
-rw-r--r--kscd/ledlamp.cpp2
-rw-r--r--kscd/ledlamp.h9
-rw-r--r--kscd/libwm/audio/audio_sun.c14
-rw-r--r--kscd/libwm/cddaslave.c2
-rw-r--r--kscd/libwm/cdtext.c18
-rw-r--r--kscd/libwm/database.c2
-rw-r--r--kscd/libwm/include/wm_cdtext.h2
-rw-r--r--kscd/libwm/include/wm_scsi.h2
-rw-r--r--kscd/libwm/plat_hpux.c2
-rw-r--r--kscd/libwm/plat_linux.c2
-rw-r--r--kscd/libwm/plat_linux_audio.c14
-rw-r--r--kscd/libwm/plat_news.c4
-rw-r--r--kscd/libwm/plat_sun.c4
-rw-r--r--kscd/libwm/plat_sun_audio.c14
-rw-r--r--kscd/libwm/plat_svr4.c2
-rw-r--r--kscd/libwm/scsi.c44
-rw-r--r--kscd/panel.ui82
-rw-r--r--libkcddb/asynccddbplookup.cpp4
-rw-r--r--libkcddb/asynccddbplookup.h1
-rw-r--r--libkcddb/asynchttplookup.h1
-rw-r--r--libkcddb/asynchttpsubmit.h1
-rw-r--r--libkcddb/asyncsmtpsubmit.h1
-rw-r--r--libkcddb/cache.cpp2
-rw-r--r--libkcddb/categories.cpp4
-rw-r--r--libkcddb/cddb.cpp24
-rw-r--r--libkcddb/cddb.h4
-rw-r--r--libkcddb/cddbplookup.cpp18
-rw-r--r--libkcddb/cddbplookup.h2
-rw-r--r--libkcddb/cdinfo.cpp36
-rw-r--r--libkcddb/cdinfodialogbase.ui84
-rw-r--r--libkcddb/cdinfodialogbase.ui.h8
-rw-r--r--libkcddb/cdinfoencodingwidget.cpp6
-rw-r--r--libkcddb/cdinfoencodingwidget.h3
-rw-r--r--libkcddb/cdinfoencodingwidgetbase.ui18
-rw-r--r--libkcddb/client.h3
-rw-r--r--libkcddb/genres.cpp4
-rw-r--r--libkcddb/httplookup.cpp8
-rw-r--r--libkcddb/httplookup.h1
-rw-r--r--libkcddb/kcmcddb/cddbconfigwidget.cpp4
-rw-r--r--libkcddb/kcmcddb/cddbconfigwidget.h3
-rw-r--r--libkcddb/kcmcddb/cddbconfigwidgetbase.ui94
-rw-r--r--libkcddb/kcmcddb/kcmcddb.cpp14
-rw-r--r--libkcddb/kcmcddb/kcmcddb.h3
-rw-r--r--libkcddb/libkcddb.kcfg4
-rw-r--r--libkcddb/lookup.cpp16
-rw-r--r--libkcddb/lookup.h4
-rw-r--r--libkcddb/sites.cpp4
-rw-r--r--libkcddb/smtpsubmit.cpp2
-rw-r--r--libkcddb/submit.cpp10
-rw-r--r--libkcddb/submit.h2
-rw-r--r--libkcddb/synccddbplookup.cpp6
-rw-r--r--libkcddb/test/asynccddblookuptest.h3
-rw-r--r--libkcddb/test/asynchttplookuptest.h3
-rw-r--r--libkcddb/test/asynchttpsubmittest.h3
-rw-r--r--libkcddb/test/asyncsmtpsubmittest.h3
-rw-r--r--mpeglib/COPYING4
-rw-r--r--mpeglib/README2
-rw-r--r--mpeglib/example/cddaplay/Makefile.am2
-rw-r--r--mpeglib/example/mpgplay/Makefile.am2
-rw-r--r--mpeglib/example/splay/Makefile.am4
-rw-r--r--mpeglib/example/splay/mp3framing.cpp20
-rw-r--r--mpeglib/example/tplay/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yafcdda/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yafcore/buffer.cpp2
-rw-r--r--mpeglib/example/yaf/yafcore/buffer.h2
-rw-r--r--mpeglib/example/yaf/yafcore/inputDecoder.cpp4
-rw-r--r--mpeglib/example/yaf/yafcore/inputDecoder.h4
-rw-r--r--mpeglib/example/yaf/yafcore/lineStack.cpp4
-rw-r--r--mpeglib/example/yaf/yafcore/parser.cpp2
-rw-r--r--mpeglib/example/yaf/yafcore/yaf_control.cpp2
-rw-r--r--mpeglib/example/yaf/yafmpgplay/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yafsplay/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yaftplay/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yafvorbis/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp6
-rw-r--r--mpeglib/example/yaf/yafyuv/Makefile.am2
-rw-r--r--mpeglib/lib/Makefile.am2
-rw-r--r--mpeglib/lib/decoder/mpgPlugin.cpp2
-rw-r--r--mpeglib/lib/frame/IOFrameQueue.h4
-rw-r--r--mpeglib/lib/frame/README4
-rw-r--r--mpeglib/lib/frame/audioFrameQueue.h4
-rw-r--r--mpeglib/lib/frame/frameQueue.h4
-rw-r--r--mpeglib/lib/frame/framer.cpp2
-rw-r--r--mpeglib/lib/mpegplay/decoderClass.cpp4
-rw-r--r--mpeglib/lib/mpegplay/jrevdct.h2
-rw-r--r--mpeglib/lib/mpegplay/macroBlock.cpp8
-rw-r--r--mpeglib/lib/mpegplay/mpegExtension.cpp6
-rw-r--r--mpeglib/lib/mpegplay/mpegExtension.h2
-rw-r--r--mpeglib/lib/mpegplay/mpegSystemStream.cpp2
-rw-r--r--mpeglib/lib/mpegplay/mpegVideoBitWindow.h4
-rw-r--r--mpeglib/lib/mpegplay/mpegVideoStream.cpp8
-rw-r--r--mpeglib/lib/mpegplay/pesSystemStream.cpp2
-rw-r--r--mpeglib/lib/mpegplay/picture.cpp2
-rw-r--r--mpeglib/lib/mpegplay/recon.cpp4
-rw-r--r--mpeglib/lib/mpegplay/slice.h2
-rw-r--r--mpeglib/lib/mpegplay/startCodes.h6
-rw-r--r--mpeglib/lib/mpegplay/videoDecoder.cpp14
-rw-r--r--mpeglib/lib/mpegplay/videoDecoder.h2
-rw-r--r--mpeglib/lib/output/outputStream.cpp6
-rw-r--r--mpeglib/lib/output/outputStream.h6
-rw-r--r--mpeglib/lib/splay/dxHead.h2
-rw-r--r--mpeglib/lib/splay/mpegAudioFrame.cpp2
-rw-r--r--mpeglib/lib/splay/mpegAudioHeader.cpp2
-rw-r--r--mpeglib/lib/util/abstract/threadQueue.cpp16
-rw-r--r--mpeglib/lib/util/abstract/threadQueue.h4
-rw-r--r--mpeglib/lib/util/dynBuffer.cpp2
-rw-r--r--mpeglib/lib/util/dynBuffer.h2
-rw-r--r--mpeglib/lib/util/mmx/mmx_asm.h2
-rw-r--r--mpeglib/lib/util/render/dither/colorTableHighBit.cpp20
-rw-r--r--mpeglib/lib/util/render/dither/ditherer_mmx16.cpp32
-rw-r--r--mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h4
-rw-r--r--mpeglib/lib/util/render/x11/initDisplay.cpp6
-rw-r--r--mpeglib/lib/util/render/x11/x11Surface.cpp2
-rw-r--r--mpeglib_artsplug/Makefile.am2
-rw-r--r--mpeglib_artsplug/doemacs2
-rw-r--r--mpg123_artsplugin/dxhead.h2
-rw-r--r--mpg123_artsplugin/mpg123/buffer.c2
-rw-r--r--mpg123_artsplugin/mpg123/common.c2
-rw-r--r--mpg123_artsplugin/mpg123/httpget.c2
-rw-r--r--mpg123_artsplugin/mpg123/layer3.c80
-rw-r--r--mpg123_artsplugin/mpg123/xfermem.h2
-rw-r--r--noatun/library/Makefile.am2
-rw-r--r--noatun/library/app.cpp50
-rw-r--r--noatun/library/cmodule.cpp36
-rw-r--r--noatun/library/cmodule.h3
-rw-r--r--noatun/library/controls.cpp24
-rw-r--r--noatun/library/downloader.cpp8
-rw-r--r--noatun/library/effects.cpp8
-rw-r--r--noatun/library/effectview.cpp26
-rw-r--r--noatun/library/effectview.h4
-rw-r--r--noatun/library/engine.cpp16
-rw-r--r--noatun/library/equalizer.cpp2
-rw-r--r--noatun/library/equalizerview.cpp22
-rw-r--r--noatun/library/equalizerview.h13
-rw-r--r--noatun/library/equalizerwidget.ui56
-rw-r--r--noatun/library/globalvideo.h3
-rw-r--r--noatun/library/ksaver.cpp2
-rw-r--r--noatun/library/mimetypetree.cpp8
-rw-r--r--noatun/library/mimetypetree.h5
-rw-r--r--noatun/library/noatun/app.h5
-rw-r--r--noatun/library/noatun/controls.h12
-rw-r--r--noatun/library/noatun/downloader.h5
-rw-r--r--noatun/library/noatun/effects.h3
-rw-r--r--noatun/library/noatun/engine.h5
-rw-r--r--noatun/library/noatun/equalizer.h3
-rw-r--r--noatun/library/noatun/player.h5
-rw-r--r--noatun/library/noatun/playlist.h5
-rw-r--r--noatun/library/noatun/plugin.h12
-rw-r--r--noatun/library/noatun/pref.h8
-rw-r--r--noatun/library/noatun/scrollinglabel.h9
-rw-r--r--noatun/library/noatun/stdaction.h37
-rw-r--r--noatun/library/noatun/stereobuttonaction.h13
-rw-r--r--noatun/library/noatun/vequalizer.h8
-rw-r--r--noatun/library/noatun/video.h7
-rw-r--r--noatun/library/noatunarts/Session_impl.cpp4
-rw-r--r--noatun/library/noatunarts/StereoEffectStack_impl.cpp2
-rw-r--r--noatun/library/noatunstdaction.cpp96
-rw-r--r--noatun/library/noatuntags/tags.cpp14
-rw-r--r--noatun/library/noatuntags/tagsgetter.h4
-rw-r--r--noatun/library/player.cpp2
-rw-r--r--noatun/library/playlist.cpp22
-rw-r--r--noatun/library/playlistsaver.cpp34
-rw-r--r--noatun/library/plugin.cpp22
-rw-r--r--noatun/library/plugin_deps.h3
-rw-r--r--noatun/library/pluginloader.cpp18
-rw-r--r--noatun/library/pluginmodule.cpp28
-rw-r--r--noatun/library/pluginmodule.h4
-rw-r--r--noatun/library/pref.cpp19
-rw-r--r--noatun/library/scrollinglabel.cpp36
-rw-r--r--noatun/library/stereobuttonaction.cpp24
-rw-r--r--noatun/library/titleproxy.cpp36
-rw-r--r--noatun/library/titleproxy.h12
-rw-r--r--noatun/library/vequalizer.cpp22
-rw-r--r--noatun/library/video.cpp16
-rw-r--r--noatun/modules/artseffects/extrastereo_impl.cc2
-rw-r--r--noatun/modules/artseffects/extrastereogui_impl.cc2
-rw-r--r--noatun/modules/excellent/userinterface.cpp30
-rw-r--r--noatun/modules/excellent/userinterface.h1
-rw-r--r--noatun/modules/htmlexport/htmlexport.cpp20
-rw-r--r--noatun/modules/htmlexport/htmlexport.h4
-rw-r--r--noatun/modules/infrared/infrared.cpp4
-rw-r--r--noatun/modules/infrared/infrared.h1
-rw-r--r--noatun/modules/infrared/infrared.plugin2
-rw-r--r--noatun/modules/infrared/irprefs.cpp44
-rw-r--r--noatun/modules/infrared/irprefs.h3
-rw-r--r--noatun/modules/infrared/lirc.cpp12
-rw-r--r--noatun/modules/infrared/lirc.h5
-rw-r--r--noatun/modules/kaiman/SKIN-SPECS32
-rw-r--r--noatun/modules/kaiman/pref.cpp12
-rw-r--r--noatun/modules/kaiman/pref.h3
-rw-r--r--noatun/modules/kaiman/skins/circle/README4
-rw-r--r--noatun/modules/kaiman/skins/circle/skindata8
-rw-r--r--noatun/modules/kaiman/skins/circle/skindata_alt8
-rw-r--r--noatun/modules/kaiman/skins/k9/skindata2
-rw-r--r--noatun/modules/kaiman/style.cpp106
-rw-r--r--noatun/modules/kaiman/style.h53
-rw-r--r--noatun/modules/kaiman/userinterface.cpp102
-rw-r--r--noatun/modules/kaiman/userinterface.h3
-rw-r--r--noatun/modules/keyz/keyz.cpp54
-rw-r--r--noatun/modules/keyz/keyz.h4
-rw-r--r--noatun/modules/kjofol-skin/ChangeLog8
-rw-r--r--noatun/modules/kjofol-skin/helpers.cpp14
-rw-r--r--noatun/modules/kjofol-skin/kjbackground.cpp16
-rw-r--r--noatun/modules/kjofol-skin/kjbutton.cpp40
-rw-r--r--noatun/modules/kjofol-skin/kjbutton.h1
-rw-r--r--noatun/modules/kjofol-skin/kjequalizer.cpp22
-rw-r--r--noatun/modules/kjofol-skin/kjequalizer.h9
-rw-r--r--noatun/modules/kjofol-skin/kjfont.cpp56
-rw-r--r--noatun/modules/kjofol-skin/kjfont.h4
-rw-r--r--noatun/modules/kjofol-skin/kjguisettingswidget.ui58
-rw-r--r--noatun/modules/kjofol-skin/kjloader.cpp38
-rw-r--r--noatun/modules/kjofol-skin/kjloader.h3
-rw-r--r--noatun/modules/kjofol-skin/kjprefs.cpp8
-rw-r--r--noatun/modules/kjofol-skin/kjprefs.h3
-rw-r--r--noatun/modules/kjofol-skin/kjseeker.cpp53
-rw-r--r--noatun/modules/kjofol-skin/kjskinselectorwidget.ui32
-rw-r--r--noatun/modules/kjofol-skin/kjsliders.cpp46
-rw-r--r--noatun/modules/kjofol-skin/kjsliders.h6
-rw-r--r--noatun/modules/kjofol-skin/kjtextdisplay.cpp88
-rw-r--r--noatun/modules/kjofol-skin/kjtextdisplay.h11
-rw-r--r--noatun/modules/kjofol-skin/kjvis.cpp122
-rw-r--r--noatun/modules/kjofol-skin/kjvis.h10
-rw-r--r--noatun/modules/kjofol-skin/kjwidget.cpp23
-rw-r--r--noatun/modules/kjofol-skin/kjwidget.h8
-rw-r--r--noatun/modules/kjofol-skin/parser.cpp6
-rw-r--r--noatun/modules/kjofol-skin/parser.h2
-rw-r--r--noatun/modules/marquis/marquis.cpp14
-rw-r--r--noatun/modules/marquis/marquis.h5
-rw-r--r--noatun/modules/metatag/edit.cpp20
-rw-r--r--noatun/modules/metatag/edit.h3
-rw-r--r--noatun/modules/metatag/metatag.h1
-rw-r--r--noatun/modules/monoscope/monoscope.cpp12
-rw-r--r--noatun/modules/monoscope/monoscope.h3
-rw-r--r--noatun/modules/net/net.h1
-rw-r--r--noatun/modules/noatunui/userinterface.cpp22
-rw-r--r--noatun/modules/noatunui/userinterface.h1
-rw-r--r--noatun/modules/simple/propertiesdialog.ui64
-rw-r--r--noatun/modules/simple/propertiesdialog.ui.h6
-rw-r--r--noatun/modules/simple/userinterface.cpp30
-rw-r--r--noatun/modules/simple/userinterface.h1
-rw-r--r--noatun/modules/splitplaylist/find.cpp12
-rw-r--r--noatun/modules/splitplaylist/find.h3
-rw-r--r--noatun/modules/splitplaylist/playlist.cpp8
-rw-r--r--noatun/modules/splitplaylist/playlist.h1
-rw-r--r--noatun/modules/splitplaylist/view.cpp82
-rw-r--r--noatun/modules/splitplaylist/view.h12
-rw-r--r--noatun/modules/systray/cmodule.h1
-rw-r--r--noatun/modules/systray/kitsystemtray.cpp20
-rw-r--r--noatun/modules/systray/kitsystemtray.h3
-rw-r--r--noatun/modules/systray/systray.cpp58
-rw-r--r--noatun/modules/systray/systray.h5
-rw-r--r--noatun/modules/systray/yhconfigwidget.ui64
-rw-r--r--noatun/modules/voiceprint/prefs.cpp6
-rw-r--r--noatun/modules/voiceprint/prefs.h3
-rw-r--r--noatun/modules/voiceprint/voiceprint.cpp18
-rw-r--r--noatun/modules/voiceprint/voiceprint.h3
-rw-r--r--noatun/modules/winskin/guiSpectrumAnalyser.cpp6
-rw-r--r--noatun/modules/winskin/guiSpectrumAnalyser.h1
-rw-r--r--noatun/modules/winskin/vis/realFFT.cpp6
-rw-r--r--noatun/modules/winskin/vis/visQueue.h4
-rw-r--r--noatun/modules/winskin/waBalanceSlider.h3
-rw-r--r--noatun/modules/winskin/waButton.cpp4
-rw-r--r--noatun/modules/winskin/waButton.h1
-rw-r--r--noatun/modules/winskin/waClutterbar.h1
-rw-r--r--noatun/modules/winskin/waDigit.cpp14
-rw-r--r--noatun/modules/winskin/waDigit.h1
-rw-r--r--noatun/modules/winskin/waIndicator.h1
-rw-r--r--noatun/modules/winskin/waInfo.cpp18
-rw-r--r--noatun/modules/winskin/waInfo.h1
-rw-r--r--noatun/modules/winskin/waJumpSlider.h1
-rw-r--r--noatun/modules/winskin/waLabel.cpp4
-rw-r--r--noatun/modules/winskin/waLabel.h3
-rw-r--r--noatun/modules/winskin/waMain.h1
-rw-r--r--noatun/modules/winskin/waRegion.cpp32
-rw-r--r--noatun/modules/winskin/waRegion.h8
-rw-r--r--noatun/modules/winskin/waShadeMapping.h8
-rw-r--r--noatun/modules/winskin/waSkin.cpp32
-rw-r--r--noatun/modules/winskin/waSkin.h9
-rw-r--r--noatun/modules/winskin/waSkinManager.cpp16
-rw-r--r--noatun/modules/winskin/waSkinManager.h1
-rw-r--r--noatun/modules/winskin/waSkinMapping.h8
-rw-r--r--noatun/modules/winskin/waSkinModel.cpp20
-rw-r--r--noatun/modules/winskin/waSkinModel.h3
-rw-r--r--noatun/modules/winskin/waSkins.h8
-rw-r--r--noatun/modules/winskin/waSlider.cpp8
-rw-r--r--noatun/modules/winskin/waSlider.h1
-rw-r--r--noatun/modules/winskin/waStatus.cpp6
-rw-r--r--noatun/modules/winskin/waStatus.h9
-rw-r--r--noatun/modules/winskin/waTitleBar.cpp8
-rw-r--r--noatun/modules/winskin/waTitleBar.h1
-rw-r--r--noatun/modules/winskin/waVolumeSlider.h3
-rw-r--r--noatun/modules/winskin/waWidget.cpp20
-rw-r--r--noatun/modules/winskin/waWidget.h5
-rw-r--r--noatun/modules/winskin/winSkinConfig.cpp16
-rw-r--r--noatun/modules/winskin/winSkinConfig.h3
-rw-r--r--noatun/modules/winskin/winSkinVis.cpp4
-rw-r--r--noatun/modules/winskin/winSkinVis.h3
-rw-r--r--noatun/noatun.api4
-rw-r--r--noatun/noatun20update.cpp18
-rw-r--r--xine_artsplugin/tools/thumbnail/videocreator.h1
-rw-r--r--xine_artsplugin/xinePlayObject_impl.cpp2
786 files changed, 5835 insertions, 5503 deletions
diff --git a/arts/builder/TODO b/arts/builder/TODO
index 139f22b..0c8a085 100644
--- a/arts/builder/TODO
+++ b/arts/builder/TODO
@@ -41,10 +41,10 @@ Wishlist for the artsbuilder app:
this should be very useful in editing objects with lots of properties
(widgets)
-- make _changed signals visible so you can connect the value_changed of a
+- make _changed Q_SIGNALS visible so you can connect the value_changed of a
poti to the frequency of a filter
-- make it possible to edit parent property of widgets (i.e. to insert one
+- make it possible to edit tqparent property of widgets (i.e. to insert one
widget into another)
- add structure property dialog with structure meta information, at least
diff --git a/arts/builder/createtool.cpp b/arts/builder/createtool.cpp
index 7778148..f8d5c7e 100644
--- a/arts/builder/createtool.cpp
+++ b/arts/builder/createtool.cpp
@@ -43,7 +43,7 @@ CreateTool::CreateTool(ModuleWidget *mwidget)
: MWidgetTool(mwidget)
{
oldCursor = mwidget->cursor();
- mwidget->setCursor(Qt::crossCursor);
+ mwidget->setCursor(TQt::crossCursor);
oldMouseTracking = mwidget->hasMouseTracking();
mwidget->setMouseTracking(true);
@@ -55,7 +55,7 @@ CreateTool::CreateTool(ModuleWidget *mwidget)
CreateTool::~CreateTool()
{
- mwidget->repaint(componentRect);
+ mwidget->tqrepaint(componentRect);
mwidget->setCursor(oldCursor);
mwidget->setMouseTracking(oldMouseTracking);
}
@@ -89,7 +89,7 @@ void CreateTool::mouseMoveEvent(TQMouseEvent *e)
&& mwidget->colXPos(x + width, &cellx2) && mwidget->rowYPos(y + height, &celly2);
if(!posok) return;
- mwidget->repaint(componentRect);
+ mwidget->tqrepaint(componentRect);
componentRect = TQRect(cellx, celly, cellx2 - cellx, celly2 - celly);
TQPainter *p = new TQPainter;
@@ -302,8 +302,8 @@ void ConnectPortsTool::mousePressEvent(TQMouseEvent *e)
void ConnectPortsTool::mouseMoveEvent(TQMouseEvent *e)
{
TQPainter painter(mwidget);
- painter.setPen(Qt::white);
- mwidget->repaint(TQRect(firstPos, lastPos).normalize());
+ painter.setPen(TQt::white);
+ mwidget->tqrepaint(TQRect(firstPos, lastPos).normalize());
painter.drawLine(firstPos, e->pos());
lastPos = e->pos();
}
@@ -334,6 +334,6 @@ void ConnectPortsTool::mouseReleaseEvent(TQMouseEvent *e)
}
}
}
- mwidget->repaint(TQRect(firstPos, lastPos).normalize());
+ mwidget->tqrepaint(TQRect(firstPos, lastPos).normalize());
mwidget->leaveTool(this);
}
diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp
index 2f22f10..dae660b 100644
--- a/arts/builder/dirmanager.cpp
+++ b/arts/builder/dirmanager.cpp
@@ -83,7 +83,7 @@ char *DirManager::directory(const char *subdir, const TQString &desc)
TQString dir = TQFile::decodeName(dirname);
message = i18n("You need the folder %1.\n"
"It will be used to store %2.\nShould I create it now?")
- .arg(dir).arg(desc);
+ .tqarg(dir).tqarg(desc);
if(KMessageBox::questionYesNo(0,message,i18n("aRts Folder Missing"),i18n("Create Folder"),i18n("Do Not Create"))
== KMessageBox::Yes)
diff --git a/arts/builder/drawutils.cpp b/arts/builder/drawutils.cpp
index c2c0ef3..74dac44 100644
--- a/arts/builder/drawutils.cpp
+++ b/arts/builder/drawutils.cpp
@@ -26,7 +26,7 @@ TQString DrawUtils::cropText(TQPainter *p, TQString text, int maxlen, int& textw
TQString label = text;
while(p->fontMetrics().width(label) > maxlen && label.length() > 0) {
- int i = label.find('_');
+ int i = label.tqfind('_');
if(i != -1)
label = label.mid(i+1);
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index 6d2ea2b..bad531a 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -41,31 +41,31 @@
#ifndef KDE_USE_FINAL
static void min_size(TQWidget *w) {
- w->setMinimumSize(w->sizeHint());
+ w->setMinimumSize(w->tqsizeHint());
}
#endif
-ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
- :TQDialog(parent,"X")
+ExecDlg::ExecDlg(TQWidget *tqparent, ExecutableStructure *structure)
+ :TQDialog(tqparent,"X")
/*, TRUE)*/
{
this->structure = structure;
setCaption(i18n("aRts Module Execution"));
- mainlayout = new TQVBoxLayout(this);
+ maintqlayout = new TQVBoxLayout(this);
// caption label: "Synthesis running..."
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *captionlabel = new TQLabel(this);
TQFont labelfont(captionlabel->font());
labelfont.setPointSize(labelfont.pointSize()*3/2);
captionlabel->setFont(labelfont);
captionlabel->setText(TQString(" ")+i18n("Synthesis running...")+TQString(" "));
- captionlabel->setAlignment(AlignCenter);
+ captionlabel->tqsetAlignment(AlignCenter);
min_size(captionlabel);
- mainlayout->addWidget(captionlabel);
+ maintqlayout->addWidget(captionlabel);
cpuusagelabel = new TQLabel(this);
cpuusagelabel->setText(i18n("CPU usage: unknown"));
@@ -78,44 +78,44 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
cpuusagetimer->start( 2000, false );
min_size(cpuusagelabel);
- mainlayout->addWidget(cpuusagelabel);
+ maintqlayout->addWidget(cpuusagelabel);
-// ruler above the sliderlayout
+// ruler above the slidertqlayout
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator* sep = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(sep);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(sep);
+ maintqlayout->addSpacing(5);
// sliders, controlpanels
- sliderlayout = new TQVBoxLayout;
- mainlayout->addLayout(sliderlayout);
+ slidertqlayout = new TQVBoxLayout;
+ maintqlayout->addLayout(slidertqlayout);
#if 0 /* PORT */
this->GUIServer = GUIServer;
GUIServer->setGlobalParent(this);
- GUIServer->setGlobalLayout(sliderlayout);
+ GUIServer->setGlobalLayout(slidertqlayout);
#endif
-// hruler below the sliderlayout
+// hruler below the slidertqlayout
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
sep = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(sep);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(sep);
+ maintqlayout->addSpacing(5);
// buttons
- TQHBoxLayout *buttonlayout = new TQHBoxLayout;
- mainlayout->addSpacing(5);
- mainlayout->addLayout(buttonlayout);
- mainlayout->addSpacing(5);
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+ maintqlayout->addSpacing(5);
+ maintqlayout->addLayout(buttontqlayout);
+ maintqlayout->addSpacing(5);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
bbox->addStretch(1);
@@ -125,18 +125,18 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
- bbox->layout();
+ bbox->tqlayout();
//min_size(bbox);
- buttonlayout->addWidget(bbox);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addWidget(bbox);
+ buttontqlayout->addSpacing(5);
-// mainlayout->freeze();
+// maintqlayout->freeze();
}
void ExecDlg::start()
{
- mainlayout->freeze();
+ maintqlayout->freeze();
}
void ExecDlg::guiServerTick()
@@ -151,7 +151,7 @@ void ExecDlg::updateCpuUsage()
#if 0 /* TODO:PORT */
char cpuusage[100];
- ArtsCorba::Status s = Synthesizer->getStatus();
+ ArtsCorba::tqStatus s = Synthesizer->gettqStatus();
if(s.halted)
{
cpuusagetimer->stop();
diff --git a/arts/builder/execdlg.h b/arts/builder/execdlg.h
index 1fbd806..d916a4f 100644
--- a/arts/builder/execdlg.h
+++ b/arts/builder/execdlg.h
@@ -31,15 +31,16 @@
class ExecDlg :public TQDialog {
Q_OBJECT
+ TQ_OBJECT
public:
TQTimer *cpuusagetimer;
TQLabel *cpuusagelabel;
- TQVBoxLayout *mainlayout,*sliderlayout;
+ TQVBoxLayout *maintqlayout,*slidertqlayout;
ExecutableStructure *structure;
void start();
void done(int r);
- ExecDlg(TQWidget *parent, ExecutableStructure *structure);
+ ExecDlg(TQWidget *tqparent, ExecutableStructure *structure);
protected slots:
void updateCpuUsage();
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 706576d..9680fc7 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -41,50 +41,50 @@
using namespace std;
-InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
+InterfaceDlg::InterfaceDlg(TQWidget *tqparent) :TQDialog(tqparent,"Props", TRUE)
{
setCaption(i18n("aRts: Structureport View"));
- TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
- //TQHBoxLayout *contentslayout = new TQHBoxLayout;
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
+ //TQHBoxLayout *contentstqlayout = new TQHBoxLayout;
// object type
/*
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *objectlabel = new TQLabel(this);
TQFont labelfont(objectlabel->font());
labelfont.setPointSize(labelfont.pointSize()*3/2);
objectlabel->setFont(labelfont);
objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" "));
- objectlabel->setAlignment(AlignCenter);
+ objectlabel->tqsetAlignment(AlignCenter);
min_size(objectlabel);
- mainlayout->addWidget(objectlabel);
+ maintqlayout->addWidget(objectlabel);
*/
// port description
/*
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *portlabel = new TQLabel(this);
labelfont.setPointSize(labelfont.pointSize()*4/5);
portlabel->setFont(labelfont);
portlabel->setText(i18n("Port description: ")+ port->description);
min_size(portlabel);
- portlabel->setAlignment(AlignCenter);
- mainlayout->addWidget(portlabel);
+ portlabel->tqsetAlignment(AlignCenter);
+ maintqlayout->addWidget(portlabel);
- int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width());
+ int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width());
portlabel->setMinimumWidth(labelwidth);
objectlabel->setMinimumWidth(labelwidth);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler);
- mainlayout->addSpacing(5);
- mainlayout->addLayout(contentslayout);
+ maintqlayout->addWidget(ruler);
+ maintqlayout->addSpacing(5);
+ maintqlayout->addLayout(contentstqlayout);
*/
// list
@@ -93,26 +93,26 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
update();
listbox->setMinimumSize(340,400);
- mainlayout->addWidget(listbox);
+ maintqlayout->addWidget(listbox);
connect( listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *)), this,
TQT_SLOT(accept()));
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler2);
+ maintqlayout->addWidget(ruler2);
// buttons
- TQHBoxLayout *buttonlayout = new TQHBoxLayout;
- mainlayout->addSpacing(5);
- mainlayout->addLayout(buttonlayout);
- mainlayout->addSpacing(5);
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+ maintqlayout->addSpacing(5);
+ maintqlayout->addLayout(buttontqlayout);
+ maintqlayout->addSpacing(5);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
bbox->addStretch(1);
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
@@ -121,14 +121,14 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
- bbox->layout();
+ bbox->tqlayout();
//min_size(bbox);
- buttonlayout->addWidget(bbox);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addWidget(bbox);
+ buttontqlayout->addSpacing(5);
- //mainlayout->activate();
- mainlayout->freeze();
+ //maintqlayout->activate();
+ maintqlayout->freeze();
}
string InterfaceDlg::interfaceName()
@@ -159,10 +159,10 @@ void InterfaceDlg::update(const string& interface, const string& indent)
{
listbox->insertItem((indent + interface).c_str());
- vector<string> *children = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface);
- for (vector<string>::iterator ci = children->begin(); ci != children->end(); ++ci)
+ vector<string> *tqchildren = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface);
+ for (vector<string>::iterator ci = tqchildren->begin(); ci != tqchildren->end(); ++ci)
update(ci->c_str(), indent+" ");
- delete children;
+ delete tqchildren;
}
void InterfaceDlg::update()
diff --git a/arts/builder/interfacedlg.h b/arts/builder/interfacedlg.h
index 4524eaa..235245a 100644
--- a/arts/builder/interfacedlg.h
+++ b/arts/builder/interfacedlg.h
@@ -32,11 +32,12 @@
class InterfaceDlg :public TQDialog {
Q_OBJECT
+ TQ_OBJECT
protected:
TQListBox *listbox;
public:
- InterfaceDlg(TQWidget *parent);
+ InterfaceDlg(TQWidget *tqparent);
std::string interfaceName();
void update(const std::string& interface, const std::string& indent);
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 4630f2f..558f650 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -251,17 +251,17 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
*/
#if 000
- connect(menubar, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(activateMenu(int)));
+ connect(menubar, TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(activateMenu(int)));
connect(m_view, TQT_SIGNAL(activated(int)), modulewidget, TQT_SLOT(setZoom(int)));
- connect(m_ports, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addPort(int)));
- connect(m_file_new, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fileNew(int)));
+ connect(m_ports, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addPort(int)));
+ connect(m_file_new, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(fileNew(int)));
- //connect(m_modules, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
+ //connect(m_modules, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
/*
- connect(m_modules_synth, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
- connect(m_modules_gui, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
- connect(m_modules_instruments, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
- connect(m_modules_other, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
+ connect(m_modules_synth, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
+ connect(m_modules_gui, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
+ connect(m_modules_instruments, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
+ connect(m_modules_other, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
*/
connect(kapp, TQT_SIGNAL(lastWindowClosed()), this , TQT_SLOT(quit()));
@@ -269,7 +269,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
#endif
arts_debug("PORT: activatemenu");
- connect(menumaker, TQT_SIGNAL(activated(const char *)), this, TQT_SLOT(addModule(const char *)));
+ connect(menumaker, TQT_SIGNAL(activated(const char *)), TQT_TQOBJECT(this), TQT_SLOT(addModule(const char *)));
fillModuleMenu();
arts_debug("PORT: activatemenu ok");
setupActions();
@@ -279,11 +279,11 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
// connect to aboutToShow to correctly show state of dockwidget there:
TQPopupMenu *viewmenu = (TQPopupMenu*)factory()->container("view", this);
if (viewmenu)
- connect(viewmenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(viewMenuAboutToShow()));
+ connect(viewmenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(viewMenuAboutToShow()));
else
arts_debug("view menu not found!");
- m_filename = TQString::null;
+ m_filename = TQString();
setModified(false);
installEventFilter(propertyPanel);
@@ -292,55 +292,55 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
void ArtsBuilderWindow::setupActions()
{
// File menu
- KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
+ KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
- (void)new KAction(i18n("Open Session..."), 0, this, TQT_SLOT(openSession()),
+ (void)new KAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()),
actionCollection(), "file_open_session");
- KStdAction::open(this, TQT_SLOT(open()), actionCollection());
- (void)new KAction(i18n("Open E&xample..."), Qt::CTRL + Qt::Key_X, this, TQT_SLOT(openExample()),
+ KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
+ (void)new KAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()),
actionCollection(), "file_open_example");
- KStdAction::save(this, TQT_SLOT(save()), actionCollection());
- KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
- (void)new KAction(i18n("&Retrieve From Server..."), Qt::CTRL + Qt::Key_R, this, TQT_SLOT(retrieve()),
+ KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
+ KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
+ (void)new KAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()),
actionCollection(), "file_retrieve_from_server");
- (void)new KAction(i18n("&Execute Structure"), "artsbuilderexecute", Qt::CTRL + Qt::Key_E, this, TQT_SLOT(execute()),
+ (void)new KAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(execute()),
actionCollection(), "file_execute_structure");
- (void)new KAction(i18n("&Rename Structure..."), Qt::CTRL + Qt::Key_R, this, TQT_SLOT(rename()),
+ (void)new KAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(rename()),
actionCollection(), "file_rename_structure");
- (void)new KAction(i18n("&Publish Structure"), Qt::CTRL + Qt::Key_P, this, TQT_SLOT(publish()),
+ (void)new KAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(publish()),
actionCollection(), "file_publish_structure");
- KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
// Edit menu
- (void)new KAction(i18n("&Delete"), Qt::Key_Delete, modulewidget, TQT_SLOT(delModule()),
+ (void)new KAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()),
actionCollection(), "edit_delete");
- KStdAction::selectAll(modulewidget, TQT_SLOT(selectAll()), actionCollection());
+ KStdAction::selectAll(TQT_TQOBJECT(modulewidget), TQT_SLOT(selectAll()), actionCollection());
// View menu
viewPropertiesAction= new KToggleAction(i18n("&Property Panel"), 0,
- propertyDock, TQT_SLOT(changeHideShowState()),
+ TQT_TQOBJECT(propertyDock), TQT_SLOT(changeHideShowState()),
actionCollection(), "view_properties");
- (void)new KAction(i18n("200%"), 0, this, TQT_SLOT(viewAt200()),
+ (void)new KAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()),
actionCollection(), "view_200");
- (void)new KAction(i18n("150%"), 0, this, TQT_SLOT(viewAt150()),
+ (void)new KAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()),
actionCollection(), "view_150");
- (void)new KAction(i18n("100%"), 0, this, TQT_SLOT(viewAt100()),
+ (void)new KAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()),
actionCollection(), "view_100");
- (void)new KAction(i18n("50%"), 0, this, TQT_SLOT(viewAt50()),
+ (void)new KAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()),
actionCollection(), "view_50");
// Ports menu
- (void)new KAction(i18n("Create IN Audio Signal"), 0, this, TQT_SLOT(createInAudioSignal()),
+ (void)new KAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()),
actionCollection(), "ports_create_in_audio_signal");
- (void)new KAction(i18n("Create OUT Audio Signal"), 0, this, TQT_SLOT(createOutAudioSignal()),
+ (void)new KAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()),
actionCollection(), "ports_create_out_audio_signal");
- (void)new KAction(i18n("Create IN String Property"), 0, this, TQT_SLOT(createInStringProperty()),
+ (void)new KAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()),
actionCollection(), "ports_create_in_string_property");
- (void)new KAction(i18n("Create IN Audio Property"), 0, this, TQT_SLOT(createInAudioProperty()),
+ (void)new KAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()),
actionCollection(), "ports_create_in_audio_property");
- (void)new KAction(i18n("Implement Interface..."), 0, this, TQT_SLOT(addInterface()),
+ (void)new KAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()),
actionCollection(), "ports_implement_interface");
- (void)new KAction(i18n("Change Positions/Names..."), 0, this, TQT_SLOT(changePortPositions()),
+ (void)new KAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()),
actionCollection(), "ports_change_positions");
}
@@ -441,7 +441,7 @@ void ArtsBuilderWindow::publish()
checkName();
structure->publish();
KMessageBox::information(this,
- i18n("The structure has been published as: '%1' on the server.").arg( structure->name().c_str() ));
+ i18n("The structure has been published as: '%1' on the server.").tqarg( structure->name().c_str() ));
}
TQString ArtsBuilderWindow::getOpenFilename(const char *pattern, const char *initialDir)
@@ -474,7 +474,7 @@ void ArtsBuilderWindow::fileNew()
propertyPanel->setSelectedComponent(0);
structure->clear();
modulewidget->reInit();
- m_filename = TQString::null;
+ m_filename = TQString();
setModified(false);
}
@@ -532,7 +532,7 @@ void ArtsBuilderWindow::openSession()
execDlg->start();
execDlg->show();
- connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute()));
+ connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute()));
hide();
// m_filename = filename; FIXME: DOESN'T THIS BELONG HERE?
@@ -587,7 +587,7 @@ bool ArtsBuilderWindow::save(TQString filename)
if(file.status()) {
KMessageBox::sorry(this,
i18n("The file '%1' could not be opened for writing: %2")
- .arg(filename).arg(strerror(file.status())),
+ .tqarg(filename).tqarg(strerror(file.status())),
i18n("aRts Warning"));
return false;
}
@@ -597,7 +597,7 @@ bool ArtsBuilderWindow::save(TQString filename)
if(!file.close()) {
KMessageBox::sorry(this,
i18n("Saving to file '%1' could not be finished correctly: %2")
- .arg(filename).arg(strerror(file.status())),
+ .tqarg(filename).tqarg(strerror(file.status())),
i18n("aRts Warning"));
return false;
}
@@ -674,7 +674,7 @@ void ArtsBuilderWindow::execute()
execDlg->start();
execDlg->show();
- connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute()));
+ connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute()));
hide();
}
@@ -838,7 +838,7 @@ bool ArtsBuilderWindow::promptToSave()
return true;
query = KMessageBox::warningYesNoCancel(this,
- i18n("The current structure has been modified.\nWould you like to save it?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard());
+ i18n("The current structure has been modified.\nWould you like to save it?"), TQString(), KStdGuiItem::save(), KStdGuiItem::discard());
result = false;
switch(query)
@@ -872,7 +872,7 @@ ArtsBuilderApp::ArtsBuilderApp(TQString filename)
mainWindow->open(filename);
} else {
KMessageBox::sorry(0,
- i18n("The specified file '%1' does not exist.").arg(filename),
+ i18n("The specified file '%1' does not exist.").tqarg(filename),
i18n("aRts Warning"));
}
}
diff --git a/arts/builder/main.h b/arts/builder/main.h
index e9c1739..b11cf22 100644
--- a/arts/builder/main.h
+++ b/arts/builder/main.h
@@ -40,6 +40,7 @@ class KToggleAction;
class ArtsBuilderWindow: public KDockMainWindow
{
Q_OBJECT
+ TQ_OBJECT
protected:
KDockWidget* mainDock;
diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp
index 2aed840..dd08589 100644
--- a/arts/builder/menumaker.cpp
+++ b/arts/builder/menumaker.cpp
@@ -5,11 +5,11 @@
using namespace std;
-MenuEntry::MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text)
+MenuEntry::MenuEntry(MenuMaker *menumaker, KActionMenu *tqparent, const char *text)
: menumaker(menumaker), text(text)
{
action = new KAction(TQString::fromLocal8Bit(text));
- parent->insert(action);
+ tqparent->insert(action);
connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated()));
}
@@ -95,7 +95,7 @@ void MenuMaker::addCategory(const TQString& name, const char *prefix)
/* 000 */
/*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int)));
pc->menu()->insertItem(catname(name).c_str(), newMenu, CAT_MAGIC_ID);*/
- arts_debug("inserting a menu called '%s' in the parent menu '%s'",
+ arts_debug("inserting a menu called '%s' in the tqparent menu '%s'",
catname(name).local8Bit().data(),pc->name().local8Bit().data());
categories.push_back(new MenuCategory(name,prefix,newMenu));
}
@@ -148,7 +148,7 @@ TQString MenuMaker::basename(const TQString& name)
{
TQString result = "";
- int i = name.findRev('/');
+ int i = name.tqfindRev('/');
if(i != -1)
result = name.left(i);
@@ -159,7 +159,7 @@ TQString MenuMaker::basename(const TQString& name)
TQString MenuMaker::catname(const TQString& name)
{
- int i = name.findRev('/');
+ int i = name.tqfindRev('/');
if(i >= 0)
return name.mid(i+1);
diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h
index f2481a2..583854f 100644
--- a/arts/builder/menumaker.h
+++ b/arts/builder/menumaker.h
@@ -8,9 +8,10 @@
class MenuMaker;
-class MenuEntry : public QObject
+class MenuEntry : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
protected:
MenuMaker *menumaker;
@@ -18,7 +19,7 @@ protected:
TQCString text;
public:
- MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text);
+ MenuEntry(MenuMaker *menumaker, KActionMenu *tqparent, const char *text);
public slots:
void activated();
@@ -43,9 +44,10 @@ public:
bool matches(const char *item);
};
-class MenuMaker :public QObject
+class MenuMaker :public TQObject
{
Q_OBJECT
+ TQ_OBJECT
std::list<MenuCategory *> categories;
public:
diff --git a/arts/builder/module.cpp b/arts/builder/module.cpp
index 5432492..7d9581b 100644
--- a/arts/builder/module.cpp
+++ b/arts/builder/module.cpp
@@ -128,7 +128,7 @@ void Module::initModule()
_pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User));
if(!_pixmap->height())
{
- iconname.replace( iconname.length() - 4, 3, "png" );
+ iconname.tqreplace( iconname.length() - 4, 3, "png" );
delete _pixmap;
_pixmap = new TQPixmap(iconloader.loadIcon(iconname, KIcon::User));
if( !_pixmap->height() )
@@ -243,8 +243,8 @@ void Module::drawSegment(TQPainter *p, int cellsize, int segment)
mcolor = TQColor(100, 100, 100);
mcolorlight = TQColor(160, 160, 160);
}
- TQColorGroup g( Qt::white, Qt::blue, mcolorlight, mcolor.dark(), mcolor,
- Qt::black, Qt::black );
+ TQColorGroup g( TQt::white, TQt::blue, mcolorlight, mcolor.dark(), mcolor,
+ TQt::black, TQt::black );
TQBrush fill( mcolor );
TQPen textpen(TQColor(255, 255, 180), 1);
@@ -373,7 +373,7 @@ void Module::drawSegment(TQPainter *p, int cellsize, int segment)
if(selected())
{
- TQPen pen(Qt::white, 1, Qt::DotLine);
+ TQPen pen(TQt::white, 1, TQt::DotLine);
p->setPen(pen);
p->drawLine(0, 0, cellsize - 1, 0);
@@ -413,7 +413,7 @@ ModulePort *Module::portAt(int segment, int x, int y)
if(port)
{
TQPoint clickpoint(x, y);
- if(port->clickrect.contains(clickpoint)) return port;
+ if(port->clickrect.tqcontains(clickpoint)) return port;
}
}
return 0;
diff --git a/arts/builder/module.h b/arts/builder/module.h
index 6fbff74..44466bc 100644
--- a/arts/builder/module.h
+++ b/arts/builder/module.h
@@ -46,8 +46,8 @@ public:
bool selected;
StructureComponent *owner;
- QString description;
- QRect clickrect;
+ TQString description;
+ TQRect clickrect;
ConnType conntype;
Direction direction;
int drawsegment;
diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp
index 808b3bc..5ab19fe 100644
--- a/arts/builder/mwidget.cpp
+++ b/arts/builder/mwidget.cpp
@@ -133,7 +133,7 @@ void ModuleWidget::mousePressEvent( TQMouseEvent *e )
return;
}
- if( e->button() == LeftButton )
+ if( e->button() == Qt::LeftButton )
{
StructureComponent *component;
ModulePort *port;
@@ -594,7 +594,7 @@ void ModuleWidget::delModule()
if(KMessageBox::warningContinueCancel(0,
i18n("Delete %n selected module, port or connection? (No undo possible.)",
"Delete %n selected modules, ports and connections? (No undo possible.)",
- numSelected), TQString::null, i18n("&Delete")) == KMessageBox::Continue)
+ numSelected), TQString(), i18n("&Delete")) == KMessageBox::Continue)
{
selectPort(0L);
emit componentSelected(0);
@@ -608,8 +608,8 @@ void ModuleWidget::autoRedrawRouter()
if(autorouter->needRedraw()) redrawAll();
}
-ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *name, WFlags f)
- : QtTableView( parent, name, f),
+ModuleWidget::ModuleWidget(Structure *structure, TQWidget *tqparent, const char *name, WFlags f)
+ : QtTableView( tqparent, name, f),
updateDepth( 0 ),
activeTool( 0L ),
structure( structure ),
@@ -627,7 +627,7 @@ ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *n
setTableFlags(Tbl_autoScrollBars);
setZoom(100);
- setFocusPolicy( NoFocus );
+ setFocusPolicy( TQ_NoFocus );
arts_debug("PORT: mw; bgmode");
setBackgroundMode(NoBackground);
diff --git a/arts/builder/mwidget.h b/arts/builder/mwidget.h
index 8f92c94..b3b41b7 100644
--- a/arts/builder/mwidget.h
+++ b/arts/builder/mwidget.h
@@ -34,6 +34,7 @@ class MWidgetTool;
class ModuleWidget :public QtTableView, public StructureCanvas
{
Q_OBJECT
+ TQ_OBJECT
friend class MWidgetTool;
friend class CreateTool;
friend class CreateInterfaceTool;
@@ -108,7 +109,7 @@ public:
TQPoint componentPos(const StructureComponent *component) const;
TQPoint portPos(const ModulePort *port) const;
- ModuleWidget( Structure *structure, TQWidget *parent = 0,
+ ModuleWidget( Structure *structure, TQWidget *tqparent = 0,
const char *name = 0, WFlags f = 0);
~ModuleWidget();
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 72bd437..ecd877c 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -40,52 +40,52 @@
using namespace std;
-PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,"Props", TRUE)
+PortPosDlg::PortPosDlg(TQWidget *tqparent, Structure *structure) :TQDialog(tqparent,"Props", TRUE)
{
this->structure = structure;
setCaption(i18n("aRts: Structureport View"));
- TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
- //TQHBoxLayout *contentslayout = new TQHBoxLayout;
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
+ //TQHBoxLayout *contentstqlayout = new TQHBoxLayout;
// object type
/*
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *objectlabel = new TQLabel(this);
TQFont labelfont(objectlabel->font());
labelfont.setPointSize(labelfont.pointSize()*3/2);
objectlabel->setFont(labelfont);
objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" "));
- objectlabel->setAlignment(AlignCenter);
+ objectlabel->tqsetAlignment(AlignCenter);
min_size(objectlabel);
- mainlayout->addWidget(objectlabel);
+ maintqlayout->addWidget(objectlabel);
*/
// port description
/*
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *portlabel = new TQLabel(this);
labelfont.setPointSize(labelfont.pointSize()*4/5);
portlabel->setFont(labelfont);
portlabel->setText(i18n("Port description: ")+ port->description);
min_size(portlabel);
- portlabel->setAlignment(AlignCenter);
- mainlayout->addWidget(portlabel);
+ portlabel->tqsetAlignment(AlignCenter);
+ maintqlayout->addWidget(portlabel);
- int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width());
+ int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width());
portlabel->setMinimumWidth(labelwidth);
objectlabel->setMinimumWidth(labelwidth);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler);
- mainlayout->addSpacing(5);
- mainlayout->addLayout(contentslayout);
+ maintqlayout->addWidget(ruler);
+ maintqlayout->addSpacing(5);
+ maintqlayout->addLayout(contentstqlayout);
*/
// list
@@ -94,24 +94,24 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
update();
listbox->setMinimumSize(100,200);
- mainlayout->addWidget(listbox);
+ maintqlayout->addWidget(listbox);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler2);
+ maintqlayout->addWidget(ruler2);
// buttons
- TQHBoxLayout *buttonlayout = new TQHBoxLayout;
- mainlayout->addSpacing(5);
- mainlayout->addLayout(buttonlayout);
- mainlayout->addSpacing(5);
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+ maintqlayout->addSpacing(5);
+ maintqlayout->addLayout(buttontqlayout);
+ maintqlayout->addSpacing(5);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
bbox->addStretch(1);
KIconLoader iconloader;
@@ -133,14 +133,14 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
TQButton *cancelbutton = bbox->addButton(i18n("Cancel"));
connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
*/
- bbox->layout();
+ bbox->tqlayout();
//min_size(bbox);
- buttonlayout->addWidget(bbox);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addWidget(bbox);
+ buttontqlayout->addSpacing(5);
- //mainlayout->activate();
- mainlayout->freeze();
+ //maintqlayout->activate();
+ maintqlayout->freeze();
}
void PortPosDlg::raise()
@@ -247,7 +247,7 @@ void PortPosDlg::update()
}
}
}
- listbox->repaint();
+ listbox->tqrepaint();
}
void PortPosDlg::help()
diff --git a/arts/builder/portposdlg.h b/arts/builder/portposdlg.h
index 1adc997..aa61bad 100644
--- a/arts/builder/portposdlg.h
+++ b/arts/builder/portposdlg.h
@@ -32,13 +32,14 @@
class PortPosDlg :public TQDialog {
Q_OBJECT
+ TQ_OBJECT
protected:
Structure *structure;
TQListBox *listbox;
std::vector<StructurePort *> listports;
public:
- PortPosDlg(TQWidget *parent, Structure *structure);
+ PortPosDlg(TQWidget *tqparent, Structure *structure);
void update();
public slots:
diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp
index cca2ee5..8e543a5 100644
--- a/arts/builder/propertypanel.cpp
+++ b/arts/builder/propertypanel.cpp
@@ -36,8 +36,8 @@
#include <arts/debug.h>
-PropertyPanel::PropertyPanel( TQWidget* parent, const char* name, WFlags fl )
- : PropertyPanelBase( parent, name, fl ),
+PropertyPanel::PropertyPanel( TQWidget* tqparent, const char* name, WFlags fl )
+ : PropertyPanelBase( tqparent, name, fl ),
component(0L),
port(0L)
{
@@ -115,7 +115,7 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component )
if(component->pixmap())
{
moduleIconLabel->setPixmap( *component->pixmap() );
- moduleIconLabel->setMinimumSize( moduleIconLabel->sizeHint() );
+ moduleIconLabel->setMinimumSize( moduleIconLabel->tqsizeHint() );
moduleIconLabel->show();
}
else
@@ -128,11 +128,11 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component )
it != modulePorts.end(); it++)
{
TQString portTitle = (*it)->description
- + TQString(" (%1)").arg( (*it)->PortDesc.type().direction == Arts::output ?
+ + TQString(" (%1)").tqarg( (*it)->PortDesc.type().direction == Arts::output ?
i18n("OUTPUT") : i18n("INPUT") );
portCombo->insertItem( portTitle );
}
- //portCombo->setMinimumSize( portCombo->sizeHint() );
+ //portCombo->setMinimumSize( portCombo->tqsizeHint() );
setEnabled(true);
}
}
@@ -156,7 +156,7 @@ void PropertyPanel::setSelectedPort( ModulePort *port )
// select port in combobox - bah, should be easier ;-)
portCombo->setCurrentItem(
portCombo->listBox()->index(
- portCombo->listBox()->findItem( port->description + " (" ) ) );
+ portCombo->listBox()->tqfindItem( port->description + " (" ) ) );
}
else
{
@@ -341,10 +341,10 @@ bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e )
{
if( port && !constantValueEdit->hasFocus() && (e->type() == TQEvent::KeyPress) ) {
// kdDebug() << TQString(" ..is KeyPress") << endl;
- TQString entered = static_cast<TQKeyEvent *>(e)->text();
+ TQString entered = TQT_TQKEYEVENT(e)->text();
bool goodString = entered.length() > 0;
-// kdDebug() << TQString("pressed '%1'").arg(entered) << endl;
+// kdDebug() << TQString("pressed '%1'").tqarg(entered) << endl;
for( unsigned int i = 0; i < entered.length(); i++)
goodString = goodString && entered[i].isLetterOrNumber();
diff --git a/arts/builder/propertypanel.h b/arts/builder/propertypanel.h
index 3603dda..07ce3f9 100644
--- a/arts/builder/propertypanel.h
+++ b/arts/builder/propertypanel.h
@@ -33,9 +33,10 @@ class ModulePort;
class PropertyPanel: public PropertyPanelBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- PropertyPanel( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+ PropertyPanel( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
public slots:
void setSelectedComponent( StructureComponent *component );
diff --git a/arts/builder/propertypanelbase.ui b/arts/builder/propertypanelbase.ui
index c89abcc..b71d0bd 100644
--- a/arts/builder/propertypanelbase.ui
+++ b/arts/builder/propertypanelbase.ui
@@ -1,11 +1,11 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>PropertyPanelBase</class>
<author>Hans Meine &lt;hans_meine@gmx.net&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>propertyPanelBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -13,9 +13,9 @@
<height>484</height>
</rect>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@@ -27,7 +27,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>titleFrame</cstring>
</property>
@@ -37,7 +37,7 @@
<property name="frameShadow">
<enum>Plain</enum>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
<vbox>
<property name="name">
@@ -49,7 +49,7 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>selectedLabel</cstring>
</property>
@@ -59,11 +59,11 @@
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>spacerLayout</cstring>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
<vbox>
<property name="name">
@@ -75,7 +75,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>mainBoxLayout</cstring>
</property>
@@ -89,7 +89,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout17</cstring>
</property>
@@ -103,7 +103,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout13</cstring>
</property>
@@ -117,14 +117,14 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>moduleIconLabel</cstring>
</property>
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout16</cstring>
</property>
@@ -138,12 +138,12 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>moduleNameLabel</cstring>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout10</cstring>
</property>
@@ -157,7 +157,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>portComboLabel</cstring>
</property>
@@ -168,7 +168,7 @@
<cstring>portCombo</cstring>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<property name="name">
<cstring>portCombo</cstring>
</property>
@@ -198,7 +198,7 @@
</widget>
</hbox>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>portValueGroup</cstring>
</property>
@@ -215,7 +215,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>pvNotSetButton</cstring>
</property>
@@ -223,7 +223,7 @@
<string>&amp;Not set</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout9</cstring>
</property>
@@ -237,7 +237,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>pvConstantButton</cstring>
</property>
@@ -245,7 +245,7 @@
<string>Constant &amp;value:</string>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<property name="name">
<cstring>constantValueComboBox</cstring>
</property>
@@ -253,7 +253,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>constantValueEdit</cstring>
</property>
@@ -263,7 +263,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>connectionLayout</cstring>
</property>
@@ -277,7 +277,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>pvConnectionButton</cstring>
</property>
@@ -296,7 +296,7 @@
<enum>Expanding</enum>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>connectButton</cstring>
</property>
@@ -310,11 +310,11 @@
</widget>
</hbox>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>tipLabel</cstring>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="wordwrap" stdset="0">
@@ -355,8 +355,8 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot access="protected">setTitleFont()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp
index dee8cb9..ca488ff 100644
--- a/arts/builder/qttableview.cpp
+++ b/arts/builder/qttableview.cpp
@@ -7,14 +7,14 @@
**
** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
**
-** This file contains a class moved out of the Qt GUI Toolkit API. It
+** This file contains a class moved out of the TQt GUI Toolkit API. It
** may be used, distributed and modified without limitation.
**
**********************************************************************/
#include "qttableview.h"
#include "qttableview.moc"
-#ifndef QT_NO_QTTABLEVIEW
+#ifndef TQT_NO_TQTTABLEVIEW
#include "tqscrollbar.h"
#include "tqpainter.h"
#include "tqdrawutil.h"
@@ -34,23 +34,23 @@ enum ScrollBarDirtyFlags {
};
-#define HSBEXT horizontalScrollBar()->sizeHint().height()
-#define VSBEXT verticalScrollBar()->sizeHint().width()
+#define HSBEXT horizontalScrollBar()->tqsizeHint().height()
+#define VSBEXT verticalScrollBar()->tqsizeHint().width()
-class QCornerSquare : public QWidget // internal class
+class TQCornerSquare : public TQWidget // internal class
{
public:
- QCornerSquare( TQWidget *, const char* = 0 );
+ TQCornerSquare( TQWidget *, const char* = 0 );
void paintEvent( TQPaintEvent * );
};
-QCornerSquare::QCornerSquare( TQWidget *parent, const char *name )
- : TQWidget( parent, name )
+TQCornerSquare::TQCornerSquare( TQWidget *tqparent, const char *name )
+ : TQWidget( tqparent, name )
{
}
-void QCornerSquare::paintEvent( TQPaintEvent * )
+void TQCornerSquare::paintEvent( TQPaintEvent * )
{
}
@@ -88,7 +88,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
used by functions such as setXOffset() or maxYOffset().
\i The \e widget coordinates. (0,0) is the top-left corner of the widget,
- \e including the frame. They are used by functions such as repaint().
+ \e including the frame. They are used by functions such as tqrepaint().
\i The \e view coordinates. (0,0) is the top-left corner of the view, \e
excluding the frame. This is the least-used coordinate system; it is used by
@@ -119,13 +119,13 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
it easy to have child widgets inside tables, which QtTableView
doesn't support at all.
- \sa QScrollView
+ \sa TQScrollView
\link guibooks.html#fowler GUI Design Handbook: Table\endlink
*/
/*!
- Constructs a table view. The \a parent, \a name and \f arguments
+ Constructs a table view. The \a tqparent, \a name and \f arguments
are passed to the TQFrame constructor.
The \link setTableFlags() table flags\endlink are all cleared (set to 0).
@@ -135,7 +135,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
The \link setCellHeight() cell height\endlink and \link setCellWidth()
cell width\endlink are set to 0.
- Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
+ Frame line tqshapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
see TQFrame::setFrameStyle().
Note that the \a f argument is \e not \link setTableFlags() table
@@ -144,8 +144,8 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
*/
-QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f )
- : TQFrame( parent, name, f )
+QtTableView::QtTableView( TQWidget *tqparent, const char *name, WFlags f )
+ : TQFrame( tqparent, name, f )
{
nRows = nCols = 0; // zero rows/cols
xCellOffs = yCellOffs = 0; // zero offset
@@ -207,7 +207,7 @@ void QtTableView::show()
/*!
- \overload void QtTableView::repaint( bool erase )
+ \overload void QtTableView::tqrepaint( bool erase )
Repaints the entire view.
*/
@@ -221,16 +221,16 @@ void QtTableView::show()
If \a w is negative, it is replaced with <code>width() - x</code>.
If \a h is negative, it is replaced with <code>height() - y</code>.
- Doing a repaint() usually is faster than doing an update(), but
+ Doing a tqrepaint() usually is faster than doing an update(), but
calling update() many times in a row will generate a single paint
event.
At present, QtTableView is the only widget that reimplements \link
- TQWidget::repaint() repaint()\endlink. It does this because by
- clearing and then repainting one cell at at time, it can make the
+ TQWidget::tqrepaint() tqrepaint()\endlink. It does this because by
+ clearing and then tqrepainting one cell at at time, it can make the
screen flicker less than it would otherwise. */
-void QtTableView::repaint( int x, int y, int w, int h, bool erase )
+void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
{
if ( !isVisible() || testWState(WState_BlockUpdates) )
return;
@@ -249,7 +249,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase )
}
/*!
- \overload void QtTableView::repaint( const TQRect &r, bool erase )
+ \overload void QtTableView::tqrepaint( const TQRect &r, bool erase )
Replaints rectangle \a r. If \a erase is TRUE draws the background
using the palette's background.
*/
@@ -265,7 +265,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase )
Sets the number of rows of the table to \a rows (must be non-negative).
Does not change topCell().
- The table repaints itself automatically if autoUpdate() is set.
+ The table tqrepaints itself automatically if autoUpdate() is set.
\sa numCols(), setNumCols(), numRows()
*/
@@ -273,7 +273,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase )
void QtTableView::setNumRows( int rows )
{
if ( rows < 0 ) {
-#if defined(QT_CHECK_RANGE)
+#if defined(TQT_CHECK_RANGE)
qWarning( "QtTableView::setNumRows: (%s) Negative argument %d.",
name( "unnamed" ), rows );
#endif
@@ -288,7 +288,7 @@ void QtTableView::setNumRows( int rows )
nRows = rows;
if ( autoUpdate() && isVisible() &&
( oldLastVisible != lastRowVisible() || oldTopCell != topCell() ) )
- repaint( oldTopCell != topCell() );
+ tqrepaint( oldTopCell != topCell() );
} else {
// Be more careful - if destructing, bad things might happen.
nRows = rows;
@@ -307,7 +307,7 @@ void QtTableView::setNumRows( int rows )
Sets the number of columns of the table to \a cols (must be non-negative).
Does not change leftCell().
- The table repaints itself automatically if autoUpdate() is set.
+ The table tqrepaints itself automatically if autoUpdate() is set.
\sa numCols(), numRows(), setNumRows()
*/
@@ -315,7 +315,7 @@ void QtTableView::setNumRows( int rows )
void QtTableView::setNumCols( int cols )
{
if ( cols < 0 ) {
-#if defined(QT_CHECK_RANGE)
+#if defined(TQT_CHECK_RANGE)
qWarning( "QtTableView::setNumCols: (%s) Negative argument %d.",
name( "unnamed" ), cols );
#endif
@@ -328,7 +328,7 @@ void QtTableView::setNumCols( int cols )
if ( autoUpdate() && isVisible() ) {
int maxCol = lastColVisible();
if ( maxCol >= oldCols || maxCol >= nCols )
- repaint();
+ tqrepaint();
}
updateScrollBars( horRange );
updateFrameSize();
@@ -580,7 +580,7 @@ void QtTableView::setCellWidth( int cellWidth )
{
if ( cellW == cellWidth )
return;
-#if defined(QT_CHECK_RANGE)
+#if defined(TQT_CHECK_RANGE)
if ( cellWidth < 0 || cellWidth > SHRT_MAX ) {
qWarning( "QtTableView::setCellWidth: (%s) Argument out of range (%d)",
name( "unnamed" ), cellWidth );
@@ -591,7 +591,7 @@ void QtTableView::setCellWidth( int cellWidth )
updateScrollBars( horSteps | horRange );
if ( autoUpdate() && isVisible() )
- repaint();
+ tqrepaint();
}
@@ -634,7 +634,7 @@ void QtTableView::setCellHeight( int cellHeight )
{
if ( cellH == cellHeight )
return;
-#if defined(QT_CHECK_RANGE)
+#if defined(TQT_CHECK_RANGE)
if ( cellHeight < 0 || cellHeight > SHRT_MAX ) {
qWarning( "QtTableView::setCellHeight: (%s) Argument out of range (%d)",
name( "unnamed" ), cellHeight );
@@ -643,7 +643,7 @@ void QtTableView::setCellHeight( int cellHeight )
#endif
cellH = (short)cellHeight;
if ( autoUpdate() && isVisible() )
- repaint();
+ tqrepaint();
updateScrollBars( verSteps | verRange );
}
@@ -717,7 +717,7 @@ int QtTableView::totalHeight()
Sets the table flags to \a f.
If a flag setting changes the appearance of the table, the table is
- repainted if - and only if - autoUpdate() is TRUE.
+ tqrepainted if - and only if - autoUpdate() is TRUE.
The table flags are mostly single bits, though there are some multibit
flags for convenience. Here is a complete list:
@@ -786,7 +786,7 @@ void QtTableView::setTableFlags( uint f )
bool updateOn = autoUpdate();
setAutoUpdate( FALSE );
- uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH;
+ uint tqrepaintMask = Tbl_cutCellsV | Tbl_cutCellsH;
if ( f & Tbl_vScrollBar ) {
setVerScrollBar( TRUE );
@@ -817,15 +817,15 @@ void QtTableView::setTableFlags( uint f )
(f & Tbl_snapToVGrid) != 0 && yCellDelta != 0 ) {
snapToGrid( (f & Tbl_snapToHGrid) != 0, // do snapping
(f & Tbl_snapToVGrid) != 0 );
- repaintMask |= Tbl_snapToGrid; // repaint table
+ tqrepaintMask |= Tbl_snapToGrid; // tqrepaint table
}
}
if ( updateOn ) {
setAutoUpdate( TRUE );
updateScrollBars();
- if ( isVisible() && (f & repaintMask) )
- repaint();
+ if ( isVisible() && (f & tqrepaintMask) )
+ tqrepaint();
}
}
@@ -852,7 +852,7 @@ void QtTableView::clearTableFlags( uint f )
bool updateOn = autoUpdate();
setAutoUpdate( FALSE );
- uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH;
+ uint tqrepaintMask = Tbl_cutCellsV | Tbl_cutCellsH;
if ( f & Tbl_vScrollBar ) {
setVerScrollBar( FALSE );
@@ -864,7 +864,7 @@ void QtTableView::clearTableFlags( uint f )
int maxX = maxXOffset();
if ( xOffs > maxX ) {
setOffset( maxX, yOffs );
- repaintMask |= Tbl_scrollLastHCell;
+ tqrepaintMask |= Tbl_scrollLastHCell;
}
updateScrollBars( horRange );
}
@@ -872,7 +872,7 @@ void QtTableView::clearTableFlags( uint f )
int maxY = maxYOffset();
if ( yOffs > maxY ) {
setOffset( xOffs, maxY );
- repaintMask |= Tbl_scrollLastVCell;
+ tqrepaintMask |= Tbl_scrollLastVCell;
}
updateScrollBars( verRange );
}
@@ -881,7 +881,7 @@ void QtTableView::clearTableFlags( uint f )
(f & Tbl_smoothVScrolling) != 0 && yCellDelta != 0 ) {
snapToGrid( (f & Tbl_smoothHScrolling) != 0, // do snapping
(f & Tbl_smoothVScrolling) != 0 );
- repaintMask |= Tbl_smoothScrolling; // repaint table
+ tqrepaintMask |= Tbl_smoothScrolling; // tqrepaint table
}
}
if ( f & Tbl_snapToHGrid ) {
@@ -893,8 +893,8 @@ void QtTableView::clearTableFlags( uint f )
if ( updateOn ) {
setAutoUpdate( TRUE );
updateScrollBars(); // returns immediately if nothing to do
- if ( isVisible() && (f & repaintMask) )
- repaint();
+ if ( isVisible() && (f & tqrepaintMask) )
+ tqrepaint();
}
}
@@ -916,20 +916,20 @@ void QtTableView::clearTableFlags( uint f )
automatically whenever it has changed in some way (for example, when a
\link setTableFlags() flag\endlink is changed).
- If \a enable is FALSE, the view does NOT repaint itself or update
+ If \a enable is FALSE, the view does NOT tqrepaint itself or update
its internal state variables when it is changed. This can be
useful to avoid flicker during large changes and is singularly
useless otherwise. Disable auto-update, do the changes, re-enable
- auto-update and call repaint().
+ auto-update and call tqrepaint().
\warning Do not leave the view in this state for a long time
(i.e., between events). If, for example, the user interacts with the
view when auto-update is off, strange things can happen.
- Setting auto-update to TRUE does not repaint the view; you must call
- repaint() to do this.
+ Setting auto-update to TRUE does not tqrepaint the view; you must call
+ tqrepaint() to do this.
- \sa autoUpdate(), repaint()
+ \sa autoUpdate(), tqrepaint()
*/
void QtTableView::setAutoUpdate( bool enable )
@@ -948,7 +948,7 @@ void QtTableView::setAutoUpdate( bool enable )
Repaints the cell at row \a row, column \a col if it is inside the view.
If \a erase is TRUE, the relevant part of the view is cleared to the
- background color/pixmap before the contents are repainted.
+ background color/pixmap before the contents are tqrepainted.
\sa isVisible()
*/
@@ -963,7 +963,7 @@ void QtTableView::updateCell( int row, int col, bool erase )
TQRect uR = TQRect( xPos, yPos,
cellW ? cellW : cellWidth(col),
cellH ? cellH : cellHeight(row) );
- repaint( uR.intersect(viewRect()), erase );
+ tqrepaint( uR.intersect(viewRect()), erase );
}
@@ -1073,7 +1073,7 @@ void QtTableView::coverCornerSquare( bool enable )
{
coveringCornerSquare = enable;
if ( !cornerSquare && enable ) {
- cornerSquare = new QCornerSquare( this );
+ cornerSquare = new TQCornerSquare( this );
Q_CHECK_PTR( cornerSquare );
cornerSquare->setGeometry( maxViewX() + frameWidth() + 1,
maxViewY() + frameWidth() + 1,
@@ -1266,7 +1266,7 @@ void QtTableView::setupPainter( TQPainter * )
/*!
Handles paint events, \a e, for the table view.
- Calls paintCell() for the cells that needs to be repainted.
+ Calls paintCell() for the cells that needs to be tqrepainted.
*/
void QtTableView::paintEvent( TQPaintEvent *e )
@@ -1280,7 +1280,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
TQPainter paint( this );
- if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ?
+ if ( !contentsRect().tqcontains( updateR, TRUE ) ) {// update frame ?
drawFrame( &paint );
if ( updateR.left() < frameWidth() ) //###
updateR.setLeft( frameWidth() );
@@ -1315,7 +1315,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
TQRect winR = viewRect();
TQRect cellR;
TQRect cellUR;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
TQWMatrix matrix;
#endif
@@ -1339,11 +1339,11 @@ void QtTableView::paintEvent( TQPaintEvent *e )
if ( eraseInPaint )
paint.eraseRect( cellUR );
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
matrix.translate( xPos, yPos );
paint.setWorldMatrix( matrix );
if ( testTableFlags(Tbl_clipCellPainting) ||
- frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt
+ frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt
paint.setClipRect( cellUR );
paintCell( &paint, row, col );
paint.setClipping( FALSE );
@@ -1355,7 +1355,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
#else
paint.translate( xPos, yPos );
if ( testTableFlags(Tbl_clipCellPainting) ||
- frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt
+ frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt
paint.setClipRect( cellUR );
paintCell( &paint, row, col );
paint.setClipping( FALSE );
@@ -1379,13 +1379,13 @@ void QtTableView::paintEvent( TQPaintEvent *e )
// Note that this needs to be done regardless whether we do
// eraseInPaint or not. Reason: a subclass may implement
- // flicker-freeness and encourage the use of repaint(FALSE).
+ // flicker-freeness and encourage the use of tqrepaint(FALSE).
// The subclass, however, cannot draw all pixels, just those
// inside the cells. So QtTableView is reponsible for all pixels
// outside the cells.
TQRect viewR = viewRect();
- const TQColorGroup g = colorGroup();
+ const TQColorGroup g = tqcolorGroup();
if ( xPos <= maxX ) {
TQRect r = viewR;
@@ -1414,8 +1414,8 @@ void QtTableView::resizeEvent( TQResizeEvent * )
verSteps | verGeometry | verRange );
showOrHideScrollBars();
updateFrameSize();
- int maxX = QMIN( xOffs, maxXOffset() ); // ### can be slow
- int maxY = QMIN( yOffs, maxYOffset() );
+ int maxX = TQMIN( xOffs, maxXOffset() ); // ### can be slow
+ int maxY = TQMIN( yOffs, maxYOffset() );
setOffset( maxX, maxY );
}
@@ -1426,7 +1426,7 @@ void QtTableView::resizeEvent( TQResizeEvent * )
void QtTableView::updateView()
{
- repaint( viewRect() );
+ tqrepaint( viewRect() );
}
/*!
@@ -1439,14 +1439,14 @@ TQScrollBar *QtTableView::verticalScrollBar() const
{
QtTableView *that = (QtTableView*)this; // semantic const
if ( !vScrollBar ) {
- TQScrollBar *sb = new TQScrollBar( TQScrollBar::Vertical, that );
-#ifndef QT_NO_CURSOR
+ TQScrollBar *sb = new TQScrollBar( Qt::Vertical, that );
+#ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor );
#endif
- sb->resize( sb->sizeHint() ); // height is irrelevant
+ sb->resize( sb->tqsizeHint() ); // height is irrelevant
Q_CHECK_PTR(sb);
sb->setTracking( FALSE );
- sb->setFocusPolicy( NoFocus );
+ sb->setFocusPolicy( TQ_NoFocus );
connect( sb, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(verSbValue(int)));
connect( sb, TQT_SIGNAL(sliderMoved(int)),
@@ -1470,12 +1470,12 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
{
QtTableView *that = (QtTableView*)this; // semantic const
if ( !hScrollBar ) {
- TQScrollBar *sb = new TQScrollBar( TQScrollBar::Horizontal, that );
-#ifndef QT_NO_CURSOR
+ TQScrollBar *sb = new TQScrollBar( Qt::Horizontal, that );
+#ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor );
#endif
- sb->resize( sb->sizeHint() ); // width is irrelevant
- sb->setFocusPolicy( NoFocus );
+ sb->resize( sb->tqsizeHint() ); // width is irrelevant
+ sb->setFocusPolicy( TQ_NoFocus );
Q_CHECK_PTR(sb);
sb->setTracking( FALSE );
connect( sb, TQT_SIGNAL(valueChanged(int)),
@@ -1522,7 +1522,7 @@ void QtTableView::setHorScrollBar( bool on, bool update )
else
sbDirty = sbDirty | verMask;
if ( hideScrollBar && isVisible() )
- repaint( hScrollBar->x(), hScrollBar->y(),
+ tqrepaint( hScrollBar->x(), hScrollBar->y(),
width() - hScrollBar->x(), hScrollBar->height() );
}
if ( update )
@@ -1561,7 +1561,7 @@ void QtTableView::setVerScrollBar( bool on, bool update )
else
sbDirty = sbDirty | horMask;
if ( hideScrollBar && isVisible() )
- repaint( vScrollBar->x(), vScrollBar->y(),
+ tqrepaint( vScrollBar->x(), vScrollBar->y(),
vScrollBar->width(), height() - vScrollBar->y() );
}
if ( update )
@@ -1579,7 +1579,7 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY,
return r;
if ( goOutsideView || yPos >= minViewY() && yPos <= maxViewY() ) {
if ( yPos < minViewY() ) {
-#if defined(QT_CHECK_RANGE)
+#if defined(TQT_CHECK_RANGE)
qWarning( "QtTableView::findRawRow: (%s) internal error: "
"yPos < minViewY() && goOutsideView "
"not supported. (%d,%d)",
@@ -1626,7 +1626,7 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX ,
return c;
if ( goOutsideView || xPos >= minViewX() && xPos <= maxViewX() ) {
if ( xPos < minViewX() ) {
-#if defined(QT_CHECK_RANGE)
+#if defined(TQT_CHECK_RANGE)
qWarning( "QtTableView::findRawCol: (%s) internal error: "
"xPos < minViewX() && goOutsideView "
"not supported. (%d,%d)",
@@ -1995,7 +1995,7 @@ void QtTableView::updateScrollBars( uint f )
if ( sbDirty & horSteps ) {
if ( cellW )
- hScrollBar->setSteps( QMIN(cellW,viewWidth()/2), viewWidth() );
+ hScrollBar->setSteps( TQMIN(cellW,viewWidth()/2), viewWidth() );
else
hScrollBar->setSteps( 16, viewWidth() );
}
@@ -2006,7 +2006,7 @@ void QtTableView::updateScrollBars( uint f )
if ( sbDirty & horValue )
hScrollBar->setValue( xOffs );
- // show scrollbar only when it has a sane geometry
+ // show scrollbar only when it has a sane tqgeometry
if ( !hScrollBar->isVisible() )
hScrollBar->show();
}
@@ -2019,7 +2019,7 @@ void QtTableView::updateScrollBars( uint f )
if ( sbDirty & verSteps ) {
if ( cellH )
- vScrollBar->setSteps( QMIN(cellH,viewHeight()/2), viewHeight() );
+ vScrollBar->setSteps( TQMIN(cellH,viewHeight()/2), viewHeight() );
else
vScrollBar->setSteps( 16, viewHeight() ); // fttb! ###
}
@@ -2030,7 +2030,7 @@ void QtTableView::updateScrollBars( uint f )
if ( sbDirty & verValue )
vScrollBar->setValue( yOffs );
- // show scrollbar only when it has a sane geometry
+ // show scrollbar only when it has a sane tqgeometry
if ( !vScrollBar->isVisible() )
vScrollBar->show();
}
@@ -2061,9 +2061,9 @@ void QtTableView::updateFrameSize()
setFrameRect( TQRect(0,0,rw,rh) );
if ( rw != fw )
- update( QMIN(fw,rw) - frameWidth() - 2, 0, frameWidth()+4, rh );
+ update( TQMIN(fw,rw) - frameWidth() - 2, 0, frameWidth()+4, rh );
if ( rh != fh )
- update( 0, QMIN(fh,rh) - frameWidth() - 2, rw, frameWidth()+4 );
+ update( 0, TQMIN(fh,rh) - frameWidth() - 2, rw, frameWidth()+4 );
}
}
@@ -2253,7 +2253,7 @@ void QtTableView::showOrHideScrollBars()
Call this function when the table view's total size is changed;
typically because the result of cellHeight() or cellWidth() have changed.
- This function does not repaint the widget.
+ This function does not tqrepaint the widget.
*/
void QtTableView::updateTableSize()
diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h
index ab83d15..a6e868b 100644
--- a/arts/builder/qttableview.h
+++ b/arts/builder/qttableview.h
@@ -7,38 +7,37 @@
**
** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
**
-** This file contains a class moved out of the Qt GUI Toolkit API. It
+** This file contains a class moved out of the TQt GUI Toolkit API. It
** may be used, distributed and modified without limitation.
**
**********************************************************************/
-#ifndef QTTABLEVIEW_H
-#define QTTABLEVIEW_H
+#ifndef TQTTABLEVIEW_H
+#define TQTTABLEVIEW_H
-#ifndef QT_H
#include "tqframe.h"
-#endif // QT_H
-#ifndef QT_NO_QTTABLEVIEW
+#ifndef TQT_NO_TQTTABLEVIEW
class TQScrollBar;
-class QCornerSquare;
+class TQCornerSquare;
-class QtTableView : public QFrame
+class QtTableView : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
virtual void setBackgroundColor( const TQColor & );
virtual void setPalette( const TQPalette & );
void show();
- void repaint( bool erase=TRUE );
- void repaint( int x, int y, int w, int h, bool erase=TRUE );
- void repaint( const TQRect &, bool erase=TRUE );
+ void tqrepaint( bool erase=TRUE );
+ void tqrepaint( int x, int y, int w, int h, bool erase=TRUE );
+ void tqrepaint( const TQRect &, bool erase=TRUE );
protected:
- QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
+ QtTableView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 );
~QtTableView();
int numRows() const;
@@ -78,8 +77,8 @@ protected:
void updateCell( int row, int column, bool erase=TRUE );
- QRect cellUpdateRect() const;
- QRect viewRect() const;
+ TQRect cellUpdateRect() const;
+ TQRect viewRect() const;
int lastRowVisible() const;
int lastColVisible() const;
@@ -162,14 +161,14 @@ private:
uint inSbUpdate : 1;
uint tFlags;
- QRect cellUpdateR;
+ TQRect cellUpdateR;
TQScrollBar *vScrollBar;
TQScrollBar *hScrollBar;
- QCornerSquare *cornerSquare;
+ TQCornerSquare *cornerSquare;
private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
QtTableView( const QtTableView & );
QtTableView &operator=( const QtTableView & );
#endif
@@ -236,16 +235,16 @@ inline TQRect QtTableView::cellUpdateRect() const
inline bool QtTableView::autoUpdate() const
{ return isUpdatesEnabled(); }
-inline void QtTableView::repaint( bool erase )
-{ repaint( 0, 0, width(), height(), erase ); }
+inline void QtTableView::tqrepaint( bool erase )
+{ tqrepaint( 0, 0, width(), height(), erase ); }
-inline void QtTableView::repaint( const TQRect &r, bool erase )
-{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
+inline void QtTableView::tqrepaint( const TQRect &r, bool erase )
+{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); }
inline void QtTableView::updateScrollBars()
{ updateScrollBars( 0 ); }
-#endif // QT_NO_QTTABLEVIEW
+#endif // TQT_NO_TQTTABLEVIEW
-#endif // QTTABLEVIEW_H
+#endif // TQTTABLEVIEW_H
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index 57cfde3..c54cbab 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -37,33 +37,33 @@
#include <tqpushbutton.h>
static void min_size(TQWidget *w) {
- w->setMinimumSize(w->sizeHint());
+ w->setMinimumSize(w->tqsizeHint());
}
-RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
+RetrieveDlg::RetrieveDlg(TQWidget *tqparent) :TQDialog(tqparent,"X", TRUE)
{
setCaption(i18n("Retrieve Structure From Server"));
- TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
// caption label: "Synthesis running..."
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *captionlabel = new TQLabel(this);
TQFont labelfont(captionlabel->font());
labelfont.setPointSize(labelfont.pointSize()*3/2);
captionlabel->setFont(labelfont);
captionlabel->setText(TQString(" ")+i18n("Published structures")+TQString(" "));
- captionlabel->setAlignment(AlignCenter);
+ captionlabel->tqsetAlignment(AlignCenter);
min_size(captionlabel);
- mainlayout->addWidget(captionlabel);
+ maintqlayout->addWidget(captionlabel);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler2);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler2);
+ maintqlayout->addSpacing(5);
// listwidget
@@ -85,26 +85,26 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
listbox->insertItem((*ni).c_str());
#endif
- mainlayout->addWidget(listbox);
+ maintqlayout->addWidget(listbox);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler);
+ maintqlayout->addSpacing(5);
// buttons
- TQHBoxLayout *buttonlayout = new TQHBoxLayout;
- mainlayout->addSpacing(5);
- mainlayout->addLayout(buttonlayout);
- mainlayout->addSpacing(5);
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+ maintqlayout->addSpacing(5);
+ maintqlayout->addLayout(buttontqlayout);
+ maintqlayout->addSpacing(5);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
bbox->addStretch(1);
TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
@@ -113,12 +113,12 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
- bbox->layout();
+ bbox->tqlayout();
- buttonlayout->addWidget(bbox);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addWidget(bbox);
+ buttontqlayout->addSpacing(5);
- mainlayout->freeze();
+ maintqlayout->freeze();
}
TQString RetrieveDlg::result()
@@ -127,7 +127,7 @@ TQString RetrieveDlg::result()
{
return(listbox->text(listbox->currentItem()));
}
- return TQString::null;
+ return TQString();
}
void RetrieveDlg::help()
diff --git a/arts/builder/retrievedlg.h b/arts/builder/retrievedlg.h
index e0a6eb0..3ffa57e 100644
--- a/arts/builder/retrievedlg.h
+++ b/arts/builder/retrievedlg.h
@@ -35,9 +35,10 @@
class RetrieveDlg :public TQDialog {
Q_OBJECT
+ TQ_OBJECT
TQListBox *listbox;
public:
- RetrieveDlg(TQWidget *parent);
+ RetrieveDlg(TQWidget *tqparent);
TQString result();
public slots:
void help();
diff --git a/arts/builder/structureport.cpp b/arts/builder/structureport.cpp
index 35b36b4..55c1521 100644
--- a/arts/builder/structureport.cpp
+++ b/arts/builder/structureport.cpp
@@ -104,8 +104,8 @@ void StructurePort::drawSegment(TQPainter *dest, int cellsize, int segment)
TQColor mcolor(43,43,168);
TQColor mcolorlight(164,176,242);
- TQColorGroup g( Qt::white, Qt::blue, mcolorlight, mcolor.dark(), mcolor,
- Qt::black, Qt::black );
+ TQColorGroup g( TQt::white, TQt::blue, mcolorlight, mcolor.dark(), mcolor,
+ TQt::black, TQt::black );
TQBrush fill( mcolor );
TQPen textpen(TQColor(255,255,180),1);
int border = cellsize/10;
@@ -117,7 +117,7 @@ void StructurePort::drawSegment(TQPainter *dest, int cellsize, int segment)
// Selection box
if(_selected)
{
- TQPen pen(Qt::white,1,Qt::DotLine);
+ TQPen pen(TQt::white,1,TQt::DotLine);
p.setPen(pen);
p.drawRect(0,boxtop,cellsize,cellsize/2);
@@ -126,7 +126,7 @@ void StructurePort::drawSegment(TQPainter *dest, int cellsize, int segment)
int textwidth;
TQString label=DrawUtils::cropText(&p, pname, cellsize-border*2, textwidth);
p.drawText(border,border+boxtop,cellsize-border-1,(cellsize/2-1)-2*border,
- Qt::AlignCenter,label);
+ TQt::AlignCenter,label);
int arrowwidth = cellsize/4;
@@ -195,7 +195,7 @@ d | |
a.setPoint(8,t,b+w+l);
a.setPoint(9,t,b+l);
*/
- p.setPen(Qt::NoPen);
+ p.setPen(TQt::NoPen);
p.setBrush(fbrush);
p.drawPolygon(a);
if(delta==1 && direction==0)
@@ -224,7 +224,7 @@ ModulePort *StructurePort::portAt(int segment, int x, int y)
assert(segment == 0);
TQPoint clickpoint(x,y);
- if(_port->clickrect.contains(clickpoint)) return _port;
+ if(_port->clickrect.tqcontains(clickpoint)) return _port;
return 0;
}
diff --git a/arts/examples/README b/arts/examples/README
index 2132bfc..425da5c 100644
--- a/arts/examples/README
+++ b/arts/examples/README
@@ -172,7 +172,7 @@ example_xfade.arts
This example mixes 440 and 880 Hz sine waves using a cross fader.
Adjust the value of the cross fader's percentage input from -1 to 1 to
-control the mixing of the two signals.
+control the mixing of the two Q_SIGNALS.
example_pscale.arts
diff --git a/arts/examples/instrument_flexible_slide_GUI.arts b/arts/examples/instrument_flexible_slide_GUI.arts
index 3b0f0bc..92523fa 100644
--- a/arts/examples/instrument_flexible_slide_GUI.arts
+++ b/arts/examples/instrument_flexible_slide_GUI.arts
@@ -8,7 +8,7 @@ module=Arts::Poti
{
id=1
}
- port=parent
+ port=tqparent
{
id=2
}
@@ -71,7 +71,7 @@ module=Arts::Widget
{
id=14
}
- port=parent
+ port=tqparent
{
id=15
}
@@ -110,7 +110,7 @@ module=Arts::Poti
{
id=22
}
- port=parent
+ port=tqparent
{
id=23
}
@@ -169,7 +169,7 @@ module=Arts::Poti
{
id=35
}
- port=parent
+ port=tqparent
{
id=36
}
@@ -230,7 +230,7 @@ module=Arts::Poti
{
id=48
}
- port=parent
+ port=tqparent
{
id=49
}
@@ -291,7 +291,7 @@ module=Arts::Poti
{
id=61
}
- port=parent
+ port=tqparent
{
id=62
}
@@ -345,7 +345,7 @@ module=Arts::Poti
}
structureport
{
- name=parent
+ name=tqparent
x=2
y=1
position=0
diff --git a/arts/examples/instrument_moog_vcf_tune_GUI.arts b/arts/examples/instrument_moog_vcf_tune_GUI.arts
index 6db62f6..0aff72a 100644
--- a/arts/examples/instrument_moog_vcf_tune_GUI.arts
+++ b/arts/examples/instrument_moog_vcf_tune_GUI.arts
@@ -8,7 +8,7 @@ module=Arts::Widget
{
id=1
}
- port=parent
+ port=tqparent
{
id=2
}
@@ -47,7 +47,7 @@ module=Arts::Poti
{
id=9
}
- port=parent
+ port=tqparent
{
id=10
}
@@ -110,7 +110,7 @@ module=Arts::Poti
{
id=22
}
- port=parent
+ port=tqparent
{
id=23
}
@@ -173,7 +173,7 @@ module=Arts::Poti
{
id=35
}
- port=parent
+ port=tqparent
{
id=36
}
@@ -229,7 +229,7 @@ module=Arts::Poti
}
structureport
{
- name=parent
+ name=tqparent
x=2
y=1
position=0
diff --git a/arts/examples/mixer_element_eq.arts b/arts/examples/mixer_element_eq.arts
index 6123bb2..c798166 100644
--- a/arts/examples/mixer_element_eq.arts
+++ b/arts/examples/mixer_element_eq.arts
@@ -8,7 +8,7 @@ module=Arts::Widget
{
id=1
}
- port=parent
+ port=tqparent
{
id=2
}
@@ -550,7 +550,7 @@ structureport
}
structureport
{
- name=parent
+ name=tqparent
x=7
y=0
position=0
diff --git a/arts/examples/mixer_element_eqfx.arts b/arts/examples/mixer_element_eqfx.arts
index b7248fc..8bde0f6 100644
--- a/arts/examples/mixer_element_eqfx.arts
+++ b/arts/examples/mixer_element_eqfx.arts
@@ -4,7 +4,7 @@ module=Gui_SUB_PANEL
id=147
x=6
y=1
- port=parent
+ port=tqparent
{
id=148
connect_to=279
@@ -52,7 +52,7 @@ module=Gui_POTI
id=155
x=0
y=3
- port=parent
+ port=tqparent
{
id=156
connect_to=154
@@ -193,7 +193,7 @@ module=Gui_LABEL
id=182
x=13
y=4
- port=parent
+ port=tqparent
{
id=183
connect_to=154
@@ -313,7 +313,7 @@ module=Gui_POTI
id=205
x=14
y=9
- port=parent
+ port=tqparent
{
id=206
connect_to=154
@@ -365,7 +365,7 @@ module=Gui_POTI
id=215
x=14
y=11
- port=parent
+ port=tqparent
{
id=216
connect_to=154
@@ -417,7 +417,7 @@ module=Gui_POTI
id=225
x=14
y=7
- port=parent
+ port=tqparent
{
id=226
connect_to=154
@@ -469,7 +469,7 @@ module=Gui_POTI
id=235
x=14
y=13
- port=parent
+ port=tqparent
{
id=236
connect_to=154
@@ -521,7 +521,7 @@ module=Gui_POTI
id=245
x=14
y=15
- port=parent
+ port=tqparent
{
id=246
connect_to=154
@@ -573,7 +573,7 @@ module=Gui_POTI
id=255
x=14
y=17
- port=parent
+ port=tqparent
{
id=256
connect_to=154
@@ -722,7 +722,7 @@ structureport
}
structureport
{
- name=parent
+ name=tqparent
x=7
y=0
position=0
diff --git a/arts/examples/mixer_element_simple.arts b/arts/examples/mixer_element_simple.arts
index 0124609..be57201 100644
--- a/arts/examples/mixer_element_simple.arts
+++ b/arts/examples/mixer_element_simple.arts
@@ -8,7 +8,7 @@ module=Arts::Widget
{
id=1
}
- port=parent
+ port=tqparent
{
id=2
}
@@ -47,7 +47,7 @@ module=Arts::Poti
{
id=9
}
- port=parent
+ port=tqparent
{
id=10
}
@@ -218,7 +218,7 @@ structureport
}
structureport
{
- name=parent
+ name=tqparent
x=7
y=0
position=0
diff --git a/arts/examples/template_Instrument_GUI.arts b/arts/examples/template_Instrument_GUI.arts
index 67db385..751d4cc 100644
--- a/arts/examples/template_Instrument_GUI.arts
+++ b/arts/examples/template_Instrument_GUI.arts
@@ -8,7 +8,7 @@ module=Arts::Widget
{
id=1
}
- port=parent
+ port=tqparent
{
id=2
}
@@ -40,7 +40,7 @@ module=Arts::Widget
}
structureport
{
- name=parent
+ name=tqparent
x=2
y=1
position=0
diff --git a/arts/examples/template_Mixer_Element.arts b/arts/examples/template_Mixer_Element.arts
index 40c3e63..caa885e 100644
--- a/arts/examples/template_Mixer_Element.arts
+++ b/arts/examples/template_Mixer_Element.arts
@@ -4,7 +4,7 @@ module=Gui_SUB_PANEL
id=0
x=0
y=1
- port=parent
+ port=tqparent
{
id=1
connect_to=26
@@ -88,7 +88,7 @@ module=Gui_LABEL
id=17
x=6
y=4
- port=parent
+ port=tqparent
{
id=18
connect_to=7
@@ -158,7 +158,7 @@ structureport
}
structureport
{
- name=parent
+ name=tqparent
x=1
y=0
position=0
diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl
index a9a3950..2cf5b61 100644
--- a/arts/gui/common/artsgui.idl
+++ b/arts/gui/common/artsgui.idl
@@ -48,7 +48,7 @@ module Arts {
interface Widget {
readonly attribute long widgetID;
- attribute Widget parent;
+ attribute Widget tqparent;
attribute long x,y,width,height;
attribute boolean visible;
attribute SizePolicy hSizePolicy;
@@ -82,19 +82,19 @@ module Arts {
};
interface Frame : Widget {
- void constructor( Widget parent );
+ void constructor( Widget tqparent );
attribute long margin;
attribute long linewidth;
attribute long midlinewidth;
attribute long framestyle;
- attribute Shape frameshape;
+ attribute Shape frametqshape;
attribute Shadow frameshadow;
};
/**
- Some alignmentflags used by various widgets.
+ Some tqalignmentflags used by various widgets.
Taken from Qt. (akrille)
*/
enum Align {
@@ -117,8 +117,8 @@ module Arts {
/** The LayoutBox. - Arrange your widgets vertical or horizontal.
Usage is quite simple: Add the widgets you have in the right order
- to the layoutbox by calling addWidget().
- Thats it, no ._addChild or .parent with this widget.
+ to the tqlayoutbox by calling addWidget().
+ Thats it, no ._addChild or .tqparent with this widget.
For more information see QBoxLayout.
(akrille)
@@ -126,7 +126,7 @@ module Arts {
interface LayoutBox : Frame {
/// Sets the direction of the widgets. Can be changed on-the-fly.
attribute Direction direction;
- /// Adds a widget with the stretch-factor and the alignment.
+ /// Adds a widget with the stretch-factor and the tqalignment.
void addWidget( Widget widget, long stretch, long align );
void addWidget( Widget widget, long stretch );
void addWidget( Widget widget );
@@ -156,7 +156,7 @@ module Arts {
/// The spacing between all widgets.
attribute long spacing;
/// The margin at the outsideborder.
- attribute long layoutmargin;
+ attribute long tqlayoutmargin;
};
/** IMHO (akrille) this should be removed and everywhere replaced with the LayoutBox... */
@@ -173,7 +173,7 @@ module Arts {
Usage is quite simple: Create the Widget you want to be hidable inside
a container like LayoutBox or a normal widget. Then create the PopupBox
and call <Name_of_PopupBox>.widget( <Name_of_your_Container> ).
- Thats it, no ._addChild or .parent with this widget.
+ Thats it, no ._addChild or .tqparent with this widget.
(akrille)
*/
interface PopupBox : Frame {
@@ -186,8 +186,8 @@ module Arts {
};
interface Button : Widget {
- void constructor( Widget parent );
- void constructor( string text, Widget parent );
+ void constructor( Widget tqparent );
+ void constructor( string text, Widget tqparent );
attribute string text;
attribute boolean toggle;
@@ -205,7 +205,7 @@ module Arts {
};
interface Fader : Widget {
- void constructor( Widget parent );
+ void constructor( Widget tqparent );
attribute string caption, color;
attribute float min, max, value;
@@ -213,21 +213,21 @@ module Arts {
};
interface LineEdit : Widget {
- void constructor( Widget parent );
+ void constructor( Widget tqparent );
attribute string caption;
attribute string text;
};
interface SpinBox : Widget {
- void constructor( Widget parent );
+ void constructor( Widget tqparent );
attribute string caption;
attribute long min, max, value;
};
interface ComboBox : Widget {
- void constructor( Widget parent );
+ void constructor( Widget tqparent );
attribute string caption;
attribute sequence<string> choices;
@@ -235,7 +235,7 @@ module Arts {
};
interface Graph : Widget {
- void constructor( Widget parent );
+ void constructor( Widget tqparent );
attribute string caption;
attribute float minx, maxx, miny, maxy;
@@ -256,7 +256,7 @@ module Arts {
interface Label : Frame {
/// The text to show.
attribute string text;
- /// The alignment of the text. See enum Align
+ /// The tqalignment of the text. See enum Align
attribute long align;
/// Fontsize [pixel]
/*writeonly*/ attribute long fontsize;
diff --git a/arts/gui/kde/artstestgui.cpp b/arts/gui/kde/artstestgui.cpp
index 6d1b798..9464ac7 100644
--- a/arts/gui/kde/artstestgui.cpp
+++ b/arts/gui/kde/artstestgui.cpp
@@ -31,7 +31,7 @@ using namespace Arts;
int main(int argc, char **argv)
{
- QIOManager iomanager;
+ TQIOManager iomanager;
Dispatcher dispatcher(&iomanager);
KApplication application(argc, argv, "testgui");
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
w.width(500); w.height(350); w.show();
Button b;
- b.parent(w);
+ b.tqparent(w);
b.x(10);
b.y(10);
b.width(100);
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
b.show();
Button b2;
- b2.parent(w);
+ b2.tqparent(w);
b2.x(10);
b2.y(30);
b2.width(100);
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
b2.show();
Poti p;
- p.parent(w);
+ p.tqparent(w);
p.x(150);
p.y(10);
p.caption("delay (ms)");
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
p.show();
Poti q;
- q.parent(w);
+ q.tqparent(w);
q.x(250);
q.y(10);
q.caption("delay (ms)");
@@ -81,7 +81,7 @@ int main(int argc, char **argv)
q.show();
Graph g;
- g.parent(w);
+ g.tqparent(w);
g.x(50);
g.y(70);
g.width(400);
diff --git a/arts/gui/kde/dbtest.h b/arts/gui/kde/dbtest.h
index 085ee7a..2316397 100644
--- a/arts/gui/kde/dbtest.h
+++ b/arts/gui/kde/dbtest.h
@@ -8,6 +8,7 @@
class dBTestWidget : public TQWidget, public dB2VolCalc {
Q_OBJECT
+ TQ_OBJECT
public:
dBTestWidget( TQWidget*, const char* =0 );
~dBTestWidget();
diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp
index dde6182..5188e81 100644
--- a/arts/gui/kde/kartswidget.cpp
+++ b/arts/gui/kde/kartswidget.cpp
@@ -28,43 +28,43 @@
class KArtsWidgetPrivate {
public:
- TQHBoxLayout *layout;
+ TQHBoxLayout *tqlayout;
};
-KArtsWidget::KArtsWidget( TQWidget* parent, const char* name )
- :TQWidget( parent, name ), _content( Arts::Widget::null() )
+KArtsWidget::KArtsWidget( TQWidget* tqparent, const char* name )
+ :TQWidget( tqparent, name ), _content( Arts::Widget::null() )
{
d = new KArtsWidgetPrivate;
- d->layout = new TQHBoxLayout(this);
+ d->tqlayout = new TQHBoxLayout(this);
}
-KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name )
- :TQWidget( parent, name ), _content( Arts::Widget::null())
+KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name )
+ :TQWidget( tqparent, name ), _content( Arts::Widget::null())
{
d = new KArtsWidgetPrivate;
- d->layout = new TQHBoxLayout(this);
+ d->tqlayout = new TQHBoxLayout(this);
setContent(content);
}
-KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name, WFlags wflags )
- :TQWidget( parent, name, wflags ), _content( Arts::Widget::null() )
+KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name, WFlags wflags )
+ :TQWidget( tqparent, name, wflags ), _content( Arts::Widget::null() )
{
d = new KArtsWidgetPrivate;
- d->layout = new TQHBoxLayout( this );
+ d->tqlayout = new TQHBoxLayout( this );
setContent( content );
}
-KArtsWidget::KArtsWidget(TQWidget* parent, const char* name, WFlags wflags )
- :TQWidget(parent, name, wflags ), _content(Arts::Widget::null())
+KArtsWidget::KArtsWidget(TQWidget* tqparent, const char* name, WFlags wflags )
+ :TQWidget(tqparent, name, wflags ), _content(Arts::Widget::null())
{
d = new KArtsWidgetPrivate;
- d->layout = new TQHBoxLayout(this);
+ d->tqlayout = new TQHBoxLayout(this);
}
KArtsWidget::~KArtsWidget()
{
TQWidget *contentAsWidget
- = KWidgetRepo::the()->lookupQWidget(_content.widgetID());
+ = KWidgetRepo::the()->lookupTQWidget(_content.widgetID());
contentAsWidget->reparent(0,TQPoint(0,0),_content.visible());
delete d;
d = 0;
@@ -75,12 +75,12 @@ void KArtsWidget::setContent(Arts::Widget content)
{
arts_return_if_fail(!content.isNull());
TQWidget *contentAsWidget
- = KWidgetRepo::the()->lookupQWidget(content.widgetID());
+ = KWidgetRepo::the()->lookupTQWidget(content.widgetID());
arts_return_if_fail(contentAsWidget != 0);
_content = content;
contentAsWidget->reparent(this,TQPoint(0,0),content.visible());
- d->layout->addWidget(contentAsWidget);
+ d->tqlayout->addWidget(contentAsWidget);
}
Arts::Widget KArtsWidget::content()
diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h
index 2cd072b..7e745bf 100644
--- a/arts/gui/kde/kartswidget.h
+++ b/arts/gui/kde/kartswidget.h
@@ -31,17 +31,17 @@ class KArtsWidgetPrivate;
/**
* KArtsWidget provides a simple way to treat Arts::Widget classes like
- * native Qt widgets. Suppose you use Qt, and want to put an Arts::Widget
- * type into a layout, you can do so using this code
+ * native TQt widgets. Suppose you use TQt, and want to put an Arts::Widget
+ * type into a tqlayout, you can do so using this code
*
* <pre>
* Arts::Widget widget = ...get widget from somewhere...;
* KArtsWidget *w = new KArtsWidget(widget, this);
- * layout->addWidget(w);
+ * tqlayout->addWidget(w);
* </pre>
*
- * In line 2 of the code, the "this" is the parent widget (which is usually
- * this in Qt code).
+ * In line 2 of the code, the "this" is the tqparent widget (which is usually
+ * this in TQt code).
*
* The KArtsWidget class keeps a reference to the content widget, so the
* content widget will not be freed until the KArtsWidget gets destroyed.
@@ -57,12 +57,12 @@ public:
/**
* creates a new KArtsWidget
*/
- KArtsWidget( TQWidget* parent, const char* name );
+ KArtsWidget( TQWidget* tqparent, const char* name );
/**
* creates a new KArtsWidget and sets the content to an Arts::Widget
*/
- KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name );
+ KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name );
/**
* creates a new KArtsWidget with WidgetFlags and content
diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp
index 34c5791..95f7699 100644
--- a/arts/gui/kde/kbutton_impl.cpp
+++ b/arts/gui/kde/kbutton_impl.cpp
@@ -72,12 +72,12 @@ KButton_impl::KButton_impl( TQPushButton * widget )
void KButton_impl::constructor( Widget p )
{
- parent( p );
+ tqparent( p );
}
void KButton_impl::constructor( const string & t, Widget p )
{
- parent( p );
+ tqparent( p );
text( t );
}
diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h
index 723c502..4db27c8 100644
--- a/arts/gui/kde/kbutton_impl.h
+++ b/arts/gui/kde/kbutton_impl.h
@@ -32,6 +32,7 @@ namespace Arts {
class KButton_impl;
class KButtonMapper : public TQObject {
Q_OBJECT
+ TQ_OBJECT
KButton_impl *impl;
TQPushButton * button;
public:
@@ -54,7 +55,7 @@ protected:
public:
KButton_impl( TQPushButton * w = 0 );
- void constructor( Widget parent );
+ void constructor( Widget tqparent );
void constructor( const std::string &, Widget );
void emitClicked();
diff --git a/arts/gui/kde/kcombobox_impl.cpp b/arts/gui/kde/kcombobox_impl.cpp
index eab55d0..58c401c 100644
--- a/arts/gui/kde/kcombobox_impl.cpp
+++ b/arts/gui/kde/kcombobox_impl.cpp
@@ -31,7 +31,7 @@ using namespace Arts;
using namespace std;
ComboBoxIntMapper::ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co)
- : TQObject( co, "map Qt signal to aRts" )
+ : TQObject( co, "map TQt signal to aRts" )
,impl(impl)
{
connect(co, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(activated(const TQString &)));
diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h
index 3041d35..ad8e573 100644
--- a/arts/gui/kde/kcombobox_impl.h
+++ b/arts/gui/kde/kcombobox_impl.h
@@ -36,6 +36,7 @@ namespace Arts {
class KComboBox_impl;
class ComboBoxIntMapper :public TQObject {
Q_OBJECT
+ TQ_OBJECT
KComboBox_impl *impl;
public:
ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co);
@@ -56,7 +57,7 @@ protected:
public:
KComboBox_impl( KComboBox * w = 0 );
- void constructor( Widget p ) { parent( p ); }
+ void constructor( Widget p ) { tqparent( p ); }
std::string caption();
void caption(const std::string & newCaption);
diff --git a/arts/gui/kde/kfader.cpp b/arts/gui/kde/kfader.cpp
index e5179f9..239d303 100644
--- a/arts/gui/kde/kfader.cpp
+++ b/arts/gui/kde/kfader.cpp
@@ -5,14 +5,14 @@ void KFader::init()
{
}
-KFader::KFader( TQWidget * parent, const char * name )
- : TQSlider( Qt::Vertical, parent, name )
+KFader::KFader( TQWidget * tqparent, const char * name )
+ : TQSlider( Qt::Vertical, tqparent, name )
{
init();
}
-KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent, const char * name )
- : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, parent, name )
+KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent, const char * name )
+ : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, tqparent, name )
{
init();
}
diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h
index 603ad7c..33df0d4 100644
--- a/arts/gui/kde/kfader.h
+++ b/arts/gui/kde/kfader.h
@@ -25,14 +25,15 @@
#include <tqslider.h>
-class KFader : public QSlider
+class KFader : public TQSlider
{
Q_OBJECT
+ TQ_OBJECT
protected:
void init();
public:
- KFader( TQWidget * parent = 0, const char * name = 0 );
- KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent = 0, const char * name = 0 );
+ KFader( TQWidget * tqparent = 0, const char * name = 0 );
+ KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent = 0, const char * name = 0 );
virtual ~KFader();
diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h
index 0d1b81e..e15695f 100644
--- a/arts/gui/kde/kfader_impl.h
+++ b/arts/gui/kde/kfader_impl.h
@@ -37,6 +37,7 @@ class KFader_impl;
class FaderIntMapper :public TQObject {
Q_OBJECT
+ TQ_OBJECT
KFader_impl *impl;
public:
FaderIntMapper(KFader_impl *impl, KFader *kp);
@@ -62,7 +63,7 @@ protected:
public:
KFader_impl( KFader * w = 0 );
- void constructor( Widget p ) { parent( p ); }
+ void constructor( Widget p ) { tqparent( p ); }
std::string caption();
void caption(const std::string& newText);
diff --git a/arts/gui/kde/kframe_impl.cpp b/arts/gui/kde/kframe_impl.cpp
index d95da54..478d8ec 100644
--- a/arts/gui/kde/kframe_impl.cpp
+++ b/arts/gui/kde/kframe_impl.cpp
@@ -73,12 +73,12 @@ void KFrame_impl::framestyle( long fs )
_qframe->setFrameStyle( fs );
}
-Shape KFrame_impl::frameshape()
+Shape KFrame_impl::frametqshape()
{
return ( Shape )_qframe->frameShape();
}
-void KFrame_impl::frameshape( Shape fs )
+void KFrame_impl::frametqshape( Shape fs )
{
_qframe->setFrameShape( ( TQFrame::Shape )fs );
}
diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h
index febc005..ae2e79a 100644
--- a/arts/gui/kde/kframe_impl.h
+++ b/arts/gui/kde/kframe_impl.h
@@ -34,7 +34,7 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
public:
KFrame_impl( TQFrame * widget = 0 );
- inline void constructor( Widget p ) { parent( p ); }
+ inline void constructor( Widget p ) { tqparent( p ); }
long margin();
void margin( long m );
@@ -44,8 +44,8 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
void midlinewidth( long mlw );
long framestyle();
void framestyle( long fs );
- Shape frameshape();
- void frameshape( Shape fs );
+ Shape frametqshape();
+ void frametqshape( Shape fs );
Shadow frameshadow();
void frameshadow( Shadow fs );
}; //class
diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp
index 21d3d8c..96d18c5 100644
--- a/arts/gui/kde/kgraph.cpp
+++ b/arts/gui/kde/kgraph.cpp
@@ -31,8 +31,8 @@
using namespace Arts;
using namespace std;
-KGraph::KGraph( TQWidget * parent, const char * name )
- : TQWidget( parent, name )
+KGraph::KGraph( TQWidget * tqparent, const char * name )
+ : TQWidget( tqparent, name )
{
setBackgroundColor(white);
@@ -52,7 +52,7 @@ void KGraph::addLine(Arts::KGraphLine_impl *line)
void KGraph::redrawLine(Arts::KGraphLine_impl * /*line*/)
{
- repaint();
+ tqrepaint();
}
void KGraph::removeLine(Arts::KGraphLine_impl *line)
@@ -111,7 +111,7 @@ void KGraph::paintEvent( TQPaintEvent *e )
void KGraph::mousePressEvent(TQMouseEvent *e)
{
- if(e->button() == LeftButton || e->button() == RightButton)
+ if(e->button() == Qt::LeftButton || e->button() == Qt::RightButton)
{
std::list<KGraphLine_impl *>::iterator li;
for(li = lines.begin(); li != lines.end(); li++)
@@ -140,7 +140,7 @@ void KGraph::mousePressEvent(TQMouseEvent *e)
if(selectedIndex >= 0)
{
// erase point
- if(e->button() == RightButton)
+ if(e->button() == Qt::RightButton)
{
if(selectedIndex != 0 && selectedIndex != (( int )( selectedLine->_points.size() )-1))
{
@@ -159,7 +159,7 @@ void KGraph::mousePressEvent(TQMouseEvent *e)
selectedIndex = -1;
}
}
- else if(e->button() == LeftButton)
+ else if(e->button() == Qt::LeftButton)
{
// try to insert a point
std::list<KGraphLine_impl *>::iterator li;
diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h
index 83c1aa7..e9f772f 100644
--- a/arts/gui/kde/kgraph.h
+++ b/arts/gui/kde/kgraph.h
@@ -31,9 +31,10 @@
namespace Arts {
class KGraphLine_impl;
-class KGraph : public QWidget
+class KGraph : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
protected:
std::list<KGraphLine_impl *> lines;
@@ -46,7 +47,7 @@ protected:
inline GraphPoint q2gPoint(const TQPoint &qp);
inline TQPoint g2qPoint(const GraphPoint &gp);
public:
- KGraph( TQWidget * parent = 0, const char * name = 0 );
+ KGraph( TQWidget * tqparent = 0, const char * name = 0 );
virtual ~KGraph();
void addLine(Arts::KGraphLine_impl *line);
diff --git a/arts/gui/kde/kgraph_impl.h b/arts/gui/kde/kgraph_impl.h
index 408ad96..2a60320 100644
--- a/arts/gui/kde/kgraph_impl.h
+++ b/arts/gui/kde/kgraph_impl.h
@@ -44,7 +44,7 @@ protected:
public:
KGraph_impl( KGraph * w = 0 );
- void constructor( Widget p ) { parent( p ); }
+ void constructor( Widget p ) { tqparent( p ); }
std::string caption();
void caption(const std::string& newCaption);
diff --git a/arts/gui/kde/kgraphline_impl.cpp b/arts/gui/kde/kgraphline_impl.cpp
index ccb6ed1..9fcd450 100644
--- a/arts/gui/kde/kgraphline_impl.cpp
+++ b/arts/gui/kde/kgraphline_impl.cpp
@@ -112,7 +112,7 @@ void KGraphLine_impl::points(const vector<GraphPoint>& newPoints)
KGraph *KGraphLine_impl::getKGraph()
{
- TQWidget *widget = KWidgetRepo::the()->lookupQWidget(_graphID);
+ TQWidget *widget = KWidgetRepo::the()->lookupTQWidget(_graphID);
if(!widget)
return 0;
diff --git a/arts/gui/kde/klabel_impl.cpp b/arts/gui/kde/klabel_impl.cpp
index dd0a955..e6a008c 100644
--- a/arts/gui/kde/klabel_impl.cpp
+++ b/arts/gui/kde/klabel_impl.cpp
@@ -92,13 +92,13 @@ void RotateLabel::title( TQString n ) {
void RotateLabel::align( long n ) {
_align=n;
- repaint();
+ tqrepaint();
}
void RotateLabel::bottom( Arts::TextBottom bottom ) {
_bottom = bottom;
title( _title );
- repaint();
+ tqrepaint();
}
// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h
index 7822e96..8b78bed 100644
--- a/arts/gui/kde/klabel_impl.h
+++ b/arts/gui/kde/klabel_impl.h
@@ -42,7 +42,7 @@ protected:
RotateLabel* _label;
public:
KLabel_impl( TQFrame* w=0 );
- void constructor( Widget p ) { parent( p ); }
+ void constructor( Widget p ) { tqparent( p ); }
std::string text();
void text( const std::string& newtext );
@@ -65,6 +65,7 @@ public:
class RotateLabel : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
public:
RotateLabel( TQWidget*, const char* =0 );
void paintEvent( TQPaintEvent* );
diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp
index 847e803..e94ed1e 100644
--- a/arts/gui/kde/klayoutbox_impl.cpp
+++ b/arts/gui/kde/klayoutbox_impl.cpp
@@ -40,16 +40,16 @@ KLayoutBox_impl::~KLayoutBox_impl() {
}
void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) {
- widget.parent( self() );
- this->_addChild( widget, "layoutbox_item" );
- TQWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() );
+ widget.tqparent( self() );
+ this->_addChild( widget, "tqlayoutbox_item" );
+ TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() );
_layout->addWidget( tmp, stretch, align );
}
void KLayoutBox_impl::insertWidget( long index, Arts::Widget widget, long stretch, long align ) {
- widget.parent( self() );
- this->_addChild( widget, "layoutbox_item" );
- TQWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() );
+ widget.tqparent( self() );
+ this->_addChild( widget, "tqlayoutbox_item" );
+ TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() );
_layout->insertWidget( index, tmp, stretch, align );
}
@@ -66,8 +66,8 @@ void KLayoutBox_impl::addLine( long width, long space, long stretch, long align
long KLayoutBox_impl::spacing() { return _layout->spacing(); }
void KLayoutBox_impl::spacing( long n ) { _layout->setSpacing( n ); }
-long KLayoutBox_impl::layoutmargin() { return _layout->margin(); }
-void KLayoutBox_impl::layoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); }
+long KLayoutBox_impl::tqlayoutmargin() { return _layout->margin(); }
+void KLayoutBox_impl::tqlayoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); }
Direction KLayoutBox_impl::direction() { return Arts::Direction( _layout->direction() ); }
void KLayoutBox_impl::direction( Direction d ) { _layout->setDirection( TQBoxLayout::Direction( d ) ); }
@@ -85,11 +85,11 @@ void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) {
TQPainter p( this );
TQStyle::SFlags flags = TQStyle::Style_Default;
if ( width() < height() ) flags |= TQStyle::Style_Horizontal;
- style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags );
+ tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), flags );
}
-TQSize KLayoutBox_Separator::minimumSizeHint() const {
- int wh = style().pixelMetric( TQStyle::PM_SplitterWidth, this );
+TQSize KLayoutBox_Separator::tqminimumSizeHint() const {
+ int wh = tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth, this );
return TQSize( wh, wh );
}
@@ -105,12 +105,12 @@ KLayoutBox_Line::KLayoutBox_Line( int width, int space, TQWidget* p, const char*
void KLayoutBox_Line::paintEvent( TQPaintEvent* ) {
//kdDebug() << k_funcinfo << size() << endl;
TQPainter p( this );
- p.setPen( TQPen( colorGroup().foreground(), _width ) );
+ p.setPen( TQPen( tqcolorGroup().foreground(), _width ) );
if ( width() > height() ) p.drawLine( 0, height()/2, width(), height()/2 );
else p.drawLine( width()/2, 0, width()/2, height() );
}
-TQSize KLayoutBox_Line::minimumSizeHint() const {
+TQSize KLayoutBox_Line::tqminimumSizeHint() const {
//kdDebug() << k_funcinfo << size() << endl;
int wh = _width + 2* _space;
return TQSize( wh, wh );
diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h
index bb5302e..a8272fe 100644
--- a/arts/gui/kde/klayoutbox_impl.h
+++ b/arts/gui/kde/klayoutbox_impl.h
@@ -72,29 +72,31 @@ public:
long spacing();
void spacing( long );
- long layoutmargin();
- void layoutmargin( long );
+ long tqlayoutmargin();
+ void tqlayoutmargin( long );
}; // class
} // namespace
class KDE_EXPORT KLayoutBox_Separator : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
KLayoutBox_Separator( TQWidget*, const char* =0 );
void resizeEvent( TQResizeEvent* );
void paintEvent( TQPaintEvent* );
- TQSize minimumSizeHint() const;
+ TQSize tqminimumSizeHint() const;
};
class KLayoutBox_Line : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
private:
int _width, _space;
public:
KLayoutBox_Line( int, int, TQWidget*, const char* =0 );
void paintEvent( TQPaintEvent* );
- TQSize minimumSizeHint() const;
+ TQSize tqminimumSizeHint() const;
};
#endif
diff --git a/arts/gui/kde/klevelmeter_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp
index 9a78804..ffb99c3 100644
--- a/arts/gui/kde/klevelmeter_firebars.cpp
+++ b/arts/gui/kde/klevelmeter_firebars.cpp
@@ -59,8 +59,8 @@ kdDebug() << k_funcinfo << dir << endl;
p.end();
}
-KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) {
-//kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
+KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) {
+//kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
this->setMinimumSize( 5, 5 );
_bar = new KLevelMeter_FireBars_private( this, 0 );
_peakwidget = new TQWidget( this );
@@ -91,7 +91,7 @@ void KLevelMeter_FireBars::invalue( float n, float p ) {
_bar->setGeometry( int( this->width()-_value*this->width() ), 0, this->width(), this->height() );
break;
}
- repaint();
+ tqrepaint();
}
void KLevelMeter_FireBars::paintEvent( TQPaintEvent* ) {
diff --git a/arts/gui/kde/klevelmeter_firebars.h b/arts/gui/kde/klevelmeter_firebars.h
index da74096..4313004 100644
--- a/arts/gui/kde/klevelmeter_firebars.h
+++ b/arts/gui/kde/klevelmeter_firebars.h
@@ -28,6 +28,7 @@ class KLevelMeter_FireBars;
class KLevelMeter_FireBars_private : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
KLevelMeter_FireBars_private( KLevelMeter_FireBars*, const char* );
void paintEvent( TQPaintEvent* );
@@ -40,6 +41,7 @@ private:
class KLevelMeter_FireBars : public KLevelMeter_Template {
Q_OBJECT
+ TQ_OBJECT
public:
KLevelMeter_FireBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp
index 418108a..b6845dc 100644
--- a/arts/gui/kde/klevelmeter_impl.cpp
+++ b/arts/gui/kde/klevelmeter_impl.cpp
@@ -41,8 +41,8 @@
using namespace Arts;
using namespace std;
-KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* parent, const char* name )
- : TQObject( parent, name )
+KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
, _impl( impl )
, _frame( frame )
, _levelmeter( 0 )
diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp
index 6d63a18..5d8b4b3 100644
--- a/arts/gui/kde/klevelmeter_linebars.cpp
+++ b/arts/gui/kde/klevelmeter_linebars.cpp
@@ -24,21 +24,21 @@
#include <tqpainter.h>
#include <tqpixmap.h>
-KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax )
+KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax )
, _value( 0.0 )
, _peak( 0.0 )
{
-//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
+//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
this->setMinimumSize( 5, 5 );
this->substyle( substyle );
- _stdcolors = colorGroup();
- setBackgroundMode( Qt::NoBackground );
+ _stdcolors = tqcolorGroup();
+ setBackgroundMode( TQt::NoBackground );
}
void KLevelMeter_LineBars::invalue( float n, float p ) {
_value = amptondb( n );
_peak = amptondb( p );
- repaint();
+ tqrepaint();
}
void KLevelMeter_LineBars::substyle( long n ) {
@@ -73,7 +73,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) {
else
p.setBrush( ( _peak<1 )?color( _value ):TQColor( 255,0,0 ) );
- TQColor bgcolor = ( _substyle & 2 ) ? p.brush().color().dark() : _stdcolors.background();
+ TQColor bgcolor = ( _substyle & 2 ) ? p.brush().color().dark() : TQColor(_stdcolors.background());
pm.fill( bgcolor );
p.setPen( NoPen );
@@ -94,7 +94,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) {
p.drawLine( 0, top, w, top );
}
- bitBlt( this, 0, 0, &pm, 0, 0, pm.width(), pm.height(), CopyROP, true );
+ bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&pm), 0, 0, pm.width(), pm.height(), CopyROP, true );
}
/**
diff --git a/arts/gui/kde/klevelmeter_linebars.h b/arts/gui/kde/klevelmeter_linebars.h
index cf0c421..996b2c6 100644
--- a/arts/gui/kde/klevelmeter_linebars.h
+++ b/arts/gui/kde/klevelmeter_linebars.h
@@ -25,6 +25,7 @@
class KLevelMeter_LineBars : public KLevelMeter_Template {
Q_OBJECT
+ TQ_OBJECT
public:
KLevelMeter_LineBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
diff --git a/arts/gui/kde/klevelmeter_normalbars.cpp b/arts/gui/kde/klevelmeter_normalbars.cpp
index 2959355..9263737 100644
--- a/arts/gui/kde/klevelmeter_normalbars.cpp
+++ b/arts/gui/kde/klevelmeter_normalbars.cpp
@@ -24,8 +24,8 @@
#include <tqpainter.h>
#include <tqlayout.h>
-KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) {
-//kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
+KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) {
+//kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
_layout = new TQBoxLayout( this, TQBoxLayout::BottomToTop );
}
diff --git a/arts/gui/kde/klevelmeter_normalbars.h b/arts/gui/kde/klevelmeter_normalbars.h
index b0e1c81..b141f2f 100644
--- a/arts/gui/kde/klevelmeter_normalbars.h
+++ b/arts/gui/kde/klevelmeter_normalbars.h
@@ -30,6 +30,7 @@ class TQBoxLayout;
class KLevelMeter_NormalBars : public KLevelMeter_Template {
Q_OBJECT
+ TQ_OBJECT
public:
KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
@@ -48,12 +49,13 @@ private:
class Bar : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
private:
float _min, _max;
TQColor _color;
bool _on;
public:
- Bar( float min, float max, TQColor color, TQWidget* parent ) : TQWidget( parent ), _min( min ), _max( max ), _color( color ), _on( false ) {
+ Bar( float min, float max, TQColor color, TQWidget* tqparent ) : TQWidget( tqparent ), _min( min ), _max( max ), _color( color ), _on( false ) {
setBackgroundColor( _color.dark() );
}
void setValue( float n ) {
diff --git a/arts/gui/kde/klevelmeter_private.h b/arts/gui/kde/klevelmeter_private.h
index 213ade3..6c49c4c 100644
--- a/arts/gui/kde/klevelmeter_private.h
+++ b/arts/gui/kde/klevelmeter_private.h
@@ -31,6 +31,7 @@ class KArtsWidget;
class KLevelMeter_Private : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
Arts::KLevelMeter_impl* _impl;
TQFrame* _frame;
diff --git a/arts/gui/kde/klevelmeter_small.cpp b/arts/gui/kde/klevelmeter_small.cpp
index c74dfa4..3c07bc6 100644
--- a/arts/gui/kde/klevelmeter_small.cpp
+++ b/arts/gui/kde/klevelmeter_small.cpp
@@ -23,8 +23,8 @@
#include <kdebug.h>
#include <tqpainter.h>
-KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) {
-//kdDebug()<<"KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
+KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) {
+//kdDebug()<<"KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
}
void KLevelMeter_Small::invalue( float n, float p ) {
diff --git a/arts/gui/kde/klevelmeter_small.h b/arts/gui/kde/klevelmeter_small.h
index 1c2c20e..34d0080 100644
--- a/arts/gui/kde/klevelmeter_small.h
+++ b/arts/gui/kde/klevelmeter_small.h
@@ -25,6 +25,7 @@
class KLevelMeter_Small : public KLevelMeter_Template {
Q_OBJECT
+ TQ_OBJECT
public:
KLevelMeter_Small( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
diff --git a/arts/gui/kde/klevelmeter_template.h b/arts/gui/kde/klevelmeter_template.h
index c822be4..e7f3e10 100644
--- a/arts/gui/kde/klevelmeter_template.h
+++ b/arts/gui/kde/klevelmeter_template.h
@@ -31,6 +31,7 @@
class KLevelMeter_Template : public TQWidget, public dB2VolCalc {
Q_OBJECT
+ TQ_OBJECT
public:
Arts::KLevelMeter_impl* _impl;
diff --git a/arts/gui/kde/klineedit_impl.h b/arts/gui/kde/klineedit_impl.h
index 2bd6b69..12ab753 100644
--- a/arts/gui/kde/klineedit_impl.h
+++ b/arts/gui/kde/klineedit_impl.h
@@ -38,7 +38,7 @@ protected:
public:
KLineEdit_impl( KLineEdit * w = 0 );
- void constructor( Widget p ) { parent( p ); }
+ void constructor( Widget p ) { tqparent( p ); }
std::string caption();
void caption(const std::string& newCaption);
@@ -49,6 +49,7 @@ public:
class KLineEditStringMapper :public TQObject {
Q_OBJECT
+ TQ_OBJECT
KLineEdit_impl *impl;
public:
KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ed);
diff --git a/arts/gui/kde/kpopupbox_impl.cpp b/arts/gui/kde/kpopupbox_impl.cpp
index 23de74f..5438d13 100644
--- a/arts/gui/kde/kpopupbox_impl.cpp
+++ b/arts/gui/kde/kpopupbox_impl.cpp
@@ -43,7 +43,7 @@ Direction KPopupBox_impl::direction() { return _widget->direction(); }
void KPopupBox_impl::direction( Direction n ) { _widget->direction( n ); }
void KPopupBox_impl::widget( Arts::Widget widget ) {
- widget.parent( self() );
+ widget.tqparent( self() );
this->_addChild( widget, "PopupBox_child" );
_widget->setWidget( widget );
}
@@ -54,14 +54,14 @@ void KPopupBox_impl::name( const std::string& n ) { _name = ""; _name = n; _widg
// Following the private class:
-KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFrame( parent,name )
+KPopupBox_widget::KPopupBox_widget( TQWidget *tqparent, const char* name ) : TQFrame( tqparent,name )
{
this->setFrameShape( TQFrame::Box );
this->setMargin( 1 ); this->setLineWidth( 1 );
_titlebar = new TQFrame( this );
- _titlebarlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop );
- _titlebarlayout->setAutoAdd( true );
+ _titlebartqlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop );
+ _titlebartqlayout->setAutoAdd( true );
_showbutton = new ShowButton( _titlebar );
connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) );
@@ -90,13 +90,13 @@ void KPopupBox_widget::direction( Arts::Direction n ) {
switch( n ) {
case LeftToRight:
case RightToLeft:
- _titlebarlayout->setDirection( TQBoxLayout::BottomToTop );
+ _titlebartqlayout->setDirection( TQBoxLayout::BottomToTop );
_drag->setMinimumHeight( 30 );
_drag->setMinimumWidth( 0 );
break;
case TopToBottom:
case BottomToTop:
- _titlebarlayout->setDirection( TQBoxLayout::RightToLeft );
+ _titlebartqlayout->setDirection( TQBoxLayout::RightToLeft );
_drag->setMinimumHeight( 0 );
_drag->setMinimumWidth( 30 );
}
diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h
index 8fb25be..06a58eb 100644
--- a/arts/gui/kde/kpopupbox_private.h
+++ b/arts/gui/kde/kpopupbox_private.h
@@ -32,9 +32,10 @@ class TQBoxLayout;
#include <tqframe.h>
-class KPopupBox_widget : public QFrame
+class KPopupBox_widget : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
KPopupBox_widget( TQWidget* =0, const char* =0);
~KPopupBox_widget();
@@ -53,7 +54,7 @@ private:
TQBoxLayout *_layout;
TQFrame *_titlebar;
- TQBoxLayout *_titlebarlayout;
+ TQBoxLayout *_titlebartqlayout;
HandleDrag *_drag;
ShowButton *_showbutton;
OwnButton *_ownbutton;
@@ -65,6 +66,7 @@ private:
/*class KPopupBoxEventMapper : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
KPopupBoxEventMapper( KPopupBox_widget *widget, Arts::KPopupBox_impl *impl )
: TQObject( widget,"" ), _widget( widget ), _impl( impl )
@@ -79,13 +81,14 @@ private:
class HandleDrag : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
- HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {}
+ HandleDrag( TQWidget *tqparent, const char* name=0 ) : TQWidget( tqparent,name ) {}
void paintEvent( TQPaintEvent * ) {
TQPainter p( this );
TQStyle::SFlags flags = TQStyle::Style_Default;
if( width() < height() ) flags |= TQStyle::Style_Horizontal;
- style().drawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags );
+ tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), tqcolorGroup(), flags );
}
signals:
void clicked();
@@ -108,11 +111,12 @@ static const char* const own_xpm[] = { "5 5 2 1", "# c black", ". c None", "#
class ShowButton : public TQPushButton {
Q_OBJECT
+ TQ_OBJECT
private:
TQBoxLayout::Direction _dir;
TQPixmap _pmleft, _pmright, _pmup, _pmdown;
public:
- ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight )
+ ShowButton( TQWidget *tqparent, const char* name=0 ) : TQPushButton( tqparent,name ), _dir( TQBoxLayout::LeftToRight )
{
connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) );
setToggleButton( true );
@@ -147,27 +151,28 @@ public slots:
}
}
public:
- TQSize minimumSizeHint() const {
- int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+ TQSize tqminimumSizeHint() const {
+ int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
return TQSize( wh, wh );
}
TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); }
- TQSize minimumSize() const { return minimumSizeHint(); }
- TQSize sizeHint() const { return minimumSize(); }
+ TQSize tqminimumSize() const { return tqminimumSizeHint(); }
+ TQSize tqsizeHint() const { return tqminimumSize(); }
void drawButton( TQPainter * p )
{
- p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
+ p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() );
}
};
class OwnButton : public TQPushButton {
Q_OBJECT
+ TQ_OBJECT
private:
TQPixmap _pmown, _pminside;
public:
- OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name )
+ OwnButton( TQWidget *tqparent, const char* name=0 ) : TQPushButton( tqparent,name )
{
connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) );
setToggleButton( true );
@@ -182,17 +187,17 @@ public slots:
else setPixmap( _pmown );
}
public:
- TQSize minimumSizeHint() const {
- int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+ TQSize tqminimumSizeHint() const {
+ int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
return TQSize( wh, wh );
}
TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); }
- TQSize minimumSize() const { return minimumSizeHint(); }
- TQSize sizeHint() const { return minimumSize(); }
+ TQSize tqminimumSize() const { return tqminimumSizeHint(); }
+ TQSize tqsizeHint() const { return tqminimumSize(); }
void drawButton( TQPainter * p )
{
- p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
+ p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() );
}
};
@@ -202,6 +207,7 @@ public:
class OwnWidget : public KArtsWidget
{
Q_OBJECT
+ TQ_OBJECT
ShowButton *_b;
public:
OwnWidget( ShowButton* b, TQWidget* p, const char* n=0, WFlags f=0 ) : KArtsWidget( p,n,f ) { _b = b; }
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index 462d640..dd4e484 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -53,28 +53,28 @@ struct KPoti::KPotiPrivate
bool bgDirty;
KPixmap bgdb;
- KPixmap bgPixmap( const TQColorGroup & colorGroup )
+ KPixmap bgPixmap( const TQColorGroup & tqcolorGroup )
{
if( bgDirty || bgdb.isNull() )
{
bgdb.resize( buttonRect.size() );
TQPainter dbp( &bgdb );
- dbp.setPen( Qt::NoPen );
+ dbp.setPen( TQt::NoPen );
TQRect drawRect = bgdb.rect();
- // create mask
- TQBitmap mask( bgdb.size(), true );
- TQPainter maskpainter( &mask );
- maskpainter.setPen( Qt::NoPen );
- maskpainter.setBrush( Qt::color1 );
- maskpainter.drawEllipse( drawRect );
- maskpainter.end();
- bgdb.setMask( mask );
+ // create tqmask
+ TQBitmap tqmask( bgdb.size(), true );
+ TQPainter tqmaskpainter( &tqmask );
+ tqmaskpainter.setPen( TQt::NoPen );
+ tqmaskpainter.setBrush( TQt::color1 );
+ tqmaskpainter.drawEllipse( drawRect );
+ tqmaskpainter.end();
+ bgdb.setMask( tqmask );
// inset shadow
KPixmap gradient( bgdb.size() );
- KPixmapEffect::gradient( gradient, colorGroup.light(), colorGroup.dark(), KPixmapEffect::DiagonalGradient );
- dbp.setBrush( TQBrush( colorGroup.button(), gradient ) );
+ KPixmapEffect::gradient( gradient, tqcolorGroup.light(), tqcolorGroup.dark(), KPixmapEffect::DiagonalGradient );
+ dbp.setBrush( TQBrush( tqcolorGroup.button(), gradient ) );
dbp.drawEllipse( drawRect );
potiRect.setSize( drawRect.size() * 0.9 );
@@ -99,17 +99,17 @@ struct KPoti::KPotiPrivate
{
potidb.resize( potiRect.size() );
TQPainter dbp( &potidb );
- dbp.setPen( Qt::NoPen );
+ dbp.setPen( TQt::NoPen );
TQRect drawRect( potidb.rect() );
- // create mask
- TQBitmap mask( potidb.size(), true );
- TQPainter maskpainter( &mask );
- maskpainter.setPen( Qt::NoPen );
- maskpainter.setBrush( Qt::color1 );
- maskpainter.drawEllipse( drawRect );
- maskpainter.end();
- potidb.setMask( mask );
+ // create tqmask
+ TQBitmap tqmask( potidb.size(), true );
+ TQPainter tqmaskpainter( &tqmask );
+ tqmaskpainter.setPen( TQt::NoPen );
+ tqmaskpainter.setBrush( TQt::color1 );
+ tqmaskpainter.drawEllipse( drawRect );
+ tqmaskpainter.end();
+ potidb.setMask( tqmask );
KPixmap gradient( potidb.size() );
KPixmapEffect::gradient( gradient, potiColor.dark( 130 ), potiColor.light( 130 ), KPixmapEffect::DiagonalGradient );
@@ -133,12 +133,12 @@ TQSizePolicy KPoti::sizePolicy() const
return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
}
-TQSize KPoti::sizeHint() const
+TQSize KPoti::tqsizeHint() const
{
- return minimumSizeHint();
+ return tqminimumSizeHint();
}
-TQSize KPoti::minimumSizeHint() const
+TQSize KPoti::tqminimumSizeHint() const
{
int width = 40;
int height = 40;
@@ -162,17 +162,17 @@ TQString KPoti::text() const
void KPoti::setText( const TQString & text )
{
d->label = text;
- setMinimumSize( minimumSizeHint() );
+ setMinimumSize( tqminimumSizeHint() );
updateGeometry();
}
/**
Constructs a poti.
- The \e parent and \e name arguments are sent to the TQWidget constructor.
+ The \e tqparent and \e name arguments are sent to the TQWidget constructor.
*/
-KPoti::KPoti( TQWidget *parent, const char *name )
- : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase )
+KPoti::KPoti( TQWidget *tqparent, const char *name )
+ : TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase )
, d( 0 )
{
init();
@@ -188,12 +188,12 @@ KPoti::KPoti( TQWidget *parent, const char *name )
\arg \e step is the page step value.
\arg \e value is the initial value.
- The \e parent and \e name arguments are sent to the TQWidget constructor.
+ The \e tqparent and \e name arguments are sent to the TQWidget constructor.
*/
KPoti::KPoti( int minValue, int maxValue, int step,
- int value, TQWidget *parent, const char *name )
- : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase )
+ int value, TQWidget *tqparent, const char *name )
+ : TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase )
, TQRangeControl( minValue, maxValue, 1, step, value )
, d( 0 )
{
@@ -209,7 +209,7 @@ KPoti::~KPoti()
void KPoti::init(int value)
{
d = new KPotiPrivate;
- font().setPointSize( 8 );
+ const_cast<QFont&>(font()).setPointSize( 8 );
d->potiColor.setNamedColor( "red" );
timer = 0;
@@ -222,7 +222,7 @@ void KPoti::init(int value)
m_bLabel = true;
tickInt = 0;
- setFocusPolicy( TabFocus );
+ setFocusPolicy( TQ_TabFocus );
initTicks();
}
@@ -391,7 +391,7 @@ void KPoti::setColor( const TQColor &c )
{
d->potiColor = c;
d->potiDirty = true;
- repaint();
+ tqrepaint();
}
@@ -407,8 +407,8 @@ void KPoti::paintPoti( TQPainter * p )
p2.translate( db.rect().center().x(), db.rect().center().y() );
p2.rotate( potiPos * 180.0 / PI );
TQRect pointer( db.width() / -20, db.width() / -2, db.width() / 10, db.width() / 2 );
- TQBrush buttonbrush( colorGroup().button() );
- qDrawShadePanel( &p2, pointer, colorGroup(), true, 1, &buttonbrush );
+ TQBrush buttonbrush( tqcolorGroup().button() );
+ qDrawShadePanel( &p2, pointer, tqcolorGroup(), true, 1, &buttonbrush );
p2.end();
p->drawPixmap( d->potiRect, db );
@@ -439,7 +439,7 @@ void KPoti::reallyMovePoti( float newPos )
void KPoti::drawContents( TQPainter * p )
{
TQPixmap doublebuffer( contentsRect().size() );
- doublebuffer.fill( colorGroup().background() );
+ doublebuffer.fill( tqcolorGroup().background() );
TQPainter dbp( &doublebuffer );
if( m_bLabel )
{
@@ -454,10 +454,10 @@ void KPoti::drawContents( TQPainter * p )
if( ticks )
drawTicks( &dbp, buttonRadius, tickLength, interval );
- dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) );
+ dbp.drawPixmap( d->buttonRect, d->bgPixmap( tqcolorGroup() ) );
if( hasFocus() )
- style().drawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() );
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, tqcolorGroup() );
paintPoti( &dbp );
dbp.end();
@@ -473,13 +473,13 @@ void KPoti::mousePressEvent( TQMouseEvent *e )
{
resetState();
- if ( e->button() == MidButton ) {
+ if ( e->button() == Qt::MidButton ) {
double pos = atan2( double(e->pos().x()-d->center.x()),
double(- e->pos().y() + d->center.y()) );
movePoti( pos );
return;
}
- if ( e->button() != LeftButton )
+ if ( e->button() != Qt::LeftButton )
return;
@@ -512,13 +512,13 @@ void KPoti::mousePressEvent( TQMouseEvent *e )
void KPoti::mouseMoveEvent( TQMouseEvent *e )
{
- if ( (e->state() & MidButton) ) { // middle button wins
+ if ( (e->state() & Qt::MidButton) ) { // middle button wins
double pos = atan2( double(e->pos().x()-d->center.x()),
double(- e->pos().y()+d->center.y()) );
movePoti( pos );
return;
}
- if ( !(e->state() & LeftButton) )
+ if ( !(e->state() & Qt::LeftButton) )
return; // left mouse button is up
if ( state != Dragging )
return;
@@ -534,7 +534,7 @@ void KPoti::mouseMoveEvent( TQMouseEvent *e )
void KPoti::mouseReleaseEvent( TQMouseEvent *e )
{
- if ( !(e->button() & LeftButton) )
+ if ( !(e->button() & Qt::LeftButton) )
return;
resetState();
}
@@ -567,7 +567,7 @@ void KPoti::enterEvent( TQEvent * )
void KPoti::movePoti( float pos )
{
- float newPos = QMIN( maxAngle, QMAX( -maxAngle, pos ) );
+ float newPos = TQMIN( maxAngle, TQMAX( -maxAngle, pos ) );
int newVal = valueFromPosition( newPos );
if ( potiVal != newVal ) {
potiVal = newVal;
@@ -710,7 +710,7 @@ void KPoti::repeatTimeout()
void KPoti::drawTicks( TQPainter *p, double dist, double w, int i ) const
{
- p->setPen( colorGroup().foreground() );
+ p->setPen( tqcolorGroup().foreground() );
double angle,s,c;
double x, y;
for (int v=0; v<=i; v++)
@@ -765,7 +765,7 @@ void KPoti::setTickmarks( bool s )
void KPoti::setTickInterval( int i )
{
- tickInt = QMAX( 0, i );
+ tickInt = TQMAX( 0, i );
update();
}
diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h
index 2994dd1..80e32ad 100644
--- a/arts/gui/kde/kpoti.h
+++ b/arts/gui/kde/kpoti.h
@@ -25,17 +25,18 @@
class TQTimer;
-struct QPotiData;
+struct TQPotiData;
-class KPoti : public TQFrame, public QRangeControl
+class KPoti : public TQFrame, public TQRangeControl
{
Q_OBJECT
+ TQ_OBJECT
public:
- KPoti( TQWidget *parent=0, const char *name=0 );
+ KPoti( TQWidget *tqparent=0, const char *name=0 );
KPoti( int minValue, int maxValue, int step, int value,
- TQWidget *parent=0, const char *name=0 );
+ TQWidget *tqparent=0, const char *name=0 );
~KPoti();
@@ -52,8 +53,8 @@ public:
int tickInterval() const { return tickInt; }
virtual TQSizePolicy sizePolicy() const;
- virtual TQSize sizeHint() const;
- virtual TQSize minimumSizeHint() const;
+ virtual TQSize tqsizeHint() const;
+ virtual TQSize tqminimumSizeHint() const;
TQString text() const;
public slots:
@@ -108,7 +109,7 @@ private:
int potiRadius() const;
void initTicks();
- QTimer *timer;
+ TQTimer *timer;
float potiPos;
int potiVal;
int clickOffset;
diff --git a/arts/gui/kde/kpoti_impl.h b/arts/gui/kde/kpoti_impl.h
index 0502cdc..92d7a10 100644
--- a/arts/gui/kde/kpoti_impl.h
+++ b/arts/gui/kde/kpoti_impl.h
@@ -36,6 +36,7 @@ class KPoti_impl;
class PotiIntMapper :public TQObject {
Q_OBJECT
+ TQ_OBJECT
KPoti_impl *impl;
public:
PotiIntMapper(KPoti_impl *impl, KPoti *kp);
diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h
index d200c6f..714da93 100644
--- a/arts/gui/kde/kspinbox_impl.h
+++ b/arts/gui/kde/kspinbox_impl.h
@@ -35,6 +35,7 @@ namespace Arts {
class KSpinBox_impl;
class SpinBoxIntMapper :public TQObject {
Q_OBJECT
+ TQ_OBJECT
KSpinBox_impl *impl;
public:
SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp);
@@ -54,7 +55,7 @@ protected:
public:
KSpinBox_impl( TQSpinBox * w = 0 );
- void constructor( Widget p ) { parent( p ); }
+ void constructor( Widget p ) { tqparent( p ); }
std::string caption();
void caption(const std::string& newCaption);
diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp
index 1a95c2a..4988ad7 100644
--- a/arts/gui/kde/ktickmarks_impl.cpp
+++ b/arts/gui/kde/ktickmarks_impl.cpp
@@ -75,8 +75,8 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) {
int _minsize;
// Shorcuts
int w,h;
- TQColor colornormal = colorGroup().foreground();
- TQColor colordiff = colorGroup().buttonText();
+ TQColor colornormal = tqcolorGroup().foreground();
+ TQColor colordiff = tqcolorGroup().buttonText();
if ( _dir == Arts::BottomToTop || _dir == Arts::TopToBottom ) {
p->translate( contentsRect().left(), contentsRect().bottom() );
@@ -111,7 +111,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) {
p->drawText( ( w - (left)*6 - (right)*6 - fontrect.width() )/2 + (left)*6
, h-fontrect.height()/2,
fontrect.width(), fontrect.height()+2,
- Qt::AlignRight|Qt::AlignTop, TQString::number( i ) );
+ TQt::AlignRight|TQt::AlignTop, TQString::number( i ) );
if ( right ) p->drawLine( w-6, h, w, h );
}
for ( float i=_minstep; i<=dbmax; i+=_minstep ) {
@@ -121,7 +121,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) {
p->drawText( ( w - (left)*6 - (right)*6 - fontrect.width() )/2 + (left)*6
, h-fontrect.height()/2,
fontrect.width(), fontrect.height()+2,
- Qt::AlignRight|Qt::AlignTop, TQString::number( i ) );
+ TQt::AlignRight|TQt::AlignTop, TQString::number( i ) );
if ( right ) p->drawLine( w-6, h, w, h );
}
} else {
@@ -157,7 +157,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) {
p->drawText( w - fontrect.width()/2
, ( h - (left)*6 - (right)*6 - fontrect.height() )/2 + (left)*6,
fontrect.width(), fontrect.height()+2,
- Qt::AlignRight|Qt::AlignTop, TQString::number( i ) );
+ TQt::AlignRight|TQt::AlignTop, TQString::number( i ) );
if ( right ) p->drawLine( w, h-6, w, h );
}
for ( float i=_minstep; i<=dbmax; i+=_minstep ) {
@@ -167,7 +167,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) {
p->drawText( w - fontrect.width()/2
, ( h - (left)*6 - (right)*6 - fontrect.height() )/2 + (left)*6,
fontrect.width(), fontrect.height()+2,
- Qt::AlignRight|Qt::AlignTop, TQString::number( i ) );
+ TQt::AlignRight|TQt::AlignTop, TQString::number( i ) );
if ( right ) p->drawLine( w, h-6, w, h );
}
}
diff --git a/arts/gui/kde/ktickmarks_impl.h b/arts/gui/kde/ktickmarks_impl.h
index 1d0006a..a54baf5 100644
--- a/arts/gui/kde/ktickmarks_impl.h
+++ b/arts/gui/kde/ktickmarks_impl.h
@@ -61,6 +61,7 @@ private:
class KTickmarks_Widget : public TQFrame, public dB2VolCalc {
Q_OBJECT
+ TQ_OBJECT
private:
KTickmarks_impl* _impl;
public:
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp
index 1c32f23..fca3466 100644
--- a/arts/gui/kde/kvolumefader_impl.cpp
+++ b/arts/gui/kde/kvolumefader_impl.cpp
@@ -121,7 +121,7 @@ KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n )
, _value( -1 )
, _dir( Arts::BottomToTop )
, _menu( new KPopupMenu( this ) )
- , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), this, TQT_SLOT( exactValue() ), this ) )
+ , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( exactValue() ), TQT_TQOBJECT(this) ) )
{
//kdDebug() << k_funcinfo << endl;
setMinimumSize( 10,10 );
@@ -159,10 +159,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){
if ( _dir==Arts::BottomToTop ) h = contentsRect().height() * ( 1 - _value );
else h = contentsRect().height() * _value;
for ( int i=int( h ); i<contentsRect().height(); i++ ) {
- p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( i )/contentsRect().height() ) );
+ p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( i )/contentsRect().height() ) );
p->drawLine( contentsRect().left(), this->frameWidth() + i, contentsRect().right(), this->frameWidth() + i );
}
- p->setPen( colorGroup().dark() );
+ p->setPen( tqcolorGroup().dark() );
p->drawLine( contentsRect().left(), this->frameWidth() + int( h ), contentsRect().right(), this->frameWidth() + int( h ) );
} else {
float w;
@@ -170,10 +170,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){
if ( _dir==Arts::LeftToRight ) w = - contentsRect().width() * ( 1 - _value );
else w = - contentsRect().width() * _value;
for ( int i=int( w ); i>=-contentsRect().width(); i-- ) {
- p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( -i )/contentsRect().width() ) );
+ p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( -i )/contentsRect().width() ) );
p->drawLine( this->frameWidth() + i, contentsRect().top(), this->frameWidth() + i, contentsRect().bottom() );
}
- p->setPen( colorGroup().dark() );
+ p->setPen( tqcolorGroup().dark() );
p->drawLine( this->frameWidth() + int( w ), contentsRect().top(), this->frameWidth() + int( w ), contentsRect().bottom() );
}
}
diff --git a/arts/gui/kde/kvolumefader_impl.h b/arts/gui/kde/kvolumefader_impl.h
index c2db6a0..354c483 100644
--- a/arts/gui/kde/kvolumefader_impl.h
+++ b/arts/gui/kde/kvolumefader_impl.h
@@ -69,6 +69,7 @@ class KAction;
class KVolumeFader_Widget : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
private:
KVolumeFader_impl* _impl;
bool _inupdate;
diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp
index ede8ad3..b899f0c 100644
--- a/arts/gui/kde/kwidget_impl.cpp
+++ b/arts/gui/kde/kwidget_impl.cpp
@@ -34,7 +34,7 @@ KWidget_impl::KWidget_impl( TQWidget * widget )
_widgetID = KWidgetRepo::the()->add( this, _qwidget );
/*
- * KWidgetGuard will protect us against deleting the widget if Qt already
+ * KWidgetGuard will protect us against deleting the widget if TQt already
* has done so (for instance if our widget was inside a panel, and
* the panel got deleted, our widget will be gone, too)
*/
@@ -65,24 +65,24 @@ long KWidget_impl::widgetID()
return _widgetID;
}
-Widget KWidget_impl::parent()
+Widget KWidget_impl::tqparent()
{
return KWidgetRepo::the()->lookupWidget(_parentID);
}
-void KWidget_impl::parent(Arts::Widget newParent)
+void KWidget_impl::tqparent(Arts::Widget newParent)
{
if(!newParent.isNull())
{
_parentID = newParent.widgetID();
- TQWidget *qparent;
- qparent = KWidgetRepo::the()->lookupQWidget(newParent.widgetID());
- if( qparent != 0 )
+ TQWidget *qtqparent;
+ qtqparent = KWidgetRepo::the()->lookupTQWidget(newParent.widgetID());
+ if( qtqparent != 0 )
{
TQPoint pos(x(),y());
bool showIt = visible();
- _qwidget->reparent(qparent, pos, showIt);
+ _qwidget->reparent(qtqparent, pos, showIt);
}
}
else
@@ -143,26 +143,26 @@ void KWidget_impl::visible(bool newVisible)
SizePolicy KWidget_impl::hSizePolicy()
{
- return ( SizePolicy )_qwidget->sizePolicy().horData();
+ return ( SizePolicy )_qwidget->tqsizePolicy().horData();
}
void KWidget_impl::hSizePolicy( SizePolicy p )
{
- TQSizePolicy sp = _qwidget->sizePolicy();
+ TQSizePolicy sp = _qwidget->tqsizePolicy();
sp.setHorData( ( TQSizePolicy::SizeType )p );
- _qwidget->setSizePolicy( sp );
+ _qwidget->tqsetSizePolicy( sp );
}
SizePolicy KWidget_impl::vSizePolicy()
{
- return ( SizePolicy )_qwidget->sizePolicy().verData();
+ return ( SizePolicy )_qwidget->tqsizePolicy().verData();
}
void KWidget_impl::vSizePolicy( SizePolicy p )
{
- TQSizePolicy sp = _qwidget->sizePolicy();
+ TQSizePolicy sp = _qwidget->tqsizePolicy();
sp.setVerData( ( TQSizePolicy::SizeType )p );
- _qwidget->setSizePolicy( sp );
+ _qwidget->tqsetSizePolicy( sp );
}
void KWidget_impl::show()
diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h
index 292f8cc..40d7216 100644
--- a/arts/gui/kde/kwidget_impl.h
+++ b/arts/gui/kde/kwidget_impl.h
@@ -43,8 +43,8 @@ public:
~KWidget_impl();
long widgetID();
- Widget parent();
- void parent(Arts::Widget);
+ Widget tqparent();
+ void tqparent(Arts::Widget);
long x();
void x(long newX);
long y();
@@ -70,6 +70,7 @@ public:
class KWidgetGuard : public TQObject {
Q_OBJECT
+ TQ_OBJECT
protected:
KWidget_impl *impl;
diff --git a/arts/gui/kde/kwidgetrepo.cpp b/arts/gui/kde/kwidgetrepo.cpp
index 120f9cc..9c7a99d 100644
--- a/arts/gui/kde/kwidgetrepo.cpp
+++ b/arts/gui/kde/kwidgetrepo.cpp
@@ -71,7 +71,7 @@ long KWidgetRepo::add(KWidget_impl *widget, TQWidget *qwidget)
return ID;
}
-TQWidget *KWidgetRepo::lookupQWidget(long ID)
+TQWidget *KWidgetRepo::lookupTQWidget(long ID)
{
return qwidgets[ID];
}
diff --git a/arts/gui/kde/kwidgetrepo.h b/arts/gui/kde/kwidgetrepo.h
index 1bcb587..bfc9206 100644
--- a/arts/gui/kde/kwidgetrepo.h
+++ b/arts/gui/kde/kwidgetrepo.h
@@ -46,7 +46,7 @@ public:
long add(Arts::KWidget_impl *widget, TQWidget *qwidget);
Arts::Widget lookupWidget(long ID);
- TQWidget *lookupQWidget(long ID);
+ TQWidget *lookupTQWidget(long ID);
void remove(long ID);
static KWidgetRepo *the();
diff --git a/arts/midi/Makefile.am b/arts/midi/Makefile.am
index b571964..b7d655a 100644
--- a/arts/midi/Makefile.am
+++ b/arts/midi/Makefile.am
@@ -9,12 +9,12 @@ bin_PROGRAMS = midisend
noinst_PROGRAMS = midisynctest
midisend_SOURCES = midisend.cc midimsg.c
-midisend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBPTHREAD)
+midisend_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD)
midisend_LDADD = libartsmidi_idl.la
midisend_COMPILE_FIRST = artsmidi.h
midisynctest_SOURCES = midisynctest.cc
-midisynctest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBPTHREAD)
+midisynctest_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD)
midisynctest_LDADD = libartsmidi.la -lsoundserver_idl
midisynctest_COMPILE_FIRST = artsmidi.h
diff --git a/arts/midi/artsmidi.idl b/arts/midi/artsmidi.idl
index 70157d9..82e6e9e 100644
--- a/arts/midi/artsmidi.idl
+++ b/arts/midi/artsmidi.idl
@@ -54,7 +54,7 @@ struct TimeStamp {
/**
* different status of a midi command
*/
-enum MidiCommandStatus {
+enum MidiCommandtqStatus {
// Masks:
mcsCommandMask = 0xf0,
mcsChannelMask = 0x0f,
diff --git a/arts/midi/audiosync_impl.cc b/arts/midi/audiosync_impl.cc
index 20f089d..a75992c 100644
--- a/arts/midi/audiosync_impl.cc
+++ b/arts/midi/audiosync_impl.cc
@@ -188,7 +188,7 @@ void AudioSync_impl::synchronizeTo(const TimeStamp& time)
#endif
}
-AudioSync_impl *AudioSync_impl::find(AudioSync audioSync)
+AudioSync_impl *AudioSync_impl::tqfind(AudioSync audioSync)
{
list<AudioSync_impl *>::iterator i;
diff --git a/arts/midi/audiosync_impl.h b/arts/midi/audiosync_impl.h
index 302c93c..dde1aed 100644
--- a/arts/midi/audiosync_impl.h
+++ b/arts/midi/audiosync_impl.h
@@ -67,7 +67,7 @@ public:
void updateTime();
// interface to MidiSyncGroup
- static AudioSync_impl *find(AudioSync audioSync);
+ static AudioSync_impl *tqfind(AudioSync audioSync);
void synchronizeTo(const TimeStamp& time);
void setSyncGroup(MidiSyncGroup_impl *syncGroup);
diff --git a/arts/midi/midisyncgroup_impl.cc b/arts/midi/midisyncgroup_impl.cc
index 5d5305d..f446899 100644
--- a/arts/midi/midisyncgroup_impl.cc
+++ b/arts/midi/midisyncgroup_impl.cc
@@ -68,7 +68,7 @@ void MidiSyncGroup_impl::removeClient(MidiClient client)
void MidiSyncGroup_impl::addAudioSync(AudioSync audioSync)
{
- AudioSync_impl *impl = AudioSync_impl::find(audioSync);
+ AudioSync_impl *impl = AudioSync_impl::tqfind(audioSync);
impl->setSyncGroup(this);
audioSyncs.push_back(impl);
@@ -77,7 +77,7 @@ void MidiSyncGroup_impl::addAudioSync(AudioSync audioSync)
void MidiSyncGroup_impl::removeAudioSync(AudioSync audioSync)
{
- AudioSync_impl *impl = AudioSync_impl::find(audioSync);
+ AudioSync_impl *impl = AudioSync_impl::tqfind(audioSync);
impl->setSyncGroup(0);
audioSyncs.remove(impl);
}
diff --git a/arts/modules/README.environments b/arts/modules/README.environments
index 0ac64df..5dc6c66 100644
--- a/arts/modules/README.environments
+++ b/arts/modules/README.environments
@@ -155,7 +155,7 @@ to tell the Item in which environment it lives. It also uses setContainer(
Container::null()) once the Item gets removed. Which container the Item
is in can be seen in the
- readonly attribute Container parent;
+ readonly attribute Container tqparent;
Upon serialization, the container uses
diff --git a/arts/modules/common/artsmodulescommon.idl b/arts/modules/common/artsmodulescommon.idl
index 10ccd21..7f65756 100644
--- a/arts/modules/common/artsmodulescommon.idl
+++ b/arts/modules/common/artsmodulescommon.idl
@@ -72,7 +72,7 @@ module Environment {
/**
* the container the item lives in
*/
- readonly attribute Container parent;
+ readonly attribute Container tqparent;
/**
* called by the container to insert/remove item from/to the
@@ -150,7 +150,7 @@ interface EffectRackItemGui {
};
interface EffectRackSlot {
- void constructor( Widget parent, Widget effect, EffectRackItemGui effectrackgui );
+ void constructor( Widget tqparent, Widget effect, EffectRackItemGui effectrackgui );
/*writeonly*/ attribute boolean removeslot;
/*writeonly*/ attribute boolean tomaster;
};
diff --git a/arts/modules/common/effectrackslot_impl.cc b/arts/modules/common/effectrackslot_impl.cc
index 8e7e48e..359c40a 100644
--- a/arts/modules/common/effectrackslot_impl.cc
+++ b/arts/modules/common/effectrackslot_impl.cc
@@ -42,23 +42,23 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
{
}
- void constructor( Widget parent, Widget effect, EffectRackItemGui effectrackgui )
+ void constructor( Widget tqparent, Widget effect, EffectRackItemGui effectrackgui )
{
_effectrackgui = effectrackgui;
- _hbox.parent( parent );
+ _hbox.tqparent( tqparent );
_hbox.margin( 0 );
_hbox.spacing( 0 );
_hbox.framestyle( Sunken | Panel );
_hbox.linewidth( 1 );
_hbox.show();
- _buttonbox.parent( _hbox );
+ _buttonbox.tqparent( _hbox );
_buttonbox.margin( 0 );
_buttonbox.spacing( 0 );
_buttonbox.show();
- _removeButton.parent( _buttonbox );
+ _removeButton.tqparent( _buttonbox );
_removeButton.text( "x" );
_removeButton.hSizePolicy( spFixed );
_removeButton.width( 20 );
@@ -66,7 +66,7 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
connect( _removeButton, "clicked_changed", self(), "removeslot" );
_removeButton.show();
- _masterButton.parent( _buttonbox );
+ _masterButton.tqparent( _buttonbox );
_masterButton.text( "MM" );
_masterButton.toggle( true );
_masterButton.hSizePolicy( spFixed );
@@ -75,7 +75,7 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
connect( _masterButton, "pressed_changed", self(), "tomaster" );
_masterButton.show();
- _frame.parent( _hbox );
+ _frame.tqparent( _hbox );
_frame.margin( 5 );
_frame.spacing( 0 );
_frame.framestyle( Raised | Panel );
@@ -85,10 +85,10 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
_frame.show();
_effect = effect;
- _effect.parent( _frame );
+ _effect.tqparent( _frame );
_effect.show();
- _spacer.parent( _frame );
+ _spacer.tqparent( _frame );
_spacer.hSizePolicy( spExpanding );
_spacer.show();
}
diff --git a/arts/modules/common/env_effectrackitem_impl.cc b/arts/modules/common/env_effectrackitem_impl.cc
index 50fb116..ac76db7 100644
--- a/arts/modules/common/env_effectrackitem_impl.cc
+++ b/arts/modules/common/env_effectrackitem_impl.cc
@@ -226,7 +226,7 @@ public:
name = LineEdit();
name.caption("name");
name.text(_effectRack.name());
- name.parent(hbox);
+ name.tqparent(hbox);
connect(name,"text_changed", _effectRack, "name");
#endif
@@ -248,7 +248,7 @@ public:
typebox = ComboBox();
typebox.choices(choices);
typebox.value(_type);
- typebox.parent(hbox);
+ typebox.tqparent(hbox);
connect(typebox,"value_changed", self(), "type");
addbutton = Button( "add", hbox );
@@ -260,7 +260,7 @@ public:
effect_vbox.show();
Frame spacer;
- spacer.parent( effect_vbox );
+ spacer.tqparent( effect_vbox );
spacer.vSizePolicy( spExpanding );
spacer.show();
effect_vbox._addChild( spacer, "spacer" );
diff --git a/arts/modules/common/env_instrumentitem_impl.cc b/arts/modules/common/env_instrumentitem_impl.cc
index 17959ca..0b979b6 100644
--- a/arts/modules/common/env_instrumentitem_impl.cc
+++ b/arts/modules/common/env_instrumentitem_impl.cc
@@ -98,7 +98,7 @@ public:
LineEdit edit;
edit.x(20); edit.y(10); edit.width(120); edit.height(40);
edit.text(instrument.filename());
- edit.parent(panel);
+ edit.tqparent(panel);
edit.show();
connect(edit,"text_changed", instrument, "filename");
panel._addChild(edit,"editWidget");
diff --git a/arts/modules/common/env_item_impl.cc b/arts/modules/common/env_item_impl.cc
index 6bc960d..da3a694 100644
--- a/arts/modules/common/env_item_impl.cc
+++ b/arts/modules/common/env_item_impl.cc
@@ -16,7 +16,7 @@ Environment::Item_impl::~Item_impl()
arts_assert(_active == false);
}
-Environment::Container Environment::Item_impl::parent()
+Environment::Container Environment::Item_impl::tqparent()
{
Container p = _parent;
return p;
diff --git a/arts/modules/common/env_item_impl.h b/arts/modules/common/env_item_impl.h
index dbdca1f..4fcd1fc 100644
--- a/arts/modules/common/env_item_impl.h
+++ b/arts/modules/common/env_item_impl.h
@@ -18,7 +18,7 @@ public:
~Item_impl();
bool active();
- Container parent();
+ Container tqparent();
void setContainer(Container container);
};
}
diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc
index 0f4db5e..db4bc18 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cc
@@ -49,7 +49,7 @@ public:
if(newName != _name)
{
_name = newName;
- amClient.title(i18n("Mixer (\"%1\")").arg(TQString::fromUtf8(_name.c_str())).utf8().data());
+ amClient.title(i18n("Mixer (\"%1\")").tqarg(TQString::fromUtf8(_name.c_str())).utf8().data());
amClient.autoRestoreID("mixer_"+_name);
for(unsigned int i = 0; i < _inputs.size(); i++)
_inputs[i].busname(channelName(i));
@@ -165,7 +165,7 @@ public:
Widget w = guiFactory.createGui((*channels)[i]);
if(!w.isNull())
{
- w.parent(channel_hbox);
+ w.tqparent(channel_hbox);
w.show();
channelWidgets.push_back(w);
}
@@ -183,21 +183,21 @@ public:
if(!_item.isNull() && !vbox.isNull())
{
hbox = HBox();
- hbox.parent(vbox);
+ hbox.tqparent(vbox);
hbox.show();
spinbox = SpinBox();
spinbox.caption(i18n("channels").utf8().data());
spinbox.min(0); spinbox.max(32);
spinbox.value(_item.channelCount());
- spinbox.parent(hbox);
+ spinbox.tqparent(hbox);
spinbox.show();
connect(spinbox,"value_changed", _item, "channelCount");
name = LineEdit();
name.caption(i18n("name").utf8().data());
name.text(_item.name());
- name.parent(hbox);
+ name.tqparent(hbox);
name.show();
connect(name,"text_changed", _item, "name");
@@ -212,12 +212,12 @@ public:
delete queryResults;
typebox.choices(choices);
typebox.value(_type);
- typebox.parent(hbox);
+ typebox.tqparent(hbox);
typebox.show();
connect(typebox,"value_changed", _item, "type");
channel_hbox = HBox();
- channel_hbox.parent(vbox);
+ channel_hbox.tqparent(vbox);
channel_hbox.show();
channelWidgets.clear();
@@ -320,14 +320,14 @@ public:
HBox hbox;
hbox.show();
hbox.width(330); hbox.height(50);
- hbox.parent(vbox);
+ hbox.tqparent(vbox);
vbox._addChild(hbox,"hbox");
SpinBox spinbox;
spinbox.caption(i18n("channels").utf8().data());
spinbox.min(0); spinbox.max(32);
spinbox.value(mixerItem.channelCount());
- spinbox.parent(hbox);
+ spinbox.tqparent(hbox);
spinbox.show();
connect(spinbox,"value_changed", mixerItem, "channelCount");
hbox._addChild(spinbox,"channelsWidget");
@@ -335,7 +335,7 @@ public:
LineEdit name;
name.caption(i18n("name").utf8().data());
name.caption(mixerItem.name());
- name.parent(hbox);
+ name.tqparent(hbox);
name.show();
connect(name,"caption_changed", mixerItem, "name");
hbox._addChild(name,"nameWidget");
@@ -343,7 +343,7 @@ public:
HBox channel_hbox;
channel_hbox.show();
channel_hbox.width(330); hbox.height(450);
- channel_hbox.parent(vbox);
+ channel_hbox.tqparent(vbox);
vbox._addChild(channel_hbox,"channel_hbox");
GenericGuiFactory gf;
@@ -353,7 +353,7 @@ public:
for(i = channels->begin(); i != channels->end(); i++)
{
Widget w = gf.createGui(*i);
- w.parent(channel_hbox);
+ w.tqparent(channel_hbox);
channel_hbox._addChild(w,"channel");
}
#endif
diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
index 56ca603..0891458 100644
--- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc
+++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
@@ -110,7 +110,7 @@ public:
Arts::LayoutBox hbox;
hbox.direction( Arts::LeftToRight );
- hbox.layoutmargin( 5 ); hbox.spacing( 5 );
+ hbox.tqlayoutmargin( 5 ); hbox.spacing( 5 );
Arts::Poti lowgain; lowgain.caption( i18n( "Low Gain" ).utf8().data() );
lowgain.min( -24 ); lowgain.max( 24 );
@@ -123,11 +123,11 @@ public:
Arts::Poti lowfreq; lowfreq.color( "grey" ); lowfreq.caption( i18n( "Low Freq" ).utf8().data() );
lowfreq.min( 20 ); lowfreq.max( 1000 );
lowfreq.value( ch.lowfreq() ); connect( lowfreq, "value_changed", ch, "lowfreq" );
- lowfreq.parent( lowbox ); lowbox._addChild( lowfreq , "" );
+ lowfreq.tqparent( lowbox ); lowbox._addChild( lowfreq , "" );
Arts::Poti lowq; lowq.color( "grey" ); lowq.caption( i18n( "Low Q" ).utf8().data() );
lowq.min( 0.01 ); lowq.max( 10 );
lowq.value( ch.lowq() ); connect( lowq, "value_changed", ch, "lowq" );
- lowq.parent( lowbox ); lowbox._addChild( lowq , "" );
+ lowq.tqparent( lowbox ); lowbox._addChild( lowq , "" );
Arts::Poti mid1gain; mid1gain.caption( i18n( "Mid1 Gain" ).utf8().data() );
mid1gain.min( -24 ); mid1gain.max( 24 );
@@ -140,11 +140,11 @@ public:
Arts::Poti mid1freq; mid1freq.color( "grey" ); mid1freq.caption( i18n( "Mid1 Freq" ).utf8().data() );
mid1freq.min( 20 ); mid1freq.max( 5000 );
mid1freq.value( ch.mid1freq() ); connect( mid1freq, "value_changed", ch, "mid1freq" );
- mid1freq.parent( mid1box ); mid1box._addChild( mid1freq , "" );
+ mid1freq.tqparent( mid1box ); mid1box._addChild( mid1freq , "" );
Arts::Poti mid1q; mid1q.color( "grey" ); mid1q.caption( i18n( "Mid1 Q" ).utf8().data() );
mid1q.min( 0.01 ); mid1q.max( 10 );
mid1q.value( ch.mid1q() ); connect( mid1q, "value_changed", ch, "mid1q" );
- mid1q.parent( mid1box ); mid1box._addChild( mid1q , "" );
+ mid1q.tqparent( mid1box ); mid1box._addChild( mid1q , "" );
Arts::Poti mid2gain; mid2gain.caption( i18n( "Mid2 Gain" ).utf8().data() );
mid2gain.min( -24 ); mid2gain.max( 24 );
@@ -157,11 +157,11 @@ public:
Arts::Poti mid2freq; mid2freq.color( "grey" ); mid2freq.caption( i18n( "Mid2 Freq" ).utf8().data() );
mid2freq.min( 20 ); mid2freq.max( 10000 );
mid2freq.value( ch.mid2freq() ); connect( mid2freq, "value_changed", ch, "mid2freq" );
- mid2freq.parent( mid2box ); mid2box._addChild( mid2freq , "" );
+ mid2freq.tqparent( mid2box ); mid2box._addChild( mid2freq , "" );
Arts::Poti mid2q; mid2q.color( "grey" ); mid2q.caption( i18n( "Mid2 Q" ).utf8().data() );
mid2q.min( 0.01 ); mid2q.max( 10 );
mid2q.value( ch.mid2q() ); connect( mid2q, "value_changed", ch, "mid2q" );
- mid2q.parent( mid2box ); mid2box._addChild( mid2q , "" );
+ mid2q.tqparent( mid2box ); mid2box._addChild( mid2q , "" );
Arts::Poti mid3gain; mid3gain.caption( i18n( "Mid3 Gain" ).utf8().data() );
mid3gain.min( -24 ); mid3gain.max( 24 );
@@ -174,11 +174,11 @@ public:
Arts::Poti mid3freq; mid3freq.color( "grey" ); mid3freq.caption( i18n( "Mid3 Freq" ).utf8().data() );
mid3freq.min( 1000 ); mid3freq.max( 10000 );
mid3freq.value( ch.mid3freq() ); connect( mid3freq, "value_changed", ch, "mid3freq" );
- mid3freq.parent( mid3box ); mid3box._addChild( mid3freq , "" );
+ mid3freq.tqparent( mid3box ); mid3box._addChild( mid3freq , "" );
Arts::Poti mid3q; mid3q.color( "grey" ); mid3q.caption( i18n( "Mid3 Q" ).utf8().data() );
mid3q.min( 0.01 ); mid3q.max( 10 );
mid3q.value( ch.mid3q() ); connect( mid3q, "value_changed", ch, "mid3q" );
- mid3q.parent( mid3box ); mid3box._addChild( mid3q , "" );
+ mid3q.tqparent( mid3box ); mid3box._addChild( mid3q , "" );
Arts::Poti highgain; highgain.caption( i18n( "High Gain" ).utf8().data() );
highgain.min( -24 ); highgain.max( 24 );
@@ -191,11 +191,11 @@ public:
Arts::Poti highfreq; highfreq.color( "grey" ); highfreq.caption( i18n( "High Freq" ).utf8().data() );
highfreq.min( 5000 ); highfreq.max( 16000 );
highfreq.value( ch.highfreq() ); connect( highfreq, "value_changed", ch, "highfreq" );
- highfreq.parent( highbox ); highbox._addChild( highfreq , "" );
+ highfreq.tqparent( highbox ); highbox._addChild( highfreq , "" );
Arts::Poti highq; highq.color( "grey" ); highq.caption( i18n( "High Q" ).utf8().data() );
highq.min( 0.01 ); highq.max( 10 );
highq.value( ch.highq() ); connect( highq, "value_changed", ch, "highq" );
- highq.parent( highbox ); highbox._addChild( highq , "" );
+ highq.tqparent( highbox ); highbox._addChild( highq , "" );
hbox.addStretch( 100 );
diff --git a/arts/modules/effects/freeverb/Makefile.am b/arts/modules/effects/freeverb/Makefile.am
index 42d70f2..bb2d6fa 100644
--- a/arts/modules/effects/freeverb/Makefile.am
+++ b/arts/modules/effects/freeverb/Makefile.am
@@ -1,3 +1,11 @@
+INCLUDES = \
+ -I$(top_builddir)/arts/modules \
+ -I$(top_srcdir)/arts/modules \
+ -I$(top_builddir)/arts/gui/common \
+ -I$(top_builddir)/arts/midi \
+ -I$(top_builddir)/arts/runtime \
+ -I$(arts_includes) \
+ $(ARTSC_INCLUDE) $(all_includes)
noinst_LTLIBRARIES = libfreeverb.la
diff --git a/arts/modules/effects/freeverb/revmodel.cpp b/arts/modules/effects/freeverb/revmodel.cpp
index 23a766c..feacaf6 100644
--- a/arts/modules/effects/freeverb/revmodel.cpp
+++ b/arts/modules/effects/freeverb/revmodel.cpp
@@ -73,7 +73,7 @@ void revmodel::mute()
}
}
-void revmodel::processreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip)
+void revmodel::processtqreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip)
{
float outL,outR,input;
diff --git a/arts/modules/effects/freeverb/revmodel.hpp b/arts/modules/effects/freeverb/revmodel.hpp
index ca6c89a..8fb37cd 100644
--- a/arts/modules/effects/freeverb/revmodel.hpp
+++ b/arts/modules/effects/freeverb/revmodel.hpp
@@ -17,7 +17,7 @@ public:
revmodel();
void mute();
void processmix(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip);
- void processreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip);
+ void processtqreplace(float *inputL, float *inputR, float *outputL, float *outputR, long numsamples, int skip);
void setroomsize(float value);
float getroomsize();
void setdamp(float value);
diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cc
index 7af1f47..17878da 100644
--- a/arts/modules/effects/freeverbguifactory_impl.cc
+++ b/arts/modules/effects/freeverbguifactory_impl.cc
@@ -58,7 +58,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
roomsize.color("red"); roomsize.min(0); roomsize.max(1);
roomsize.value(freeverb.roomsize());
roomsize.range(100);
- roomsize.parent(hbox);
+ roomsize.tqparent(hbox);
roomsize.show();
connect(roomsize,"value_changed", freeverb, "roomsize");
hbox._addChild(roomsize,"roomsizeWidget");
@@ -68,7 +68,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
damp.color("red"); damp.min(0); damp.max(1);
damp.value(freeverb.damp());
damp.range(100);
- damp.parent(hbox);
+ damp.tqparent(hbox);
damp.show();
connect(damp,"value_changed", freeverb, "damp");
hbox._addChild(damp,"dampWidget");
@@ -78,7 +78,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
wet.color("red"); wet.min(0); wet.max(1);
wet.value(freeverb.wet());
wet.range(100);
- wet.parent(hbox);
+ wet.tqparent(hbox);
wet.show();
connect(wet,"value_changed", freeverb, "wet");
hbox._addChild(wet,"wetWidget");
@@ -88,7 +88,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
dry.color("red"); dry.min(0); dry.max(1);
dry.value(freeverb.dry());
dry.range(100);
- dry.parent(hbox);
+ dry.tqparent(hbox);
dry.show();
connect(dry,"value_changed", freeverb, "dry");
hbox._addChild(dry,"dryWidget");
@@ -98,7 +98,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
width.color("red"); width.min(0); width.max(1);
width.value(freeverb.width());
width.range(100);
- width.parent(hbox);
+ width.tqparent(hbox);
width.show();
connect(width,"value_changed", freeverb, "width");
hbox._addChild(width,"widthWidget");
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
index b4db259..f0fa369 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
@@ -30,7 +30,7 @@ using namespace Arts;
KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) )
{
//kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<<w<<" )"<<endl;
- _mapper = new KStereoVolumeControlGui_EventMapper( this, _qframe );
+ _mapper = new KStereoVolumeControlGui_EventMapper( this, TQT_TQOBJECT(_qframe) );
this->addWidget( _label, -100 );
_label.bottom( Arts::East );
_label.text( "Volume" );
@@ -47,7 +47,7 @@ KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayo
this->dbmax( 6 );
_left.framestyle( Arts::Raised|Arts::Panel ); _left.linewidth( 4 );
_right.framestyle( Arts::Raised|Arts::Panel ); _right.linewidth( 4 );
- this->layoutmargin( 1 ); this->linewidth( 1 ); this->framestyle( Arts::Panel|Arts::Raised );
+ this->tqlayoutmargin( 1 ); this->linewidth( 1 ); this->framestyle( Arts::Panel|Arts::Raised );
}
void KStereoVolumeControlGui_impl::constructor( Arts::StereoVolumeControl svc ) {
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h
index 8729232..855c979 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.h
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h
@@ -81,11 +81,12 @@ private:
class KStereoVolumeControlGui_EventMapper : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
TQTimer* _timer;
Arts::KStereoVolumeControlGui_impl* _impl;
public:
- KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) {
+ KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* tqparent, const char* name=0 ) : TQObject( tqparent,name ), _impl( impl ) {
_timer = new TQTimer( this );
connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) );
}
diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cc
index e5a985f..d5209eb 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cc
@@ -85,7 +85,7 @@ public:
connect( bon, "pressed_changed", comp, "thru" );
LayoutBox hbox;
- hbox.direction( LeftToRight ); hbox.layoutmargin( 5 ); hbox.spacing( 5 );
+ hbox.direction( LeftToRight ); hbox.tqlayoutmargin( 5 ); hbox.spacing( 5 );
PopupBox timesbox;
timesbox.name( "Timings" ); timesbox.direction( LeftToRight );
LayoutBox times;
diff --git a/arts/modules/effects/synth_freeverb_impl.cc b/arts/modules/effects/synth_freeverb_impl.cc
index a1f35d0..e6cb1b0 100644
--- a/arts/modules/effects/synth_freeverb_impl.cc
+++ b/arts/modules/effects/synth_freeverb_impl.cc
@@ -57,7 +57,7 @@ public:
void calculateBlock(unsigned long samples)
{
- model->processreplace(inleft, inright, outleft, outright, samples,1);
+ model->processtqreplace(inleft, inright, outleft, outright, samples,1);
// don't add the original signal - that's what the "dry" argument is for
//for(unsigned long i = 0;i < samples; i++)
//{
diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
index ece106c..86f7c1b 100644
--- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
+++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
@@ -186,7 +186,7 @@ Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object)
vbox.show();
Graph g;
- g.parent(vbox);
+ g.tqparent(vbox);
g.width(400);
g.height(230);
g.caption(i18n("a graph").utf8().data());
@@ -211,7 +211,7 @@ Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object)
spinbox.caption(i18n("channels").utf8().data());
spinbox.min(3); spinbox.max(255);
spinbox.value(equalizer.taps());
- spinbox.parent(vbox);
+ spinbox.tqparent(vbox);
spinbox.show();
connect(spinbox,"value_changed", equalizer, "taps");
vbox._addChild(spinbox,"spinbox");
diff --git a/arts/modules/effects/voiceremovalguifactory_impl.cc b/arts/modules/effects/voiceremovalguifactory_impl.cc
index d4879b8..4a4011b 100644
--- a/arts/modules/effects/voiceremovalguifactory_impl.cc
+++ b/arts/modules/effects/voiceremovalguifactory_impl.cc
@@ -53,7 +53,7 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object )
position.color( "grey" ); position.min( -1 ); position.max( 1 );
position.value( voiceremoval.position() );
position.range( 100 );
- position.parent( hbox );
+ position.tqparent( hbox );
position.show();
connect( position, "value_changed", voiceremoval, "position" );
hbox._addChild( position, "positionWidget" );
@@ -64,7 +64,7 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object )
freq.value( voiceremoval.frequency() );
freq.range( 400 );
freq.logarithmic( 2.0 );
- freq.parent( hbox );
+ freq.tqparent( hbox );
freq.show();
connect( freq, "value_changed", voiceremoval, "frequency" );
hbox._addChild( freq, "freqWidget" );
diff --git a/arts/modules/synth/Makefile.am b/arts/modules/synth/Makefile.am
index 3995f40..c9922aa 100644
--- a/arts/modules/synth/Makefile.am
+++ b/arts/modules/synth/Makefile.am
@@ -31,10 +31,10 @@ libartsmodulessynth_la_COMPILE_FIRST = artsmodulessynth.h ../../midi/artsmidi.h
libartsmodulessynth_la_LIBADD = \
$(top_builddir)/arts/runtime/libartsbuilder.la \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
- -lartsflow -lartsflow_idl -lmcop
+ -lartsflow -lgsl -lartsflow_idl -lmcop
#libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
-libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
+libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lgsl -no-undefined
artsmodulessynth.cc artsmodulessynth.h artsmodulessynth.mcoptype artsmodulessynth.mcopclass: $(srcdir)/artsmodulessynth.idl $(MCOPIDL)
$(MCOPIDL) -t $(MCOP_INCLUDES) $(srcdir)/artsmodulessynth.idl
diff --git a/arts/modules/synth/c_filter_stuff.h b/arts/modules/synth/c_filter_stuff.h
index edd7a4a..89e93de 100644
--- a/arts/modules/synth/c_filter_stuff.h
+++ b/arts/modules/synth/c_filter_stuff.h
@@ -150,12 +150,12 @@ typedef struct {
int buflen;
} ty_afmethod;
-#define C_FLOWOUQT_METHOD 0
-#define C_RBQT_METHOD 1
-#define C_SWAPROQT_METHOD 2
-#define C_SWAPRWQT_METHOD 3
-#define C_AIMROQT_METHOD 4
-#define C_AIMRWQT_METHOD 5
+#define C_FLOWOUTQT_METHOD 0
+#define C_RBTQT_METHOD 1
+#define C_SWAPROTQT_METHOD 2
+#define C_SWAPRWTQT_METHOD 3
+#define C_AIMROTQT_METHOD 4
+#define C_AIMRWTQT_METHOD 5
typedef struct {
char *filename;
diff --git a/arts/modules/synth/synth_cdelay_impl.cc b/arts/modules/synth/synth_cdelay_impl.cc
index 28f4d12..267daab 100644
--- a/arts/modules/synth/synth_cdelay_impl.cc
+++ b/arts/modules/synth/synth_cdelay_impl.cc
@@ -43,14 +43,14 @@ class Synth_CDELAY_impl : virtual public Synth_CDELAY_skel,
{
protected:
unsigned long _buffersize;
- unsigned long _bitmask;
+ unsigned long _bittqmask;
float *_buffer; // holds the data to be delayed (variable size)
float _delaytime;
unsigned int _readpos;
unsigned int _writepos;
public:
- Synth_CDELAY_impl() : _buffersize( 0 ), _bitmask( 0 ), _buffer( 0 ), _delaytime( 0 ), _readpos( 0 ), _writepos( 0 )
+ Synth_CDELAY_impl() : _buffersize( 0 ), _bittqmask( 0 ), _buffer( 0 ), _delaytime( 0 ), _readpos( 0 ), _writepos( 0 )
{
}
@@ -66,7 +66,7 @@ public:
_delaytime = newTime;
double n = ceil( log( double(_delaytime * samplingRateFloat )) / log( 2. ) );
unsigned long newbuffersize = (unsigned long)( pow( 2, n ) );
- unsigned long newbitmask = newbuffersize - 1;
+ unsigned long newbittqmask = newbuffersize - 1;
if( newbuffersize != _buffersize )
{
float *newbuffer = new float[newbuffersize];
@@ -74,24 +74,24 @@ public:
for( unsigned long i = 0; i < _buffersize; i++ ) {
newbuffer[i] = _buffer[_writepos];
_writepos++;
- _writepos &= newbitmask;
+ _writepos &= newbittqmask;
}
for( unsigned long i = _buffersize; i < newbuffersize; i++ )
newbuffer[i] = 0;
} else {
_writepos -= newbuffersize;
- _writepos &= newbitmask;
+ _writepos &= newbittqmask;
for( unsigned long i = 0; i < newbuffersize; i++ ) {
newbuffer[i] = _buffer[_writepos];
_writepos++;
- _writepos &= newbitmask;
+ _writepos &= newbittqmask;
}
}
_buffer = newbuffer;
_buffersize = newbuffersize;
- _bitmask = newbitmask;
+ _bittqmask = newbittqmask;
}
- _readpos = (unsigned long)rint( _writepos - _delaytime * samplingRateFloat ) & _bitmask;
+ _readpos = (unsigned long)rint( _writepos - _delaytime * samplingRateFloat ) & _bittqmask;
time_changed( _delaytime );
}
@@ -113,9 +113,9 @@ public:
_buffer[_writepos] = invalue[i];
outvalue[i] = _buffer[_readpos];
_readpos++;
- _readpos &= _bitmask;
+ _readpos &= _bittqmask;
_writepos++;
- _writepos &= _bitmask;
+ _writepos &= _bittqmask;
}
}
};
diff --git a/arts/modules/synth/synth_delay_impl.cc b/arts/modules/synth/synth_delay_impl.cc
index 92c23fd..5728511 100644
--- a/arts/modules/synth/synth_delay_impl.cc
+++ b/arts/modules/synth/synth_delay_impl.cc
@@ -56,13 +56,13 @@ class Synth_DELAY_impl : virtual public Synth_DELAY_skel,
{
protected:
unsigned long _buffersize;
- unsigned long _bitmask;
+ unsigned long _bittqmask;
float * _buffer;
float _maxdelay;
unsigned int _writepos;
public:
- Synth_DELAY_impl() : _buffersize( 0 ), _bitmask( 0 ), _buffer( 0 ), _maxdelay( 0 ), _writepos( 0 )
+ Synth_DELAY_impl() : _buffersize( 0 ), _bittqmask( 0 ), _buffer( 0 ), _maxdelay( 0 ), _writepos( 0 )
{
maxdelay( 1 ); // take a one second buffer if nothing else is specified
}
@@ -85,15 +85,15 @@ public:
{
double int_pos;
double error = modf( time[i] * samplingRateFloat, &int_pos );
- unsigned long readpos1 = ( _writepos - (unsigned long)(int_pos) ) & _bitmask;
- unsigned long readpos2 = ( readpos1 - 1 ) & _bitmask; // Shouldn't this be +1? (mkretz)
+ unsigned long readpos1 = ( _writepos - (unsigned long)(int_pos) ) & _bittqmask;
+ unsigned long readpos2 = ( readpos1 - 1 ) & _bittqmask; // Shouldn't this be +1? (mkretz)
// No, it's right this way:
// ( 1 - error ) needs to be multiplied with the second
// sample; error with the first
_buffer[_writepos] = invalue[i];
outvalue[i] = _buffer[readpos1] * ( 1 - error ) + _buffer[readpos2] * error;
_writepos++;
- _writepos &= _bitmask;
+ _writepos &= _bittqmask;
}
}
@@ -106,7 +106,7 @@ public:
_maxdelay = newmaxdelay;
double n = ceil( log( double(_maxdelay * samplingRateFloat) ) / log( 2. ) );
unsigned long newbuffersize = (unsigned long)( pow( 2, n ) );
- unsigned long newbitmask = newbuffersize - 1;
+ unsigned long newbittqmask = newbuffersize - 1;
if( newbuffersize != _buffersize )
{
float *newbuffer = new float[newbuffersize];
@@ -114,22 +114,22 @@ public:
for( unsigned long i = 0; i < _buffersize; i++ ) {
newbuffer[i] = _buffer[_writepos];
_writepos++;
- _writepos &= newbitmask;
+ _writepos &= newbittqmask;
}
for( unsigned long i = _buffersize; i < newbuffersize; i++ )
newbuffer[i] = 0;
} else {
_writepos -= newbuffersize;
- _writepos &= newbitmask;
+ _writepos &= newbittqmask;
for( unsigned long i = 0; i < newbuffersize; i++ ) {
newbuffer[i] = _buffer[_writepos];
_writepos++;
- _writepos &= newbitmask;
+ _writepos &= newbittqmask;
}
}
_buffer = newbuffer;
_buffersize = newbuffersize;
- _bitmask = newbitmask;
+ _bittqmask = newbittqmask;
}
maxdelay_changed( _maxdelay );
}
diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl
index 42ff393..17332ee 100644
--- a/arts/runtime/artsbuilder.idl
+++ b/arts/runtime/artsbuilder.idl
@@ -42,7 +42,7 @@ module Arts {
* isMultiPort specifies if the port can take multiple incoming
* connections or not. This is only relevant/allowed for input ports,
* the output of all output ports may be connected to any amount of
- * receivers.
+ * tqreceivers.
*
* Ports which can take multiple connections are handled differently
* internally. (Also, artsbuilder needs to know whether to allow multi-
@@ -76,11 +76,11 @@ module Arts {
interface PortDesc {
// internal:
- void constructor(ModuleDesc parent, string name, PortType type);
+ void constructor(ModuleDesc tqparent, string name, PortType type);
// ID is guaranteed to be unique in the structure the port belongs to
readonly attribute long ID;
- readonly attribute ModuleDesc parent;
+ readonly attribute ModuleDesc tqparent;
// Name is guaranteed to be unique for each module (no two in/out-
// ports with the same name allowed)
@@ -123,11 +123,11 @@ module Arts {
interface ModuleDesc {
// internal
- void constructor(StructureDesc parent, ModuleInfo info);
+ void constructor(StructureDesc tqparent, ModuleInfo info);
// ID is guaranteed to be unique in the structure the module belongs to
readonly attribute long ID;
- readonly attribute StructureDesc parent;
+ readonly attribute StructureDesc tqparent;
readonly attribute string name;
readonly attribute sequence<PortDesc> ports;
@@ -184,15 +184,15 @@ module Arts {
interface StructurePortDesc : PortDesc {
// internal
- void constructor(StructureDesc parent, string name, PortType type);
+ void constructor(StructureDesc tqparent, string name, PortType type);
// Position: how the port is positioned when the structure is used
// as module - 0 is leftmost, higher numbers are more right
readonly attribute long x, y, position;
- readonly attribute StructureDesc parentStructure;
+ readonly attribute StructureDesc tqparentStructure;
// if the port is associated with an inherited interface of the
- // parent structure, then it should be setup here
+ // tqparent structure, then it should be setup here
attribute string inheritedInterface;
boolean moveTo(long x, long y); // returns true when successful
diff --git a/arts/runtime/moduleinfo.cc b/arts/runtime/moduleinfo.cc
index 1d20b58..7bef446 100644
--- a/arts/runtime/moduleinfo.cc
+++ b/arts/runtime/moduleinfo.cc
@@ -17,8 +17,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- Permission is also granted to link this program with the Qt
- library, treating Qt like a library that normally accompanies the
+ Permission is also granted to link this program with the TQt
+ library, treating TQt like a library that normally accompanies the
operating system kernel, whether or not that is in fact the case.
*/
diff --git a/arts/runtime/moduleinfo.h b/arts/runtime/moduleinfo.h
index 2e8e64b..2caea78 100644
--- a/arts/runtime/moduleinfo.h
+++ b/arts/runtime/moduleinfo.h
@@ -17,8 +17,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- Permission is also granted to link this program with the Qt
- library, treating Qt like a library that normally accompanies the
+ Permission is also granted to link this program with the TQt
+ library, treating TQt like a library that normally accompanies the
operating system kernel, whether or not that is in fact the case.
*/
diff --git a/arts/runtime/structurebuilder_impl.cc b/arts/runtime/structurebuilder_impl.cc
index 43e5485..c2e217e 100644
--- a/arts/runtime/structurebuilder_impl.cc
+++ b/arts/runtime/structurebuilder_impl.cc
@@ -96,7 +96,7 @@ ModuleDef StructureBuilder_impl::createTypeInfo(StructureDesc structure)
{
const Arts::PortType& type = pi->type();
- // if we inherited the port from a parent interface, we don't need to
+ // if we inherited the port from a tqparent interface, we don't need to
// list it in our interface description
if(pi->inheritedInterface().empty())
{
@@ -236,12 +236,12 @@ Structure_impl::Structure_impl(StructureDesc structureDesc,
for(ci = connections->begin(); ci != connections->end(); ci++)
{
- if(!ci->parent().isNull()) // structureport otherwise
+ if(!ci->tqparent().isNull()) // structureport otherwise
{
- Object& dest = moduleMap[ci->parent().ID()];
+ Object& dest = moduleMap[ci->tqparent().ID()];
#ifdef STRUCTBUILDER_DEBUG
cout << "connect " << mi->name() << "." << pi->name()
- << " to " << ci->parent().name()
+ << " to " << ci->tqparent().name()
<< "." << ci->name() << endl;
#endif
connect(object,pd.name(),dest,ci->name());
@@ -271,10 +271,10 @@ Structure_impl::Structure_impl(StructureDesc structureDesc,
for(ci = connections->begin(); ci != connections->end(); ci++)
{
- Object& dest = moduleMap[ci->parent().ID()];
+ Object& dest = moduleMap[ci->tqparent().ID()];
#ifdef STRUCTBUILDER_DEBUG
cout << "virtualize " << pi->name()
- << " to " << ci->parent().name() << "." << ci->name()
+ << " to " << ci->tqparent().name() << "." << ci->name()
<< endl;
#endif
diff --git a/arts/runtime/structures_impl.cc b/arts/runtime/structures_impl.cc
index 7c5a5e0..72de0de 100644
--- a/arts/runtime/structures_impl.cc
+++ b/arts/runtime/structures_impl.cc
@@ -32,11 +32,11 @@ public:
~PortDesc_impl();
inline PortDesc self() { return PortDesc::_from_base(_copy()); }
- void constructor(ModuleDesc parent, const string& name, const PortType& type);
+ void constructor(ModuleDesc tqparent, const string& name, const PortType& type);
void disconnectAll();
long ID();
- ModuleDesc parent();
+ ModuleDesc tqparent();
string name();
PortType type();
bool isConnected();
@@ -78,7 +78,7 @@ private:
public:
long ID();
- StructureDesc parent();
+ StructureDesc tqparent();
string name();
vector<PortDesc> *ports();
long height();
@@ -86,7 +86,7 @@ public:
long x();
long y();
bool moveTo( long x, long y );
- void constructor( StructureDesc parent, const ModuleInfo& info );
+ void constructor( StructureDesc tqparent, const ModuleInfo& info );
void loadFromList(const vector<string>& list);
vector<string> *saveToList();
@@ -155,7 +155,7 @@ protected:
return StructurePortDesc::_from_base(_copy());
}
public:
- void constructor(StructureDesc parent, const string& name,
+ void constructor(StructureDesc tqparent, const string& name,
const PortType& type);
~StructurePortDesc_impl();
@@ -169,7 +169,7 @@ public:
void inheritedInterface(const string& iface);
void internalSetPosition(long position);
- StructureDesc parentStructure();
+ StructureDesc tqparentStructure();
bool moveTo( long X, long Y );
void loadFromList(const vector<string>& list);
@@ -192,13 +192,13 @@ REGISTER_IMPLEMENTATION(StructurePortDesc_impl);
#define pstat \
printf("port name %s, direction %s, id %d\n",_Name.c_str(),dname(_Type.direction),_ID);
-void PortDesc_impl::constructor(ModuleDesc parent, const string& name,
+void PortDesc_impl::constructor(ModuleDesc tqparent, const string& name,
const PortType& type)
{
#if 0
- if(parent)
+ if(tqparent)
{
- char * pname = parent->Name();
+ char * pname = tqparent->Name();
describe("PortDesc."+string(pname)+string(".")+name);
}
else
@@ -208,14 +208,14 @@ void PortDesc_impl::constructor(ModuleDesc parent, const string& name,
#endif
_name = name;
_type = type;
- _parent = parent;
+ _parent = tqparent;
_isConnected = false;
_hasValue = false;
_value.type = _type.dataType;
- if(!parent.isNull())
+ if(!tqparent.isNull())
{
- StructureDesc sd = parent.parent();
+ StructureDesc sd = tqparent.tqparent();
_ID = sd.obtainID();
}
// else: assume that some smart object which derives from us will set the ID accordingly
@@ -276,7 +276,7 @@ long PortDesc_impl::ID()
return _ID;
}
-ModuleDesc PortDesc_impl::parent()
+ModuleDesc PortDesc_impl::tqparent()
{
return _parent;
}
@@ -468,11 +468,11 @@ void PortDesc_impl::disconnectFrom( PortDesc port )
_isConnected = !_connections.empty();
- ModuleDesc parent = _parent;
- if(parent.isNull())
+ ModuleDesc tqparent = _parent;
+ if(tqparent.isNull())
artsdebug("_Parent = <some structure>, isConnected = %d\n",_isConnected);
else
- artsdebug("_Parent = %s, isConnected = %d\n",parent.name().c_str(),_isConnected);
+ artsdebug("_Parent = %s, isConnected = %d\n",tqparent.name().c_str(),_isConnected);
if(found)
port.disconnectFrom(self());
@@ -484,7 +484,7 @@ long ModuleDesc_impl::ID()
return _ID;
}
-StructureDesc ModuleDesc_impl::parent()
+StructureDesc ModuleDesc_impl::tqparent()
{
return _parent;
}
@@ -549,14 +549,14 @@ long StructureDesc_impl::height()
* Query the module for it's paramenters
*/
-void ModuleDesc_impl::constructor( StructureDesc parent,
+void ModuleDesc_impl::constructor( StructureDesc tqparent,
const Arts::ModuleInfo& info )
{
_name = info.name;
_x = -1; // no position assigned
_y = -1;
- _ID = parent.obtainID();
- _parent = parent;
+ _ID = tqparent.obtainID();
+ _parent = tqparent;
_isInterface = info.isInterface;
_isStructure = info.isStructure;
@@ -1134,12 +1134,12 @@ void StructureDesc_impl::moveStructurePortDesc(StructurePortDesc
portdesc.internalSetPosition(newposition);
}
-void StructurePortDesc_impl::constructor(StructureDesc parent,
+void StructurePortDesc_impl::constructor(StructureDesc tqparent,
const string& name, const PortType& type)
{
PortDesc_impl::constructor(ModuleDesc::null(),name,type);
- _parentStructure = parent;
- _ID = parent.obtainID();
+ _parentStructure = tqparent;
+ _ID = tqparent.obtainID();
_x = 0;
_y = 0;
_position = 0;
@@ -1167,18 +1167,18 @@ long StructurePortDesc_impl::position()
void StructurePortDesc_impl::lowerPosition()
{
- StructureDesc parent = _parentStructure; // weak reference
+ StructureDesc tqparent = _parentStructure; // weak reference
- if(!parent.isNull())
- parent.moveStructurePortDesc(self(), _position-1);
+ if(!tqparent.isNull())
+ tqparent.moveStructurePortDesc(self(), _position-1);
}
void StructurePortDesc_impl::raisePosition()
{
- StructureDesc parent = _parentStructure; // weak reference
+ StructureDesc tqparent = _parentStructure; // weak reference
- if(!parent.isNull())
- parent.moveStructurePortDesc(self(), _position+1);
+ if(!tqparent.isNull())
+ tqparent.moveStructurePortDesc(self(), _position+1);
}
void StructurePortDesc_impl::rename(const string& newname)
@@ -1202,7 +1202,7 @@ void StructurePortDesc_impl::internalSetPosition(long position)
_position = position;
}
-StructureDesc StructurePortDesc_impl::parentStructure()
+StructureDesc StructurePortDesc_impl::tqparentStructure()
{
return _parentStructure;
}
diff --git a/arts/tools/Makefile.am b/arts/tools/Makefile.am
index e503d54..806856a 100644
--- a/arts/tools/Makefile.am
+++ b/arts/tools/Makefile.am
@@ -57,10 +57,10 @@ libartscontrolsupport_la_LIBADD = \
bin_PROGRAMS = artscontrol
artscontrol_SOURCES = main.cpp levelmeters.cpp
-artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow
artscontrol_LDADD = libartscontrolsupport.la \
$(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KFILE) \
- -lqtmcop -lartsflow_idl -lsoundserver_idl -lartskde
+ -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde
xdg_apps_DATA = artscontrol.desktop
diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp
index c483beb..9075f87 100644
--- a/arts/tools/artsactions.cpp
+++ b/arts/tools/artsactions.cpp
@@ -36,8 +36,8 @@
#include "environmentview.h"
#include "mediatypesview.h"
-ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* parent, const char* name )
- : TQObject( parent,name )
+ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* tqparent, const char* name )
+ : TQObject( tqparent,name )
, _kartsserver( server )
, _actioncollection( col )
, _a_sv( 0 ), _a_am( 0 ), _a_asv( 0 ), _a_mmv( 0 ), _a_ev( 0 ), _a_mtv( 0 )
@@ -70,7 +70,7 @@ KAction* ArtsActions::actionAudioManager() {
return _a_am;
}
KAction* ArtsActions::actionArtsStatusView() {
- if ( !_a_asv ) _a_asv = new KAction( i18n( "aRts &Status" ), "artscontrol", KShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" );
+ if ( !_a_asv ) _a_asv = new KAction( i18n( "aRts &tqStatus" ), "artscontrol", KShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" );
return _a_asv;
}
KAction* ArtsActions::actionMidiManagerView() {
diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h
index 441d737..b6f7783 100644
--- a/arts/tools/artsactions.h
+++ b/arts/tools/artsactions.h
@@ -34,9 +34,10 @@ class MidiManagerView;
class EnvironmentView;
class MediaTypesView;
-class KDE_EXPORT ArtsActions : public QObject
+class KDE_EXPORT ArtsActions : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
Constructs a ArtsActions-object.
@@ -47,7 +48,7 @@ public:
@param artsserver a pointer to a existing KArtsServer. If 0 a new is created.
@param actioncollection the KActionCollection all the actions should belong to. Names of the actions are then: artssupport_*
- @param qwidget the parent QWidget
+ @param qwidget the tqparent TQWidget
@param name the name of the object
*/
ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 );
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index e4a7e16..490366d 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -29,18 +29,18 @@
extern "C"
{
- KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
+ KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString configFile)
{
KGlobal::locale()->insertCatalogue("artscontrol");
return new ArtsControlApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/,
- parent, "artscontrolapplet");
+ tqparent, "artscontrolapplet");
}
}
-ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name)
+ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) : KPanelApplet(configFile, type, actions, tqparent, name)
{
- //kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<parent<<", const char* "<<name<<" )"<<endl;
+ //kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<tqparent<<", const char* "<<name<<" )"<<endl;
// Get the current application configuration handle
ksConfig = config();
@@ -48,20 +48,20 @@ ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int
if( !p->barts ) KMessageBox::information(0, i18n("Something with the ArtsServer went wrong. You probably need to restart aRts and then reload this applet."));
setCustomMenu(p->menu);
- p->layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
- p->layout->setSpacing( 2 );
+ p->tqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
+ p->tqlayout->setSpacing( 2 );
if( p->barts ) {
p->vu = Arts::StereoVolumeControlGui( p->volume );
p->vu.label().fontsize( 8 );
p->vuw = new KArtsWidget( p->vu, this );
p->vuw->setMinimumSize( 16,16 );
- p->layout->addWidget( p->vuw );
+ p->tqlayout->addWidget( p->vuw );
}
- p->layout->activate();
+ p->tqlayout->activate();
- TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) );
+ TQTimer::singleShot( 100, this, TQT_SLOT( supdatetqlayout() ) );
kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl;
}
@@ -93,12 +93,12 @@ kdDebug()<<k_funcinfo<<endl;
int ArtsControlApplet::widthForHeight( int h ) const {
kdDebug()<<"ArtsControlApplet::widthForHeight( int "<<h<<" )"<<endl;
- return p->layout->sizeHint().width();
+ return p->tqlayout->tqsizeHint().width();
}
int ArtsControlApplet::heightForWidth( int w ) const {
kdDebug()<<"ArtsControlApplet::heightForWidth( int "<<w<<" )"<<endl;
- return p->layout->sizeHint().height();
+ return p->tqlayout->tqsizeHint().height();
}
void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) {
@@ -122,12 +122,12 @@ kdDebug()<<k_funcinfo<<" position()="<<position()<<endl;
{
case pTop:
case pBottom:
- p->layout->setDirection( TQBoxLayout::LeftToRight );
+ p->tqlayout->setDirection( TQBoxLayout::LeftToRight );
if ( p->barts ) p->vu.direction( Arts::LeftToRight );
break;
case pRight:
case pLeft:
- p->layout->setDirection( TQBoxLayout::TopToBottom );
+ p->tqlayout->setDirection( TQBoxLayout::TopToBottom );
if ( p->barts ) p->vu.direction( Arts::TopToBottom );
break;
default: break;
@@ -140,23 +140,23 @@ kdDebug() << k_funcinfo << endl;
svinline = new FFTScopeView( arts->server(), _parent );
svinline->setMargin( 2 ); svinline->setLineWidth( 2 ); svinline->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
connect( svinline, TQT_SIGNAL( closed() ), this, TQT_SLOT( SVinline() ) );
- layout->addWidget( svinline );
+ tqlayout->addWidget( svinline );
} else {
delete svinline;
svinline = 0;
}
- _parent->supdatelayout();
+ _parent->supdatetqlayout();
}
void ArtsControlAppletPrivate::moreBars() { vu.left().count( vu.left().count()+10 ); vu.right().count( vu.right().count()+10 ); }
void ArtsControlAppletPrivate::lessBars() { vu.left().count( vu.left().count()-10 ); vu.right().count( vu.right().count()-10 ); }
-void ArtsControlAppletPrivate::styleNormalBars() { vu.left().style( Arts::lmNormalBars ); vu.right().style( Arts::lmNormalBars ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleFireBars() { vu.left().style( Arts::lmFireBars ); vu.right().style( Arts::lmFireBars ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleLineBars() { vu.left().style( Arts::lmLineBars ); vu.right().style( Arts::lmLineBars ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleLEDs() { vu.left().style( Arts::lmLEDs ); vu.right().style( Arts::lmLEDs ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleAnalog() { vu.left().style( Arts::lmAnalog ); vu.right().style( Arts::lmAnalog ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleSmall() { vu.left().style( Arts::lmSmall ); vu.right().style( Arts::lmSmall ); _parent->supdatelayout(); }
+void ArtsControlAppletPrivate::styleNormalBars() { vu.left().style( Arts::lmNormalBars ); vu.right().style( Arts::lmNormalBars ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleFireBars() { vu.left().style( Arts::lmFireBars ); vu.right().style( Arts::lmFireBars ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleLineBars() { vu.left().style( Arts::lmLineBars ); vu.right().style( Arts::lmLineBars ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleLEDs() { vu.left().style( Arts::lmLEDs ); vu.right().style( Arts::lmLEDs ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleAnalog() { vu.left().style( Arts::lmAnalog ); vu.right().style( Arts::lmAnalog ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleSmall() { vu.left().style( Arts::lmSmall ); vu.right().style( Arts::lmSmall ); _parent->supdatetqlayout(); }
// vim: sw=4 ts=4
#include "artscontrolapplet.moc"
diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h
index 9efe5eb..ab68346 100644
--- a/arts/tools/artscontrolapplet.h
+++ b/arts/tools/artscontrolapplet.h
@@ -31,6 +31,7 @@ class ArtsControlAppletPrivate;
class ArtsControlApplet : public KPanelApplet
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Construct a @ref KPanelApplet just like any other widget.
@@ -38,8 +39,8 @@ public:
* @param configFile The configFile handed over in the factory function.
* @param Type The applet @ref type().
* @param actions Standard RMB menu actions supported by the applet (see @ref action() ).
- * @param parent The pointer to the parent widget handed over in the factory function.
- * @param name A Qt object name for your applet.
+ * @param tqparent The pointer to the tqparent widget handed over in the factory function.
+ * @param name A TQt object name for your applet.
**/
ArtsControlApplet(const TQString& configFile, Type t = Normal, int = 0,
TQWidget * = 0, const char * = 0);
@@ -119,7 +120,7 @@ protected:
void positionChange( Position );
public slots:
- void supdatelayout() { emit updateLayout(); }
+ void supdatetqlayout() { emit updateLayout(); }
protected slots:
void resetLayout();
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index 2b681b9..2f7c553 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -47,11 +47,12 @@ class VolumeSlider;
class KDE_EXPORT ArtsControlAppletPrivate : public TQObject {
Q_OBJECT
+ TQ_OBJECT
private:
ArtsControlApplet *_parent;
ArtsActions* _artsactions;
public:
- TQBoxLayout *layout;
+ TQBoxLayout *tqlayout;
KArtsServer *arts;
KArtsDispatcher *dispatcher;
Arts::StereoVolumeControl volume;
@@ -62,12 +63,12 @@ public:
Arts::StereoVolumeControlGui vu;
KPopupMenu *menu;
- KAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
+ KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall;
- ArtsControlAppletPrivate( ArtsControlApplet *parent )
- : TQObject(parent)
- , _parent( parent )
+ ArtsControlAppletPrivate( ArtsControlApplet *tqparent )
+ : TQObject(tqparent)
+ , _parent( tqparent )
, barts( false )
, bInUpdate( false )
{
@@ -77,7 +78,7 @@ public:
if( barts ) volume = arts->server().outVolume();
svinline=0;
- _artsactions = new ArtsActions( arts, 0, parent );
+ _artsactions = new ArtsActions( arts, 0, tqparent );
menu = new KPopupMenu( 0 );
_showSV = _artsactions->actionScopeView();
@@ -86,8 +87,8 @@ public:
_showSVinline->plug( menu );
_showAM = _artsactions->actionAudioManager();
_showAM->plug( menu );
- _showArtsStatus = _artsactions->actionArtsStatusView();
- _showArtsStatus->plug( menu );
+ _showArtstqStatus = _artsactions->actionArtsStatusView();
+ _showArtstqStatus->plug( menu );
_showMidiManager = _artsactions->actionMidiManagerView();
_showMidiManager->plug( menu );
_showEnvironment = _artsactions->actionEnvironmentView();
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index eff4f6f..73debf8 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -37,7 +37,7 @@ using namespace std;
* as this is an 1:1 port of an old arts-0.3.4.1 artsbuilable visual widget,
* you'll see some porting artefacts, and it's not elegance itself ;)
*/
-Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name )
+Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name )
{
this->setCaption( i18n( "Audio Manager" ) );
this->setIcon( MainBarIcon( "artsaudiomanager", 32 ) );
@@ -72,14 +72,14 @@ void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget)
}
#endif
-void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
+void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/)
{
/************************************************************************
* From Gui_INSTRUMENT_MAPPER:
*
- * I am still not sure wether this kind of putting yourself into a parent
- * widget (with own layout etc.) is a good idea (there may not even be
- * a singe call to setParent, because there is no parent).
+ * I am still not sure wether this kind of putting yourself into a tqparent
+ * widget (with own tqlayout etc.) is a good idea (there may not even be
+ * a singe call to setParent, because there is no tqparent).
*
* But the "how to write aRts widgets"-stuff will need some experiments,
* so lets try that method...
@@ -90,12 +90,12 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
* else would be appropriate. Check that. FIXME
************************************************************************/
- TQVBoxLayout *mainlayout = new TQVBoxLayout(parent);
- /*TQHBoxLayout *contentslayout = new TQHBoxLayout;*/
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(tqparent);
+ /*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/
// list
- listview = new KListView(parent);
+ listview = new KListView(tqparent);
listview->addColumn(i18n("Title"),175);
listview->addColumn(i18n("Type"),50);
@@ -106,11 +106,11 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy,
TQT_SLOT(edit(TQListViewItem *)));
- mainlayout->addWidget(listview);
+ maintqlayout->addWidget(listview);
- mainlayout->activate();
- //mainlayout->freeze();
- ParentWidget = parent;
+ maintqlayout->activate();
+ //maintqlayout->freeze();
+ ParentWidget = tqparent;
}
void Gui_AUDIO_MANAGER::tick()
@@ -178,8 +178,8 @@ void GuiAudioManagerProxy::edit(TQListViewItem *item)
gim->edit(item);
}
-AudioManagerItem::AudioManagerItem(TQListView *parent, TQString a,
- TQString b, TQString c, long ID) :TQListViewItem(parent,a,b,c)
+AudioManagerItem::AudioManagerItem(TQListView *tqparent, TQString a,
+ TQString b, TQString c, long ID) :TQListViewItem(tqparent,a,b,c)
{
_ID = ID;
}
diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h
index bef1c46..5a23092 100644
--- a/arts/tools/audiomanager.h
+++ b/arts/tools/audiomanager.h
@@ -37,6 +37,7 @@ class TQBoxLayout;
class Gui_AUDIO_MANAGER : public Template_ArtsView
{
Q_OBJECT
+ TQ_OBJECT
protected:
TQWidget *ParentWidget;
KListView *listview;
@@ -50,7 +51,7 @@ public:
Gui_AUDIO_MANAGER( TQWidget* =0, const char* =0 );
~Gui_AUDIO_MANAGER();
- void setParent(TQWidget *Parent,TQBoxLayout *layout);
+ void setParent(TQWidget *Parent,TQBoxLayout *tqlayout);
void edit(TQListViewItem *item);
public slots:
@@ -59,6 +60,7 @@ public slots:
class GuiAudioManagerProxy :public TQObject {
Q_OBJECT
+ TQ_OBJECT
Gui_AUDIO_MANAGER *gim;
public:
GuiAudioManagerProxy(Gui_AUDIO_MANAGER *gim);
@@ -69,7 +71,7 @@ public slots:
class AudioManagerItem : public TQListViewItem {
long _ID;
public:
- AudioManagerItem(TQListView *parent, TQString a, TQString b,
+ AudioManagerItem(TQListView *tqparent, TQString a, TQString b,
TQString c, long ID);
~AudioManagerItem();
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index cb005f4..a4f96ba 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -39,36 +39,36 @@
using namespace std;
static void min_size(TQWidget *w) {
- w->setMinimumSize(w->sizeHint());
+ w->setMinimumSize(w->tqsizeHint());
}
-ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
- : KDialog(parent,"X", TRUE)
+ChooseBusDlg::ChooseBusDlg(TQWidget *tqparent)
+ : KDialog(tqparent,"X", TRUE)
, _newbusitemindex( -1 )
{
setCaption(i18n("Choose Bus"));
- TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
// caption label: "Synthesis running..."
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *captionlabel = new TQLabel(this);
TQFont labelfont(captionlabel->font());
labelfont.setPointSize(labelfont.pointSize()*3/2);
captionlabel->setFont(labelfont);
captionlabel->setText(TQString(" ")+i18n("Available busses:")+TQString(" "));
- captionlabel->setAlignment(AlignCenter);
+ captionlabel->tqsetAlignment(AlignCenter);
min_size(captionlabel);
- mainlayout->addWidget(captionlabel);
+ maintqlayout->addWidget(captionlabel);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler2);
+ maintqlayout->addWidget(ruler2);
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
// listwidget
@@ -89,44 +89,44 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
if( listbox->count() > 0 )
listbox->setCurrentItem( 0 );
- mainlayout->addWidget(listbox);
+ maintqlayout->addWidget(listbox);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler);
+ maintqlayout->addSpacing(5);
// new bus lineedit
- TQBoxLayout * layout2 = new TQHBoxLayout( mainlayout );
- //mainlayout->addLayout( layout2 );
+ TQBoxLayout * tqlayout2 = new TQHBoxLayout( maintqlayout );
+ //maintqlayout->addLayout( tqlayout2 );
TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this );
- layout2->addWidget( newbuslabel );
+ tqlayout2->addWidget( newbuslabel );
lineedit = new KLineEdit( this );
connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) );
- layout2->addWidget( lineedit );
+ tqlayout2->addWidget( lineedit );
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler3 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler3);
+ maintqlayout->addWidget(ruler3);
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
// buttons
- mainlayout->addSpacing(5);
- TQHBoxLayout *buttonlayout = new TQHBoxLayout( mainlayout );
- //mainlayout->addLayout(buttonlayout);
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout( maintqlayout );
+ //maintqlayout->addLayout(buttontqlayout);
+ maintqlayout->addSpacing(5);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
bbox->addStretch(1);
TQPushButton * okbutton = bbox->addButton(KStdGuiItem::ok());
@@ -136,12 +136,12 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
- bbox->layout();
+ bbox->tqlayout();
- buttonlayout->addWidget(bbox);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addWidget(bbox);
+ buttontqlayout->addSpacing(5);
- mainlayout->freeze();
+ maintqlayout->freeze();
}
TQString ChooseBusDlg::result()
diff --git a/arts/tools/choosebusdlg.h b/arts/tools/choosebusdlg.h
index 6f1a506..9ba29b8 100644
--- a/arts/tools/choosebusdlg.h
+++ b/arts/tools/choosebusdlg.h
@@ -30,12 +30,13 @@ class TQPushButton;
class ChooseBusDlg :public KDialog {
Q_OBJECT
+ TQ_OBJECT
TQListBox *listbox;
KLineEdit * lineedit;
int _newbusitemindex;
public:
- ChooseBusDlg(TQWidget *parent);
+ ChooseBusDlg(TQWidget *tqparent);
public slots:
TQString result();
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index 9cedfed..acbb208 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -57,18 +57,18 @@ public:
printf("~ItemView()\n");
}
TQString text() const {
- return TQString::fromLatin1(item._interfaceName().c_str());
+ return TQString::tqfromLatin1(item._interfaceName().c_str());
}
};
-EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ), container(container)
+EnvironmentView::EnvironmentView( Container container, TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name ), container(container)
{
this->setCaption( i18n( "Environment" ) );
this->setIcon( MainBarIcon( "artsenvironment", 32 ) );
TQVBoxLayout* _layout = new TQVBoxLayout( this );
_layout->setAutoAdd( true );
defaultEnvFileName = DEFAULT_ENV_FILENAME;
- defaultEnvFileName.replace('~', TQDir::homeDirPath());
+ defaultEnvFileName.tqreplace('~', TQDir::homeDirPath());
listBox = new KListBox(this);
update();
connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)),
@@ -84,11 +84,11 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c
connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delItem()));
TQPushButton *loadButton = new
- TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this);
+ TQPushButton(i18n("Load %1").tqarg(DEFAULT_ENV_FILENAME), this);
connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load()));
TQPushButton *saveButton = new
- TQPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this);
+ TQPushButton(i18n("Save %1").tqarg(DEFAULT_ENV_FILENAME), this);
connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save()));
show();
}
diff --git a/arts/tools/environmentview.h b/arts/tools/environmentview.h
index e4b3b90..f45347f 100644
--- a/arts/tools/environmentview.h
+++ b/arts/tools/environmentview.h
@@ -33,6 +33,7 @@ class KListBox;
class EnvironmentView : public Template_ArtsView {
Q_OBJECT
+ TQ_OBJECT
protected:
Arts::Environment::Container container;
KListBox *listBox;
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index fcaa530..1d5c534 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -37,8 +37,8 @@
using namespace std;
using namespace Arts;
-FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* parent )
- : Template_ArtsView( parent )
+FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* tqparent )
+ : Template_ArtsView( tqparent )
, server( server )
, scopeData( 0 )
{
@@ -80,11 +80,11 @@ kdDebug()<<k_funcinfo<<endl;
connect( updatetimer,TQT_SIGNAL( timeout() ),this,TQT_SLOT( updateScope() ) );
_artsactions = new ArtsActions( 0, 0, this );
- _moreBars = ArtsActions::actionMoreBars( this, TQT_SLOT( moreBars() ), 0 );
- _lessBars = ArtsActions::actionLessBars( this, TQT_SLOT( lessBars() ), 0 );
+ _moreBars = ArtsActions::actionMoreBars( TQT_TQOBJECT(this), TQT_SLOT( moreBars() ), 0 );
+ _lessBars = ArtsActions::actionLessBars( TQT_TQOBJECT(this), TQT_SLOT( lessBars() ), 0 );
_menu = new KPopupMenu( 0 );
_moreBars->plug( _menu ); _lessBars->plug( _menu );
- _substyle = new KAction( i18n( "Substyle" ), "", KShortcut(), this, TQT_SLOT( substyle() ), this );
+ _substyle = new KAction( i18n( "Substyle" ), "", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) );
_substyle->plug( _menu );
_menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() );
diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h
index 945c52e..de8ed7f 100644
--- a/arts/tools/fftscopeview.h
+++ b/arts/tools/fftscopeview.h
@@ -40,6 +40,7 @@ class ArtsActions;
class KDE_EXPORT FFTScopeView : public Template_ArtsView {
Q_OBJECT
+ TQ_OBJECT
protected:
Arts::StereoFFTScope scopefx;
Arts::SimpleSoundServer server;
diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp
index 1d0b080..ae7834a 100644
--- a/arts/tools/levelmeters.cpp
+++ b/arts/tools/levelmeters.cpp
@@ -7,8 +7,8 @@
const int PeakBar::peakMillis=1500;
-PeakBar::PeakBar(TQWidget *parent)
- : ACLevelMeter(parent)
+PeakBar::PeakBar(TQWidget *tqparent)
+ : ACLevelMeter(tqparent)
, maxValue( 0.0f )
, minValue( 0.0f )
{
@@ -20,7 +20,7 @@ PeakBar::PeakBar(TQWidget *parent)
lastValues.setAutoDelete( TRUE );
setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
- setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
setBackgroundMode(NoBackground);
setMinimumSize(frameWidth()+7, 70);
}
@@ -30,7 +30,7 @@ void PeakBar::frameChanged() {
TQFrame::frameChanged();
}
-TQSize PeakBar::sizeHint() const {
+TQSize PeakBar::tqsizeHint() const {
return TQSize(13, 250);
}
@@ -104,25 +104,25 @@ void PeakBar::setValue(float f) {
lastValues.append(new Observation(f));
- repaint();
+ tqrepaint();
}
// -------------------------------------------------------------
-PeakLevelMeters::PeakLevelMeters(TQWidget *parent):
- StereoLevelMeter(parent), left(this), right(this), scaleView(this)
+PeakLevelMeters::PeakLevelMeters(TQWidget *tqparent):
+ StereoLevelMeter(tqparent), left(this), right(this), scaleView(this)
{
- TQBoxLayout *layout= new TQHBoxLayout(this);
- layout->addWidget(&left);
- // layout->setStretchFactor(&left, 0);
- layout->addWidget(&right);
- // layout->setStretchFactor(&right, 0);
- layout->addWidget(&scaleView);
- // layout->setStretchFactor(&scaleView, 0);
+ TQBoxLayout *tqlayout= new TQHBoxLayout(this);
+ tqlayout->addWidget(&left);
+ // tqlayout->setStretchFactor(&left, 0);
+ tqlayout->addWidget(&right);
+ // tqlayout->setStretchFactor(&right, 0);
+ tqlayout->addWidget(&scaleView);
+ // tqlayout->setStretchFactor(&scaleView, 0);
left.setLineWidth(2);
right.setLineWidth(2);
scaleView.setScaleMargins(right.frameWidth());
- setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
setDbRange(36);
}
@@ -142,17 +142,17 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) {
right.setValue(f);
}
-ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) {
+ScaleView::ScaleView(TQWidget *tqparent): TQFrame(tqparent) {
font.setPixelSize(10);
- setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
}
void ScaleView::setDbRange(int db) {
dbRange= db;
- repaint();
+ tqrepaint();
}
-TQSize ScaleView::sizeHint() const {
+TQSize ScaleView::tqsizeHint() const {
return TQSize(TQFontMetrics(font).width("-88")+8, 250);
}
@@ -187,7 +187,7 @@ void ScaleView::drawContents(TQPainter *p) {
// -------------------------------------------------------------
-LedMeter::LedMeter(TQWidget *parent, bool blueState) : ACLevelMeter(parent) {
+LedMeter::LedMeter(TQWidget *tqparent, bool blueState) : ACLevelMeter(tqparent) {
setBackgroundColor(black);
TQBoxLayout * l = new TQVBoxLayout( this );
l->setAutoAdd(TRUE);
@@ -223,12 +223,12 @@ void LedMeter::setValue(float f)
// -------------------------------------------------------------
-StereoLedMeters::StereoLedMeters(TQWidget *parent)
- : StereoLevelMeter(parent), left(this), right(this)
+StereoLedMeters::StereoLedMeters(TQWidget *tqparent)
+ : StereoLevelMeter(tqparent), left(this), right(this)
{
- TQBoxLayout *layout= new TQHBoxLayout(this);
- layout->addWidget(&left);
- layout->addWidget(&right);
+ TQBoxLayout *tqlayout= new TQHBoxLayout(this);
+ tqlayout->addWidget(&left);
+ tqlayout->addWidget(&right);
}
void StereoLedMeters::setValues(float leftVal, float rightVal) {
diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h
index 638d0d9..64c41c0 100644
--- a/arts/tools/levelmeters.h
+++ b/arts/tools/levelmeters.h
@@ -44,8 +44,9 @@ inline float DBToLevel(float db) {
*/
class ACLevelMeter : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
public:
- ACLevelMeter(TQWidget *parent): TQFrame(parent) {}
+ ACLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {}
public slots:
virtual void setValue(float f) = 0;
};
@@ -55,8 +56,9 @@ public slots:
*/
class StereoLevelMeter : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
public:
- StereoLevelMeter(TQWidget *parent): TQFrame(parent) {}
+ StereoLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {}
public slots:
virtual void setValues(float left, float right) = 0;
};
@@ -67,6 +69,7 @@ public slots:
*/
class PeakBar : public ACLevelMeter {
Q_OBJECT
+ TQ_OBJECT
bool clipped;
protected:
@@ -89,9 +92,9 @@ protected:
void frameChanged();
public:
- PeakBar(TQWidget *parent);
+ PeakBar(TQWidget *tqparent);
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void drawContents(TQPainter *p);
virtual void setValue(float f);
@@ -102,15 +105,16 @@ public:
*/
class ScaleView : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
protected:
TQFont font;
int dbRange;
int upperMargin, lowerMargin;
public:
- ScaleView(TQWidget *parent);
+ ScaleView(TQWidget *tqparent);
void setDbRange(int db);
void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; }
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void drawContents(TQPainter *p);
};
@@ -121,13 +125,14 @@ public:
*/
class PeakLevelMeters : public StereoLevelMeter {
Q_OBJECT
+ TQ_OBJECT
protected:
int dbRange;
PeakBar left, right;
ScaleView scaleView;
public:
- PeakLevelMeters(TQWidget *parent);
+ PeakLevelMeters(TQWidget *tqparent);
public slots:
void setValues(float leftVal, float rightVal);
@@ -143,11 +148,12 @@ class KLed;
*/
class LedMeter : public ACLevelMeter {
Q_OBJECT
+ TQ_OBJECT
protected:
KLed *leds[12];
public:
- LedMeter(TQWidget *parent, bool blueState = false);
+ LedMeter(TQWidget *tqparent, bool blueState = false);
void setValue(float f);
};
@@ -156,11 +162,12 @@ public:
*/
class StereoLedMeters : public StereoLevelMeter {
Q_OBJECT
+ TQ_OBJECT
protected:
LedMeter left, right;
public:
- StereoLedMeters(TQWidget *parent);
+ StereoLedMeters(TQWidget *tqparent);
public slots:
void setValues(float left, float right);
};
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index 60df8f1..5492f38 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -82,7 +82,7 @@ FreeVerbView::~FreeVerbView() {
}
-VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent)
+VControl::VControl( KArtsServer* artsserver, TQWidget *tqparent) : TQFrame(tqparent)
, freeVerbView(0)
, server( artsserver )
{
@@ -158,7 +158,7 @@ void MainWindow::toggleVolumeBar() {
vc->useOldVolumeBar(showOldVolumeDisplay->isChecked());
}
-MainWindow::MainWindow() : KMainWindow(0), kartsserver( new KArtsServer( this ) ) {
+MainWindow::MainWindow() : KMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) {
kdDebug() << k_funcinfo << endl;
connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) );
@@ -172,11 +172,11 @@ kdDebug() << k_funcinfo << endl;
( void ) artsactions->actionMidiManagerView();
( void ) artsactions->actionEnvironmentView();
( void ) artsactions->actionMediaTypesView();
- ( void ) new KAction( i18n("Toggle Free&Verb"), 0, vc, TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
+ ( void ) new KAction( i18n("Toggle Free&Verb"), 0, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
showOldVolumeDisplay=
- new KToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, this,
+ new KToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this),
TQT_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" );
- ( void ) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
+ ( void ) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
createGUI("artscontrol.rc");
resize(20,300);
diff --git a/arts/tools/main.h b/arts/tools/main.h
index 2770b05..3b52dad 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -49,6 +49,7 @@ class VScale;
class FreeVerbView : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
protected:
Arts::Synth_FREEVERB freeverb;
Arts::SimpleSoundServer server;
@@ -66,6 +67,7 @@ class KArtsWidget;
class VControl : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
protected:
class StereoLevelMeter *stereoMeter;
FreeVerbView *freeVerbView;
@@ -77,7 +79,7 @@ protected:
TQBoxLayout *boxLayout;
public:
- VControl( KArtsServer*, TQWidget *parent);
+ VControl( KArtsServer*, TQWidget *tqparent);
~VControl();
public slots:
@@ -91,6 +93,7 @@ private slots:
class MainWindow : public KMainWindow {
Q_OBJECT
+ TQ_OBJECT
protected:
VControl *vc;
KToggleAction *showOldVolumeDisplay;
diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp
index 9353cda..fb8938d 100644
--- a/arts/tools/mediatypesview.cpp
+++ b/arts/tools/mediatypesview.cpp
@@ -33,7 +33,7 @@
using namespace std;
using namespace Arts;
-MediaTypesView::MediaTypesView( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name )
+MediaTypesView::MediaTypesView( TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name )
{
this->setCaption( i18n( "Available Media Types" ) );
this->setIcon( MainBarIcon( "artsmediatypes", 32 ) );
diff --git a/arts/tools/mediatypesview.h b/arts/tools/mediatypesview.h
index e61338c..8a0b3af 100644
--- a/arts/tools/mediatypesview.h
+++ b/arts/tools/mediatypesview.h
@@ -28,6 +28,7 @@
class MediaTypesView : public Template_ArtsView {
Q_OBJECT
+ TQ_OBJECT
public:
MediaTypesView( TQWidget* =0, const char* =0 );
~MediaTypesView();
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 97867cd..87cc2ea 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -63,29 +63,29 @@ static TQStringList listFiles(TQString directory, TQString extension)
return result;
}
-MidiInstDlg::MidiInstDlg(TQWidget *parent)
- :TQDialog(parent,"instrument",TRUE)
+MidiInstDlg::MidiInstDlg(TQWidget *tqparent)
+ :TQDialog(tqparent,"instrument",TRUE)
{
- TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
// caption label: title
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *captionlabel = new TQLabel(this);
TQFont labelfont(captionlabel->font());
labelfont.setPointSize(labelfont.pointSize()*3/2);
captionlabel->setFont(labelfont);
captionlabel->setText(TQString(" ")+i18n("Instrument")+TQString(" "));
- captionlabel->setAlignment(AlignCenter);
+ captionlabel->tqsetAlignment(AlignCenter);
//min_size(captionlabel);
- mainlayout->addWidget(captionlabel);
+ maintqlayout->addWidget(captionlabel);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler2);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler2);
+ maintqlayout->addSpacing(5);
// combobox
@@ -95,10 +95,10 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
TQStringList::Iterator it;
for ( it = instruments.begin(); it != instruments.end(); it++ ) {
TQString modname = *it;
- TQString prefix = TQString::fromLatin1("instrument_");
+ TQString prefix = TQString::tqfromLatin1("instrument_");
if (modname.length() > 5)
modname.truncate(modname.length()-5); // kill .arts extension
- if ( (modname.startsWith(prefix)) && (!modname.contains("_GUI")) )
+ if ( (modname.startsWith(prefix)) && (!modname.tqcontains("_GUI")) )
box->insertItem(modname.mid(prefix.length()));
//kdDebug() << "inserted instrument: " << modname.mid(prefix.length()) << endl;
}
@@ -108,7 +108,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
for ( it = maps.begin(); it != maps.end(); it++ ) {
TQString modname = *it;
- TQString prefix = TQString::fromLatin1("instrument_");
+ TQString prefix = TQString::tqfromLatin1("instrument_");
if (modname.length() > 9)
modname.truncate(modname.length()-9); // kill .arts-map extension
if (modname.startsWith(prefix))
@@ -116,37 +116,37 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
//kdDebug() << "inserted map: " << modname.mid(prefix.length()) << endl;
}
- mainlayout->addWidget(box);
+ maintqlayout->addWidget(box);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler);
+ maintqlayout->addSpacing(5);
// buttons
- TQHBoxLayout *buttonlayout = new TQHBoxLayout;
- mainlayout->addSpacing(5);
- mainlayout->addLayout(buttonlayout);
- mainlayout->addSpacing(5);
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+ maintqlayout->addSpacing(5);
+ maintqlayout->addLayout(buttontqlayout);
+ maintqlayout->addSpacing(5);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
bbox->addStretch(1);
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
- bbox->layout();
+ bbox->tqlayout();
- buttonlayout->addWidget(bbox);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addWidget(bbox);
+ buttontqlayout->addSpacing(5);
- mainlayout->freeze();
+ maintqlayout->freeze();
}
TQCString MidiInstDlg::filename()
@@ -157,12 +157,12 @@ TQCString MidiInstDlg::filename()
TQStringList::Iterator it;
for ( it = artsPath.begin(); it != artsPath.end(); it++ ) {
- TQString pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts");
+ TQString pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts");
TQFileInfo fi(pathname);
if (fi.exists() && fi.isReadable())
return TQFile::encodeName(pathname);
- pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts-map");
+ pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts-map");
fi.setFile(pathname);
if (fi.exists() && fi.isReadable())
return TQFile::encodeName(pathname);
diff --git a/arts/tools/midiinstdlg.h b/arts/tools/midiinstdlg.h
index 5773551..0e42522 100644
--- a/arts/tools/midiinstdlg.h
+++ b/arts/tools/midiinstdlg.h
@@ -28,9 +28,10 @@
class MidiInstDlg :public TQDialog {
Q_OBJECT
+ TQ_OBJECT
TQComboBox *box;
public:
- MidiInstDlg(TQWidget *parent);
+ MidiInstDlg(TQWidget *tqparent);
TQCString filename();
public slots:
void help();
diff --git a/arts/tools/midimanagerdlg.ui b/arts/tools/midimanagerdlg.ui
index 78941e4..1a30f5d 100644
--- a/arts/tools/midimanagerdlg.ui
+++ b/arts/tools/midimanagerdlg.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>MidiManagerDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>MidiManagerDlg</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -33,7 +33,7 @@
<string>MIDI inputs:</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>TextLabel1_2</cstring>
</property>
@@ -41,17 +41,17 @@
<string>MIDI outputs:</string>
</property>
</widget>
- <widget class="QListBox" row="1" column="0">
+ <widget class="TQListBox" row="1" column="0">
<property name="name">
<cstring>inputsListBox</cstring>
</property>
</widget>
- <widget class="QListBox" row="1" column="2">
+ <widget class="TQListBox" row="1" column="2">
<property name="name">
<cstring>outputsListBox</cstring>
</property>
</widget>
- <widget class="QFrame" row="2" column="0" rowspan="1" colspan="3">
+ <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>Frame5</cstring>
</property>
@@ -64,9 +64,9 @@
<property name="lineWidth">
<number>0</number>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@@ -78,7 +78,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QPushButton" row="0" column="0">
+ <widget class="TQPushButton" row="0" column="0">
<property name="name">
<cstring>AddButton_2</cstring>
</property>
@@ -86,7 +86,7 @@
<string>&amp;Add...</string>
</property>
</widget>
- <widget class="QPushButton" row="0" column="1">
+ <widget class="TQPushButton" row="0" column="1">
<property name="name">
<cstring>RemoveButton_2</cstring>
</property>
@@ -94,7 +94,7 @@
<string>&amp;Remove</string>
</property>
</widget>
- <widget class="QPushButton" row="0" column="2">
+ <widget class="TQPushButton" row="0" column="2">
<property name="name">
<cstring>connectButton</cstring>
</property>
@@ -102,7 +102,7 @@
<string>&amp;Connect</string>
</property>
</widget>
- <widget class="QPushButton" row="0" column="3">
+ <widget class="TQPushButton" row="0" column="3">
<property name="name">
<cstring>disconnectButton</cstring>
</property>
@@ -112,7 +112,7 @@
</widget>
</grid>
</widget>
- <widget class="QFrame" row="1" column="1">
+ <widget class="TQFrame" row="1" column="1">
<property name="name">
<cstring>connectionFrame</cstring>
</property>
@@ -147,5 +147,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index 4849af7..a9cefb0 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -17,8 +17,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- Permission is also granted to link this program with the Qt
- library, treating Qt like a library that normally accompanies the
+ Permission is also granted to link this program with the TQt
+ library, treating TQt like a library that normally accompanies the
operating system kernel, whether or not that is in fact the case.
*/
@@ -78,7 +78,7 @@ public:
class ConnectionWidget : public TQWidget {
public:
MidiManagerView *v;
- ConnectionWidget(MidiManagerView *v, TQWidget *parent) : TQWidget(parent), v(v)
+ ConnectionWidget(MidiManagerView *v, TQWidget *tqparent) : TQWidget(tqparent), v(v)
{
}
void paintEvent(TQPaintEvent * /*event*/)
@@ -96,8 +96,8 @@ public:
conn != item->info.connections.end(); conn++)
{
MidiManagerItem *outitem = v->itemMap[*conn];
- TQRect r1 = v->widget->inputsListBox->itemRect(item);
- TQRect r2 = v->widget->outputsListBox->itemRect(outitem);
+ TQRect r1 = v->widget->inputsListBox->tqitemRect(item);
+ TQRect r2 = v->widget->outputsListBox->tqitemRect(outitem);
if(r1.height() > 0 && r2.height() > 0)
{
@@ -122,14 +122,14 @@ MidiManagerView::MidiManagerView()
setCaption(i18n("MIDI Manager"));
setIcon( MainBarIcon( "artsfftscope", 32 ) );
- (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, this, TQT_SLOT(addOSSMidiPort()),
+ (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()),
actionCollection(), "add_oss_midi_port");
- (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, this,
+ (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this),
TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output");
- (void) KStdAction::quit( this, TQT_SLOT(close()), actionCollection());
- connect(widget->connectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConnect()));
- connect(widget->disconnectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisconnect()));
+ (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ connect(widget->connectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotConnect()));
+ connect(widget->disconnectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDisconnect()));
connectionWidget = new ConnectionWidget(this, widget->connectionFrame);
connectionWidget->setMinimumSize(60,10);
@@ -185,7 +185,7 @@ void MidiManagerView::updateLists()
widget->inputsListBox->setSelected(itemMap[srcID],true);
if(destID && itemMap[destID])
widget->outputsListBox->setSelected(itemMap[destID],true);
- connectionWidget->repaint();
+ connectionWidget->tqrepaint();
}
void MidiManagerView::slotConnect()
@@ -216,7 +216,7 @@ void MidiManagerView::slotDisconnect()
void MidiManagerView::addOSSMidiPort()
{
- //lukas: no i18n here, QDialog's CTOR doesn't know about QString
+ //lukas: no i18n here, TQDialog's CTOR doesn't know about TQString
//lukas: can't use that with const char *, i18n()'ed in the dialog itself
MidiPortDlg *dlg = new MidiPortDlg(0,"/dev/midi","OSS Midi Port");
diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h
index 546e1ce..4b395bc 100644
--- a/arts/tools/midimanagerview.h
+++ b/arts/tools/midimanagerview.h
@@ -17,8 +17,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- Permission is also granted to link this program with the Qt
- library, treating Qt like a library that normally accompanies the
+ Permission is also granted to link this program with the TQt
+ library, treating TQt like a library that normally accompanies the
operating system kernel, whether or not that is in fact the case.
*/
@@ -36,6 +36,7 @@ class MidiManagerWidget;
class MidiManagerView : public KMainWindow {
Q_OBJECT
+ TQ_OBJECT
protected:
friend class ConnectionWidget;
Arts::MidiManager manager;
diff --git a/arts/tools/midimanagerwidget.ui b/arts/tools/midimanagerwidget.ui
index 115626d..88e34db 100644
--- a/arts/tools/midimanagerwidget.ui
+++ b/arts/tools/midimanagerwidget.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>MidiManagerWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>MidiManagerWidget</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -33,7 +33,7 @@
<string>MIDI inputs:</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>TextLabel1_2</cstring>
</property>
@@ -41,17 +41,17 @@
<string>MIDI outputs:</string>
</property>
</widget>
- <widget class="QListBox" row="1" column="0">
+ <widget class="TQListBox" row="1" column="0">
<property name="name">
<cstring>inputsListBox</cstring>
</property>
</widget>
- <widget class="QListBox" row="1" column="2">
+ <widget class="TQListBox" row="1" column="2">
<property name="name">
<cstring>outputsListBox</cstring>
</property>
</widget>
- <widget class="QFrame" row="2" column="0" rowspan="1" colspan="3">
+ <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>Frame5</cstring>
</property>
@@ -64,9 +64,9 @@
<property name="lineWidth">
<number>0</number>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@@ -78,7 +78,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QPushButton" row="0" column="2">
+ <widget class="TQPushButton" row="0" column="2">
<property name="name">
<cstring>connectButton</cstring>
</property>
@@ -86,7 +86,7 @@
<string>&amp;Connect</string>
</property>
</widget>
- <widget class="QPushButton" row="0" column="3">
+ <widget class="TQPushButton" row="0" column="3">
<property name="name">
<cstring>disconnectButton</cstring>
</property>
@@ -96,7 +96,7 @@
</widget>
</grid>
</widget>
- <widget class="QFrame" row="1" column="1">
+ <widget class="TQFrame" row="1" column="1">
<property name="name">
<cstring>connectionFrame</cstring>
</property>
@@ -131,5 +131,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 33ca6bc..eaed97f 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -32,28 +32,28 @@
#include <tqpushbutton.h>
#include <kstdguiitem.h>
-MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,TRUE)
+MidiPortDlg::MidiPortDlg(TQWidget *tqparent, const char *oldname, const char *title) :TQDialog(tqparent,title,TRUE)
{
- TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
// caption label: title
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *captionlabel = new TQLabel(this);
TQFont labelfont(captionlabel->font());
labelfont.setPointSize(labelfont.pointSize()*3/2);
captionlabel->setFont(labelfont);
captionlabel->setText(i18n("OSS MIDI Port"));
- captionlabel->setAlignment(AlignCenter);
+ captionlabel->tqsetAlignment(AlignCenter);
//min_size(captionlabel);
- mainlayout->addWidget(captionlabel);
+ maintqlayout->addWidget(captionlabel);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler2);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler2);
+ maintqlayout->addSpacing(5);
// editwidget
@@ -61,26 +61,26 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
edit->setText(oldname);
//min_size(edit);
- mainlayout->addWidget(edit);
+ maintqlayout->addWidget(edit);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler);
+ maintqlayout->addSpacing(5);
// buttons
- TQHBoxLayout *buttonlayout = new TQHBoxLayout;
- mainlayout->addSpacing(5);
- mainlayout->addLayout(buttonlayout);
- mainlayout->addSpacing(5);
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+ maintqlayout->addSpacing(5);
+ maintqlayout->addLayout(buttontqlayout);
+ maintqlayout->addSpacing(5);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
bbox->addStretch(1);
helpbutton->setAutoDefault( true );
helpbutton->setDefault( true );
@@ -90,12 +90,12 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
okbutton->setAutoDefault( true );
okbutton->setDefault( true );
- bbox->layout();
+ bbox->tqlayout();
- buttonlayout->addWidget(bbox);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addWidget(bbox);
+ buttontqlayout->addSpacing(5);
- mainlayout->freeze();
+ maintqlayout->freeze();
}
const char *MidiPortDlg::device()
diff --git a/arts/tools/midiportdlg.h b/arts/tools/midiportdlg.h
index 8992776..b6b428b 100644
--- a/arts/tools/midiportdlg.h
+++ b/arts/tools/midiportdlg.h
@@ -31,9 +31,10 @@
class MidiPortDlg :public TQDialog {
Q_OBJECT
+ TQ_OBJECT
TQLineEdit *edit;
public:
- MidiPortDlg(TQWidget *parent, const char *device, const char *title);
+ MidiPortDlg(TQWidget *tqparent, const char *device, const char *title);
const char *device();
public slots:
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index c29cf4e..6a9f0a2 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -33,15 +33,15 @@
using namespace std;
using namespace Arts;
-ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, const char* name )
- : Template_ArtsView( parent,name )
+ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* tqparent, const char* name )
+ : Template_ArtsView( tqparent,name )
, server(a_server)
{
- this->setCaption( i18n( "aRts Status" ) );
+ this->setCaption( i18n( "aRts tqStatus" ) );
TQBoxLayout *l= new TQVBoxLayout(this);
//l->setAutoAdd(TRUE);
- RealtimeStatus rs= server.realtimeStatus();
+ RealtimetqStatus rs= server.realtimetqStatus();
l->addWidget(new TQLabel(rs==rtRealtime?
i18n("Artsd is running with realtime scheduling."):
rs==rtNoSupport?
@@ -66,7 +66,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con
connect(suspendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(suspendButtonClicked()));
artsPollStatusTimer= new TQTimer(this);
- connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus()));
+ connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatetqStatus()));
artsPollStatusTimer->start(1000);
//l->activate();
show();
@@ -77,7 +77,7 @@ void ArtsStatusView::suspendButtonClicked()
(void)server.suspend(); // TODO: error msg if suspend not possible?
}
-void ArtsStatusView::updateStatus()
+void ArtsStatusView::updatetqStatus()
{
long seconds= server.secondsUntilSuspend();
if (seconds<0)
diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h
index ab5ff8e..59f757c 100644
--- a/arts/tools/statusview.h
+++ b/arts/tools/statusview.h
@@ -35,11 +35,12 @@ class TQLabel;
class ArtsStatusView : public Template_ArtsView {
Q_OBJECT
+ TQ_OBJECT
public:
ArtsStatusView(Arts::SoundServer server, TQWidget* =0, const char* =0 );
public slots:
- void updateStatus();
+ void updatetqStatus();
void suspendButtonClicked();
protected:
diff --git a/arts/tools/templateview.cpp b/arts/tools/templateview.cpp
index a589ff4..a89efac 100644
--- a/arts/tools/templateview.cpp
+++ b/arts/tools/templateview.cpp
@@ -22,7 +22,7 @@
//#include <kdebug.h>
-Template_ArtsView::Template_ArtsView( TQWidget* parent, const char* name ) : TQFrame( parent,name ){
+Template_ArtsView::Template_ArtsView( TQWidget* tqparent, const char* name ) : TQFrame( tqparent,name ){
//kdDebug()<<k_funcinfo<<endl;
}
diff --git a/arts/tools/templateview.h b/arts/tools/templateview.h
index efdd35f..ab1b3ec 100644
--- a/arts/tools/templateview.h
+++ b/arts/tools/templateview.h
@@ -24,9 +24,10 @@
//#include <artsflow.h>
#include <tqframe.h>
-class Template_ArtsView : public QFrame
+class Template_ArtsView : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
Template_ArtsView( TQWidget* =0, const char* =0 );
~Template_ArtsView();
diff --git a/juk/HACKING b/juk/HACKING
index 2fb4d39..47ddf41 100644
--- a/juk/HACKING
+++ b/juk/HACKING
@@ -84,7 +84,7 @@ Spaces
================================================================================
Spaces should not be used between the conditional / loop type and the
-conditional statement. They should also not be used after parenthesis. However
+conditional statement. They should also not be used after tqparenthesis. However
the should be to mark of mathematical or comparative operators.
if ( foo == bar )
@@ -103,15 +103,15 @@ be inline in the headers. The organization of the members in a class should be
roughly as follows:
public:
-public slots:
+public Q_SLOTS:
protected:
-protected slots:
-signals:
+protected Q_SLOTS:
+Q_SIGNALS:
private: // member funtions
-private slots:
+private Q_SLOTS:
private: // member variables
-If there are no private slots there is no need for two private sections, however
+If there are no private Q_SLOTS there is no need for two private sections, however
private functions and private variables should be clearly separated.
The implementations files -- .cpp files -- should follow (when possible) the
diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp
index 711c127..a7b73c6 100644
--- a/juk/advancedsearchdialog.cpp
+++ b/juk/advancedsearchdialog.cpp
@@ -36,9 +36,9 @@
AdvancedSearchDialog::AdvancedSearchDialog(const TQString &defaultName,
const PlaylistSearch &defaultSearch,
- TQWidget *parent,
+ TQWidget *tqparent,
const char *name) :
- KDialogBase(parent, name, true, i18n("Create Search Playlist"), Ok|Cancel)
+ KDialogBase(tqparent, name, true, i18n("Create Search Playlist"), Ok|Cancel)
{
makeVBoxMainWidget();
diff --git a/juk/advancedsearchdialog.h b/juk/advancedsearchdialog.h
index 699d5eb..6515827 100644
--- a/juk/advancedsearchdialog.h
+++ b/juk/advancedsearchdialog.h
@@ -27,6 +27,7 @@ class SearchLine;
class AdvancedSearchDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
struct Result
@@ -38,7 +39,7 @@ public:
AdvancedSearchDialog(const TQString &defaultName,
const PlaylistSearch &defaultSearch = PlaylistSearch(),
- TQWidget *parent = 0,
+ TQWidget *tqparent = 0,
const char *name = 0);
virtual ~AdvancedSearchDialog();
diff --git a/juk/akodeplayer.h b/juk/akodeplayer.h
index 07181ba..fb78fb4 100644
--- a/juk/akodeplayer.h
+++ b/juk/akodeplayer.h
@@ -18,6 +18,10 @@
#include <config.h>
+#ifdef Q_MOC_RUN
+#define HAVE_AKODE
+#endif // Q_MOC_RUN
+
#ifdef HAVE_AKODE
#include <tqstring.h>
@@ -33,6 +37,7 @@ namespace aKode {
class KDE_EXPORT aKodePlayer : public Player
{
Q_OBJECT
+ TQ_OBJECT
public:
aKodePlayer();
diff --git a/juk/artsplayer.h b/juk/artsplayer.h
index 73601b3..096074d 100644
--- a/juk/artsplayer.h
+++ b/juk/artsplayer.h
@@ -21,6 +21,10 @@
#include <config.h>
+#ifdef Q_MOC_RUN
+#define HAVE_ARTS 1
+#endif // Q_MOC_RUN
+
#if HAVE_ARTS
#include "player.h"
@@ -43,6 +47,7 @@ namespace KDE {
class ArtsPlayer : public Player
{
Q_OBJECT
+ TQ_OBJECT
public:
ArtsPlayer();
diff --git a/juk/cache.cpp b/juk/cache.cpp
index ada9334..6cfed63 100644
--- a/juk/cache.cpp
+++ b/juk/cache.cpp
@@ -84,9 +84,9 @@ void Cache::save()
TQDataStream fs(&f);
- Q_INT32 checksum = qChecksum(data.data(), data.size());
+ TQ_INT32 checksum = qChecksum(data.data(), data.size());
- fs << Q_INT32(m_currentVersion)
+ fs << TQ_INT32(m_currentVersion)
<< checksum
<< data;
@@ -106,7 +106,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
TQDataStream fs(&f);
- Q_INT32 version;
+ TQ_INT32 version;
fs >> version;
switch(version) {
@@ -117,7 +117,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
// we want to get a byte array with just the checksummed data.
TQByteArray data;
- Q_UINT16 checksum;
+ TQ_UINT16 checksum;
fs >> checksum >> data;
if(checksum != qChecksum(data.data(), data.size()))
@@ -129,7 +129,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
while(!s.atEnd()) {
- Q_INT32 playlistType;
+ TQ_INT32 playlistType;
s >> playlistType;
Playlist *playlist = 0;
@@ -175,7 +175,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
break;
}
if(version == 2) {
- Q_INT32 sortColumn;
+ TQ_INT32 sortColumn;
s >> sortColumn;
if(playlist)
playlist->setSorting(sortColumn);
@@ -217,33 +217,33 @@ void Cache::savePlaylists(const PlaylistList &playlists)
for(PlaylistList::ConstIterator it = playlists.begin(); it != playlists.end(); ++it) {
if(*it) {
if(dynamic_cast<HistoryPlaylist *>(*it)) {
- s << Q_INT32(History)
+ s << TQ_INT32(History)
<< *static_cast<HistoryPlaylist *>(*it);
}
else if(dynamic_cast<SearchPlaylist *>(*it)) {
- s << Q_INT32(Search)
+ s << TQ_INT32(Search)
<< *static_cast<SearchPlaylist *>(*it);
}
else if(dynamic_cast<UpcomingPlaylist *>(*it)) {
if(!action<KToggleAction>("saveUpcomingTracks")->isChecked())
continue;
- s << Q_INT32(Upcoming)
+ s << TQ_INT32(Upcoming)
<< *static_cast<UpcomingPlaylist *>(*it);
}
else if(dynamic_cast<FolderPlaylist *>(*it)) {
- s << Q_INT32(Folder)
+ s << TQ_INT32(Folder)
<< *static_cast<FolderPlaylist *>(*it);
}
else {
- s << Q_INT32(Normal)
+ s << TQ_INT32(Normal)
<< *(*it);
}
- s << Q_INT32((*it)->sortColumn());
+ s << TQ_INT32((*it)->sortColumn());
}
}
TQDataStream fs(&f);
- fs << Q_INT32(playlistCacheVersion);
+ fs << TQ_INT32(playlistCacheVersion);
fs << qChecksum(data.data(), data.size());
fs << data;
@@ -275,9 +275,9 @@ void Cache::load()
if(!f.open(IO_ReadOnly))
return;
- CacheDataStream s(&f);
+ CacheDataStream s(TQT_TQIODEVICE(&f));
- Q_INT32 version;
+ TQ_INT32 version;
s >> version;
TQBuffer buffer;
@@ -288,7 +288,7 @@ void Cache::load()
case 1: {
s.setCacheVersion(1);
- Q_INT32 checksum;
+ TQ_INT32 checksum;
TQByteArray data;
s >> checksum
>> data;
diff --git a/juk/cache.h b/juk/cache.h
index 6d67f1f..96fb83a 100644
--- a/juk/cache.h
+++ b/juk/cache.h
@@ -49,7 +49,7 @@ private:
* version.
*/
-class CacheDataStream : public QDataStream
+class CacheDataStream : public TQDataStream
{
public:
CacheDataStream(TQIODevice *d) : TQDataStream(d), m_cacheVersion(0) {}
diff --git a/juk/categoryreaderinterface.cpp b/juk/categoryreaderinterface.cpp
index 3844fc2..103329b 100644
--- a/juk/categoryreaderinterface.cpp
+++ b/juk/categoryreaderinterface.cpp
@@ -50,7 +50,7 @@ TQString CategoryReaderInterface::fixupTrack(const TQString &track, unsigned cat
if(emptyAction(trackId) == TagRenamerOptions::UseReplacementValue)
str = emptyText(trackId);
else
- return TQString::null;
+ return TQString();
}
unsigned minimumWidth = trackWidth(categoryNum);
diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp
index 5c06049..2f00500 100644
--- a/juk/collectionlist.cpp
+++ b/juk/collectionlist.cpp
@@ -90,7 +90,7 @@ PlaylistItem *CollectionList::createItem(const FileHandle &file, TQListViewItem
// It's probably possible to optimize the line below away, but, well, right
// now it's more important to not load duplicate items.
- if(m_itemsDict.find(file.absFilePath()))
+ if(m_itemsDict.tqfind(file.absFilePath()))
return 0;
PlaylistItem *item = new CollectionListItem(file);
@@ -162,7 +162,7 @@ void CollectionList::slotRefreshItems(const KFileItemList &items)
// If the item is no longer on disk, remove it from the collection.
if(item->file().fileInfo().exists())
- item->repaint();
+ item->tqrepaint();
else
clearItem(item);
}
@@ -228,7 +228,7 @@ CollectionList::CollectionList(PlaylistCollection *collection) :
m_itemsDict(5003),
m_columnTags(15, 0)
{
- new KAction(i18n("Show Playing"), KShortcut(), actions(), "showPlaying");
+ new KAction(i18n("Show Playing"), KShortcut(), ActionCollection::actions(), "showPlaying");
connect(action("showPlaying"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowPlaying()));
@@ -284,9 +284,9 @@ void CollectionList::contentsDragMoveEvent(TQDragMoveEvent *e)
TQString CollectionList::addStringToDict(const TQString &value, unsigned column)
{
if(column > m_columnTags.count() || value.stripWhiteSpace().isEmpty())
- return TQString::null;
+ return TQString();
- int *refCountPtr = m_columnTags[column]->find(value);
+ int *refCountPtr = m_columnTags[column]->tqfind(value);
if(refCountPtr)
++(*refCountPtr);
else {
@@ -336,7 +336,7 @@ void CollectionList::removeStringFromDict(const TQString &value, unsigned column
if(column > m_columnTags.count() || value.isEmpty())
return;
- int *refCountPtr = m_columnTags[column]->find(value);
+ int *refCountPtr = m_columnTags[column]->tqfind(value);
if(refCountPtr) {
--(*refCountPtr);
if(*refCountPtr == 0) {
@@ -392,13 +392,13 @@ void CollectionListItem::refresh()
file().coverInfo()->setCover();
if(listView()->isVisible())
- repaint();
+ tqrepaint();
- for(PlaylistItemList::Iterator it = m_children.begin(); it != m_children.end(); ++it) {
+ for(PlaylistItemList::Iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) {
(*it)->playlist()->update();
(*it)->playlist()->dataChanged();
if((*it)->listView()->isVisible())
- (*it)->repaint();
+ (*it)->tqrepaint();
}
CollectionList::instance()->dataChanged();
@@ -411,7 +411,7 @@ PlaylistItem *CollectionListItem::itemForPlaylist(const Playlist *playlist)
return this;
PlaylistItemList::ConstIterator it;
- for(it = m_children.begin(); it != m_children.end(); ++it)
+ for(it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
if((*it)->playlist() == playlist)
return *it;
return 0;
@@ -428,11 +428,11 @@ void CollectionListItem::updateCollectionDict(const TQString &oldPath, const TQS
collection->addToDict(newPath, this);
}
-void CollectionListItem::repaint() const
+void CollectionListItem::tqrepaint() const
{
- TQListViewItem::repaint();
- for(PlaylistItemList::ConstIterator it = m_children.begin(); it != m_children.end(); ++it)
- (*it)->repaint();
+ TQListViewItem::tqrepaint();
+ for(PlaylistItemList::ConstIterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+ (*it)->tqrepaint();
}
////////////////////////////////////////////////////////////////////////////////
@@ -468,8 +468,8 @@ CollectionListItem::~CollectionListItem()
{
m_shuttingDown = true;
- for(PlaylistItemList::ConstIterator it = m_children.begin();
- it != m_children.end();
+ for(PlaylistItemList::ConstIterator it = m_tqchildren.begin();
+ it != m_tqchildren.end();
++it)
{
(*it)->playlist()->clearItem(*it);
@@ -486,13 +486,13 @@ CollectionListItem::~CollectionListItem()
void CollectionListItem::addChildItem(PlaylistItem *child)
{
- m_children.append(child);
+ m_tqchildren.append(child);
}
void CollectionListItem::removeChildItem(PlaylistItem *child)
{
if(!m_shuttingDown)
- m_children.remove(child);
+ m_tqchildren.remove(child);
}
bool CollectionListItem::checkCurrent()
diff --git a/juk/collectionlist.h b/juk/collectionlist.h
index 4143889..82fa9c1 100644
--- a/juk/collectionlist.h
+++ b/juk/collectionlist.h
@@ -64,6 +64,7 @@ class CollectionList : public Playlist
friend class CollectionListItem;
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -80,7 +81,7 @@ public:
*/
TQStringList uniqueSet(UniqueSetType t) const;
- CollectionListItem *lookup(const TQString &file) { return m_itemsDict.find(file); }
+ CollectionListItem *lookup(const TQString &file) { return m_itemsDict.tqfind(file); }
virtual PlaylistItem *createItem(const FileHandle &file,
TQListViewItem * = 0,
@@ -95,7 +96,7 @@ public:
virtual bool canReload() const { return true; }
public slots:
- virtual void paste() { decode(kapp->clipboard()->data()); }
+ virtual void paste() { decode(kapp->tqclipboard()->data()); }
virtual void clear();
void slotCheckCache();
@@ -115,7 +116,7 @@ protected:
// These methods are used by CollectionListItem, which is a friend class.
- void addToDict(const TQString &file, CollectionListItem *item) { m_itemsDict.replace(file, item); }
+ void addToDict(const TQString &file, CollectionListItem *item) { m_itemsDict.tqreplace(file, item); }
void removeFromDict(const TQString &file) { m_itemsDict.remove(file); }
// These methods are also used by CollectionListItem, to manage the
@@ -127,7 +128,7 @@ protected:
void addWatched(const TQString &file) { m_dirWatch->addFile(file); }
void removeWatched(const TQString &file) { m_dirWatch->removeFile(file); }
- virtual bool hasItem(const TQString &file) const { return m_itemsDict.find(file); }
+ virtual bool hasItem(const TQString &file) const { return m_itemsDict.tqfind(file); }
signals:
void signalCollectionChanged();
@@ -171,8 +172,8 @@ public:
virtual void refresh();
PlaylistItem *itemForPlaylist(const Playlist *playlist);
void updateCollectionDict(const TQString &oldPath, const TQString &newPath);
- void repaint() const;
- PlaylistItemList children() const { return m_children; }
+ void tqrepaint() const;
+ PlaylistItemList tqchildren() const { return m_tqchildren; }
protected:
CollectionListItem(const FileHandle &file);
@@ -191,7 +192,7 @@ protected:
private:
bool m_shuttingDown;
- PlaylistItemList m_children;
+ PlaylistItemList m_tqchildren;
};
#endif
diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp
index 509f069..2b04f3c 100644
--- a/juk/coverdialog.cpp
+++ b/juk/coverdialog.cpp
@@ -34,8 +34,8 @@ using CoverUtility::CoverIconViewItem;
class AllArtistsListViewItem : public KListViewItem
{
public:
- AllArtistsListViewItem(TQListView *parent) :
- KListViewItem(parent, i18n("<All Artists>"))
+ AllArtistsListViewItem(TQListView *tqparent) :
+ KListViewItem(tqparent, i18n("<All Artists>"))
{
}
@@ -48,8 +48,8 @@ public:
class CaseInsensitiveItem : public KListViewItem
{
public:
- CaseInsensitiveItem(TQListView *parent, const TQString &text) :
- KListViewItem(parent, text)
+ CaseInsensitiveItem(TQListView *tqparent, const TQString &text) :
+ KListViewItem(tqparent, text)
{
}
@@ -60,8 +60,8 @@ public:
}
};
-CoverDialog::CoverDialog(TQWidget *parent) :
- CoverDialogBase(parent, "juk_cover_dialog", WType_Dialog)
+CoverDialog::CoverDialog(TQWidget *tqparent) :
+ CoverDialogBase(tqparent, "juk_cover_dialog", WType_Dialog)
{
m_covers->setResizeMode(TQIconView::Adjust);
m_covers->setGridX(140);
diff --git a/juk/coverdialog.h b/juk/coverdialog.h
index 751f77c..6bbbba4 100644
--- a/juk/coverdialog.h
+++ b/juk/coverdialog.h
@@ -21,8 +21,9 @@
class CoverDialog : public CoverDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- CoverDialog(TQWidget *parent);
+ CoverDialog(TQWidget *tqparent);
~CoverDialog();
virtual void show();
diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui
index 180dc8b..d220a5c 100644
--- a/juk/coverdialogbase.ui
+++ b/juk/coverdialogbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>CoverDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>CoverDialogBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -50,7 +50,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>164</width>
<height>0</height>
@@ -63,23 +63,23 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>m_clearSearch</cstring>
</property>
@@ -164,7 +164,7 @@
<verstretch>0</verstretch>
</sizepolicy>
<pixmap>image0</pixmap>
- <signal>contextMenuRequested(QIconViewItem *item, const QPoint &amp;pos)</signal>
+ <signal>contextMenuRequested(TQIconViewItem *item, const TQPoint &amp;pos)</signal>
<property type="Int">gridX</property>
<property type="Int">gridY</property>
</customwidget>
@@ -177,9 +177,9 @@
<connections>
<connection>
<sender>m_artists</sender>
- <signal>clicked(QListViewItem*)</signal>
+ <signal>clicked(TQListViewItem*)</signal>
<receiver>CoverDialogBase</receiver>
- <slot>slotArtistClicked(QListViewItem*)</slot>
+ <slot>slotArtistClicked(TQListViewItem*)</slot>
</connection>
<connection>
<sender>m_clearSearch</sender>
@@ -189,18 +189,18 @@
</connection>
<connection>
<sender>m_covers</sender>
- <signal>contextMenuRequested(QIconViewItem*,const QPoint&amp;)</signal>
+ <signal>contextMenuRequested(TQIconViewItem*,const TQPoint&amp;)</signal>
<receiver>CoverDialogBase</receiver>
- <slot>slotContextRequested(QIconViewItem*,const QPoint&amp;)</slot>
+ <slot>slotContextRequested(TQIconViewItem*,const TQPoint&amp;)</slot>
</connection>
</connections>
-<slots>
- <slot>slotArtistClicked(QListViewItem *item)</slot>
- <slot>slotContextRequested(QIconViewItem *, const QPoint &amp;pt)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+<Q_SLOTS>
+ <slot>slotArtistClicked(TQListViewItem *item)</slot>
+ <slot>slotContextRequested(TQIconViewItem *, const TQPoint &amp;pt)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<forwards>
- <forward>class QIconViewItem;</forward>
+ <forward>class TQIconViewItem;</forward>
</forwards>
<includehints>
<includehint>klistview.h</includehint>
diff --git a/juk/covericonview.cpp b/juk/covericonview.cpp
index fc400e7..2dd1260 100644
--- a/juk/covericonview.cpp
+++ b/juk/covericonview.cpp
@@ -18,15 +18,15 @@
using CoverUtility::CoverIconViewItem;
-CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *parent) :
- KIconViewItem(parent), m_id(id)
+CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *tqparent) :
+ KIconViewItem(tqparent), m_id(id)
{
CoverDataPtr data = CoverManager::coverInfo(id);
- setText(TQString("%1 - %2").arg(data->artist, data->album));
+ setText(TQString("%1 - %2").tqarg(data->artist, data->album));
setPixmap(data->thumbnail());
}
-CoverIconView::CoverIconView(TQWidget *parent, const char *name) : KIconView(parent, name)
+CoverIconView::CoverIconView(TQWidget *tqparent, const char *name) : KIconView(tqparent, name)
{
setResizeMode(Adjust);
}
diff --git a/juk/covericonview.h b/juk/covericonview.h
index 42e44d6..a12f435 100644
--- a/juk/covericonview.h
+++ b/juk/covericonview.h
@@ -29,7 +29,7 @@ namespace CoverUtility
class CoverIconViewItem : public KIconViewItem
{
public:
- CoverIconViewItem(coverKey id, TQIconView *parent);
+ CoverIconViewItem(coverKey id, TQIconView *tqparent);
coverKey id() const { return m_id; }
@@ -49,7 +49,7 @@ using CoverUtility::CoverIconViewItem;
class CoverIconView : public KIconView
{
public:
- CoverIconView(TQWidget *parent, const char *name);
+ CoverIconView(TQWidget *tqparent, const char *name);
CoverIconViewItem *currentItem() const;
diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp
index 67e8514..49bf0f5 100644
--- a/juk/coverinfo.cpp
+++ b/juk/coverinfo.cpp
@@ -29,15 +29,15 @@
#include "coverinfo.h"
#include "tag.h"
-struct CoverPopup : public QWidget
+struct CoverPopup : public TQWidget
{
CoverPopup(const TQPixmap &image, const TQPoint &p) :
TQWidget(0, 0, WDestructiveClose | WX11BypassWM)
{
- TQHBoxLayout *layout = new TQHBoxLayout(this);
+ TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
TQLabel *label = new TQLabel(this);
- layout->addWidget(label);
+ tqlayout->addWidget(label);
label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
label->setLineWidth(1);
label->setPixmap(image);
@@ -225,9 +225,9 @@ void CoverInfo::popup() const
TQString CoverInfo::coverLocation(CoverSize size) const
{
TQString fileName(TQFile::encodeName(m_file.tag()->artist() + " - " + m_file.tag()->album()));
- TQRegExp maskedFileNameChars("[ /?:\"]");
+ TQRegExp tqmaskedFileNameChars("[ /?:\"]");
- fileName.replace(maskedFileNameChars, "_");
+ fileName.tqreplace(tqmaskedFileNameChars, "_");
fileName.append(".png");
TQString dataDir = KGlobal::dirs()->saveLocation("appdata");
@@ -267,7 +267,7 @@ bool CoverInfo::convertOldStyleCover() const
applyCoverToWholeAlbum();
- // If we convert we need to remove the old cover otherwise we'll find
+ // If we convert we need to remove the old cover otherwise we'll tqfind
// it later if the user un-sets the new cover.
if(!TQFile::remove(oldLocation))
kdError(65432) << "Unable to remove converted cover at " << oldLocation << endl;
diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp
index f7530da..811f904 100644
--- a/juk/covermanager.cpp
+++ b/juk/covermanager.cpp
@@ -42,13 +42,13 @@ typedef TQDict<coverKey> TrackLookupMap;
static KStaticDeleter<CoverManagerPrivate> sd;
const char *CoverDrag::mimetype = "application/x-juk-coverid";
-// Caches the QPixmaps for the covers so that the covers are not all kept in
+// Caches the TQPixmaps for the covers so that the covers are not all kept in
// memory for no reason.
typedef TQCache<TQPixmap> CoverPixmapCache;
CoverManagerPrivate *CoverManager::m_data = 0;
-// Used to save and load CoverData from a QDataStream
+// Used to save and load CoverData from a TQDataStream
TQDataStream &operator<<(TQDataStream &out, const CoverData &data);
TQDataStream &operator>>(TQDataStream &in, CoverData &data);
@@ -156,20 +156,20 @@ void CoverManagerPrivate::saveCovers() const
TQDataStream out(&file);
// Write out the version and count
- out << Q_UINT32(0) << Q_UINT32(covers.count());
+ out << TQ_UINT32(0) << TQ_UINT32(covers.count());
// Write out the data
for(CoverDataMap::ConstIterator it = covers.begin(); it != covers.end(); ++it) {
- out << Q_UINT32(it.key());
+ out << TQ_UINT32(it.key());
out << *it.data();
}
// Now write out the track mapping.
- out << Q_UINT32(tracks.count());
+ out << TQ_UINT32(tracks.count());
TQDictIterator<coverKey> trackMapIt(tracks);
while(trackMapIt.current()) {
- out << trackMapIt.currentKey() << Q_UINT32(*trackMapIt.current());
+ out << trackMapIt.currentKey() << TQ_UINT32(*trackMapIt.current());
++trackMapIt;
}
}
@@ -186,7 +186,7 @@ void CoverManagerPrivate::loadCovers()
}
TQDataStream in(&file);
- Q_UINT32 count, version;
+ TQ_UINT32 count, version;
// First thing we'll read in will be the version.
// Only version 0 is defined for now.
@@ -200,9 +200,9 @@ void CoverManagerPrivate::loadCovers()
// Read in the count next, then the data.
in >> count;
- for(Q_UINT32 i = 0; i < count; ++i) {
- // Read the id, and 3 QStrings for every 1 of the count.
- Q_UINT32 id;
+ for(TQ_UINT32 i = 0; i < count; ++i) {
+ // Read the id, and 3 TQStrings for every 1 of the count.
+ TQ_UINT32 id;
CoverDataPtr data(new CoverData);
in >> id;
@@ -213,9 +213,9 @@ void CoverManagerPrivate::loadCovers()
}
in >> count;
- for(Q_UINT32 i = 0; i < count; ++i) {
+ for(TQ_UINT32 i = 0; i < count; ++i) {
TQString path;
- Q_UINT32 id;
+ TQ_UINT32 id;
in >> path >> id;
@@ -223,7 +223,7 @@ void CoverManagerPrivate::loadCovers()
// don't do so again. Possible due to a coding error during 3.5
// development.
- if(!tracks.find(path)) {
+ if(!tracks.tqfind(path)) {
++covers[(coverKey) id]->refCount; // Another track using this.
tracks.insert(path, new coverKey(id));
}
@@ -242,7 +242,7 @@ coverKey CoverManagerPrivate::nextId() const
// Start from 1...
coverKey key = 1;
- while(covers.contains(key))
+ while(covers.tqcontains(key))
++key;
return key;
@@ -269,13 +269,13 @@ const char *CoverDrag::format(int i) const
return 0;
}
-TQByteArray CoverDrag::encodedData(const char *mimetype) const
+TQByteArray CoverDrag::tqencodedData(const char *mimetype) const
{
if(qstrcmp(CoverDrag::mimetype, mimetype) == 0) {
TQByteArray data;
TQDataStream ds(data, IO_WriteOnly);
- ds << Q_UINT32(m_id);
+ ds << TQ_UINT32(m_id);
return data;
}
else if(qstrcmp(mimetype, "image/png") == 0) {
@@ -303,9 +303,9 @@ bool CoverDrag::decode(const TQMimeSource *e, coverKey &id)
if(!canDecode(e))
return false;
- TQByteArray data = e->encodedData(mimetype);
+ TQByteArray data = e->tqencodedData(mimetype);
TQDataStream ds(data, IO_ReadOnly);
- Q_UINT32 i;
+ TQ_UINT32 i;
ds >> i;
id = (coverKey) i;
@@ -371,7 +371,7 @@ TQPixmap CoverManager::coverFromData(const CoverData &coverData, Size size)
if(size == Thumbnail) {
// Convert to image for smoothScale()
TQImage image = pix->convertToImage();
- pix->convertFromImage(image.smoothScale(80, 80, TQImage::ScaleMin));
+ pix->convertFromImage(image.smoothScale(80, 80, TQ_ScaleMin));
}
TQPixmap returnValue = *pix; // Save it early.
@@ -395,7 +395,7 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c
// Save it to file first!
- TQString ext = TQString("/coverdb/coverID-%1.png").arg(id);
+ TQString ext = TQString("/coverdb/coverID-%1.png").tqarg(id);
coverData->path = KGlobal::dirs()->saveLocation("appdata") + ext;
kdDebug() << "Saving pixmap to " << coverData->path << endl;
@@ -413,8 +413,8 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c
data()->covers[id] = coverData;
// Make sure the new cover isn't inadvertently cached.
- data()->pixmapCache.remove(TQString("f%1").arg(coverData->path));
- data()->pixmapCache.remove(TQString("t%1").arg(coverData->path));
+ data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path));
+ data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path));
return id;
}
@@ -426,7 +426,7 @@ coverKey CoverManager::addCover(const TQString &path, const TQString &artist, co
bool CoverManager::hasCover(coverKey id)
{
- return data()->covers.contains(id);
+ return data()->covers.tqcontains(id);
}
bool CoverManager::removeCover(coverKey id)
@@ -436,8 +436,8 @@ bool CoverManager::removeCover(coverKey id)
// Remove cover from cache.
CoverDataPtr coverData = coverInfo(id);
- data()->pixmapCache.remove(TQString("f%1").arg(coverData->path));
- data()->pixmapCache.remove(TQString("t%1").arg(coverData->path));
+ data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path));
+ data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path));
// Remove references to files that had that track ID.
TQDictIterator<coverKey> it(data()->tracks);
@@ -462,8 +462,8 @@ bool CoverManager::replaceCover(coverKey id, const TQPixmap &large)
CoverDataPtr coverData = coverInfo(id);
// Empty old pixmaps from cache.
- data()->pixmapCache.remove(TQString("%1%2").arg("t", coverData->path));
- data()->pixmapCache.remove(TQString("%1%2").arg("f", coverData->path));
+ data()->pixmapCache.remove(TQString("%1%2").tqarg("t", coverData->path));
+ data()->pixmapCache.remove(TQString("%1%2").tqarg("f", coverData->path));
large.save(coverData->path, "PNG");
return true;
@@ -504,7 +504,7 @@ TQValueList<coverKey> CoverManager::keys()
void CoverManager::setIdForTrack(const TQString &path, coverKey id)
{
- coverKey *oldId = data()->tracks.find(path);
+ coverKey *oldId = data()->tracks.tqfind(path);
if(oldId && (id == *oldId))
return; // We're already done.
@@ -526,7 +526,7 @@ void CoverManager::setIdForTrack(const TQString &path, coverKey id)
coverKey CoverManager::idForTrack(const TQString &path)
{
- coverKey *coverPtr = data()->tracks.find(path);
+ coverKey *coverPtr = data()->tracks.tqfind(path);
if(!coverPtr)
return NoMatch;
@@ -536,7 +536,7 @@ coverKey CoverManager::idForTrack(const TQString &path)
CoverDataPtr CoverManager::coverInfo(coverKey id)
{
- if(data()->covers.contains(id))
+ if(data()->covers.tqcontains(id))
return data()->covers[id];
return CoverDataPtr(0);
diff --git a/juk/covermanager.h b/juk/covermanager.h
index d7eda15..a984f01 100644
--- a/juk/covermanager.h
+++ b/juk/covermanager.h
@@ -62,13 +62,13 @@ typedef TQMap<coverKey, CoverDataPtr> CoverDataMap;
*
* @author Michael Pyne <michael.pyne@kdemail.net>
*/
-class CoverDrag : public QDragObject
+class CoverDrag : public TQDragObject
{
public:
CoverDrag(coverKey id, TQWidget *src);
virtual const char *format(int i) const;
- virtual TQByteArray encodedData(const char *mimetype) const;
+ virtual TQByteArray tqencodedData(const char *mimetype) const;
void setId(coverKey id) { m_id = id; }
@@ -191,7 +191,7 @@ public:
* Replaces the cover art for the cover identified by @p id with @p large.
* Any other metadata such as artist and album is unchanged.
*
- * @param id The id of the cover to replace.
+ * @param id The id of the cover to tqreplace.
* @param large The full size cover art for the new cover.
*/
static bool replaceCover(coverKey id, const TQPixmap &large);
diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp
index e780eec..688015c 100644
--- a/juk/deletedialog.cpp
+++ b/juk/deletedialog.cpp
@@ -33,8 +33,8 @@
// DeleteWidget implementation
//////////////////////////////////////////////////////////////////////////////
-DeleteWidget::DeleteWidget(TQWidget *parent, const char *name)
- : DeleteDialogBase(parent, name)
+DeleteWidget::DeleteWidget(TQWidget *tqparent, const char *name)
+ : DeleteDialogBase(tqparent, name)
{
KConfigGroup messageGroup(KGlobal::config(), "FileRemover");
@@ -69,8 +69,8 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
// DeleteDialog implementation
//////////////////////////////////////////////////////////////////////////////
-DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) :
- KDialogBase(Swallow, WStyle_DialogBorder, parent, name,
+DeleteDialog::DeleteDialog(TQWidget *tqparent, const char *name) :
+ KDialogBase(Swallow, WStyle_DialogBorder, tqparent, name,
true /* modal */, i18n("About to delete selected files"),
Ok | Cancel, Cancel /* Default */, true /* separator */),
m_trashGuiItem(i18n("&Send to Trash"), "trashcan_full")
diff --git a/juk/deletedialog.h b/juk/deletedialog.h
index 34a98a6..bc347f4 100644
--- a/juk/deletedialog.h
+++ b/juk/deletedialog.h
@@ -29,9 +29,10 @@ class TQWidgetStack;
class DeleteWidget : public DeleteDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- DeleteWidget(TQWidget *parent = 0, const char *name = 0);
+ DeleteWidget(TQWidget *tqparent = 0, const char *name = 0);
void setFiles(const TQStringList &files);
@@ -42,9 +43,10 @@ protected slots:
class DeleteDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- DeleteDialog(TQWidget *parent, const char *name = "delete_dialog");
+ DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog");
bool confirmDeleteList(const TQStringList &condemnedFiles);
void setFiles(const TQStringList &files);
diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui
index f1054d7..992a6af 100644
--- a/juk/deletedialogbase.ui
+++ b/juk/deletedialogbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>DeleteDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>DeleteDialogBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -12,7 +12,7 @@
<height>374</height>
</rect>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>420</width>
<height>320</height>
@@ -22,15 +22,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>ddWarningIcon</cstring>
</property>
@@ -46,33 +46,33 @@
<string>Icon Placeholder, not in GUI</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
<property name="text">
<string>Are you sure that you want to remove these items?</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>ddDeleteText</cstring>
</property>
<property name="text">
<string>Deletion method placeholder, never shown to user.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -94,18 +94,18 @@
<string>This is the list of items that are about to be deleted.</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>ddNumFiles</cstring>
</property>
<property name="text">
<string>Placeholder for number of files, not in GUI</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>ddShouldDelete</cstring>
</property>
@@ -133,10 +133,10 @@
<slot>slotShouldDelete(bool)</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot access="protected">slotShouldDelete(bool)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
</includehints>
diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp
index 43df3dd..2353237 100644
--- a/juk/directorylist.cpp
+++ b/juk/directorylist.cpp
@@ -28,8 +28,8 @@
////////////////////////////////////////////////////////////////////////////////
DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylists,
- TQWidget *parent, const char *name) :
- KDialogBase(parent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true),
+ TQWidget *tqparent, const char *name) :
+ KDialogBase(tqparent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true),
m_dirList(directories),
m_importPlaylists(importPlaylists)
{
@@ -50,9 +50,9 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis
m_base->importPlaylistsCheckBox->setChecked(importPlaylists);
- TQSize sz = sizeHint();
+ TQSize sz = tqsizeHint();
setMinimumSize(kMax(350, sz.width()), kMax(250, sz.height()));
- resize(sizeHint());
+ resize(tqsizeHint());
}
DirectoryList::~DirectoryList()
@@ -78,7 +78,7 @@ DirectoryList::Result DirectoryList::exec()
void DirectoryList::slotAddDirectory()
{
TQString dir = KFileDialog::getExistingDirectory();
- if(!dir.isEmpty() && m_dirList.find(dir) == m_dirList.end()) {
+ if(!dir.isEmpty() && m_dirList.tqfind(dir) == m_dirList.end()) {
m_dirList.append(dir);
new KListViewItem(m_base->directoryListView, dir);
m_result.addedDirs.append(dir);
diff --git a/juk/directorylist.h b/juk/directorylist.h
index d9b2a08..f25c21a 100644
--- a/juk/directorylist.h
+++ b/juk/directorylist.h
@@ -22,6 +22,7 @@ class DirectoryListBase;
class DirectoryList : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
struct Result
@@ -33,7 +34,7 @@ public:
};
DirectoryList(const TQStringList &directories, bool importPlaylists,
- TQWidget *parent = 0, const char *name = 0);
+ TQWidget *tqparent = 0, const char *name = 0);
virtual ~DirectoryList();
public slots:
diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui
index 643417d..62df27b 100644
--- a/juk/directorylistbase.ui
+++ b/juk/directorylistbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>DirectoryListBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>DirectoryListBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -32,7 +32,7 @@
<cstring>directoryListView</cstring>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>rightColumnLayout</cstring>
</property>
@@ -56,14 +56,14 @@
<string>Remove Folder</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>informationLabel</cstring>
</property>
<property name="text">
<string>These folders will be scanned on startup for new files.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -77,14 +77,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>importPlaylistsCheckBox</cstring>
</property>
@@ -102,8 +102,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<layoutdefaults spacing="6" margin="0"/>
-<layoutfunctions spacing="KDialog::spacingHint"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/juk/dynamicplaylist.cpp b/juk/dynamicplaylist.cpp
index 336d1e3..a1ef1cd 100644
--- a/juk/dynamicplaylist.cpp
+++ b/juk/dynamicplaylist.cpp
@@ -23,9 +23,9 @@
class PlaylistDirtyObserver : public PlaylistObserver
{
public:
- PlaylistDirtyObserver(DynamicPlaylist *parent, Playlist *playlist) :
+ PlaylistDirtyObserver(DynamicPlaylist *tqparent, Playlist *playlist) :
PlaylistObserver(playlist),
- m_parent(parent)
+ m_parent(tqparent)
{
}
diff --git a/juk/dynamicplaylist.h b/juk/dynamicplaylist.h
index 20e496d..f7c4f97 100644
--- a/juk/dynamicplaylist.h
+++ b/juk/dynamicplaylist.h
@@ -25,13 +25,14 @@
class DynamicPlaylist : public Playlist
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Creates a dynamic playlist based on lists.
*/
DynamicPlaylist(const PlaylistList &lists,
PlaylistCollection *collection,
- const TQString &name = TQString::null,
+ const TQString &name = TQString(),
const TQString &iconName = "midi",
bool setupPlaylist = true,
bool synchronizePlaying = false);
diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp
index e365546..0f5bd86 100644
--- a/juk/exampleoptions.cpp
+++ b/juk/exampleoptions.cpp
@@ -21,8 +21,8 @@
#include "exampleoptions.h"
-ExampleOptions::ExampleOptions(TQWidget *parent) :
- ExampleOptionsBase(parent, "example options widget")
+ExampleOptions::ExampleOptions(TQWidget *tqparent) :
+ ExampleOptionsBase(tqparent, "example options widget")
{
}
@@ -44,8 +44,8 @@ void ExampleOptions::exampleFileChanged()
emit fileChanged();
}
-ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *parent) :
- TQDialog(parent, "example options dialog")
+ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *tqparent) :
+ TQDialog(tqparent, "example options dialog")
{
setCaption(i18n("JuK"));
TQVBoxLayout *l = new TQVBoxLayout(this);
diff --git a/juk/exampleoptions.h b/juk/exampleoptions.h
index dca7a46..4d849b7 100644
--- a/juk/exampleoptions.h
+++ b/juk/exampleoptions.h
@@ -22,8 +22,9 @@
class ExampleOptions : public ExampleOptionsBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ExampleOptions(TQWidget *parent);
+ ExampleOptions(TQWidget *tqparent);
protected slots:
virtual void exampleSelectionChanged();
@@ -33,11 +34,12 @@ class ExampleOptions : public ExampleOptionsBase
// We're not using KDialog(Base) because this dialog won't have any push
// buttons to close it. It's just a little floating dialog.
-class ExampleOptionsDialog : public QDialog
+class ExampleOptionsDialog : public TQDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- ExampleOptionsDialog(TQWidget *parent);
+ ExampleOptionsDialog(TQWidget *tqparent);
const ExampleOptions *widget() const { return m_options; }
diff --git a/juk/exampleoptionsbase.ui b/juk/exampleoptionsbase.ui
index a2280ef..1c17798 100644
--- a/juk/exampleoptionsbase.ui
+++ b/juk/exampleoptionsbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ExampleOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ExampleOptionsBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>buttonGroup3</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>m_fileTagsButton</cstring>
</property>
@@ -60,7 +60,7 @@
<number>24</number>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>m_manualTagsButton</cstring>
</property>
@@ -71,7 +71,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>m_manualGroup</cstring>
</property>
@@ -85,7 +85,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit" row="1" column="1">
+ <widget class="TQLineEdit" row="1" column="1">
<property name="name">
<cstring>m_exampleArtist</cstring>
</property>
@@ -93,7 +93,7 @@
<string>Artist</string>
</property>
</widget>
- <widget class="QLineEdit" row="0" column="1">
+ <widget class="TQLineEdit" row="0" column="1">
<property name="name">
<cstring>m_exampleTitle</cstring>
</property>
@@ -101,7 +101,7 @@
<string>Title</string>
</property>
</widget>
- <widget class="QLineEdit" row="2" column="1">
+ <widget class="TQLineEdit" row="2" column="1">
<property name="name">
<cstring>m_exampleAlbum</cstring>
</property>
@@ -109,7 +109,7 @@
<string>Album</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -117,7 +117,7 @@
<string>Title:</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -125,7 +125,7 @@
<string>Artist:</string>
</property>
</widget>
- <widget class="QSpinBox" row="5" column="1">
+ <widget class="TQSpinBox" row="5" column="1">
<property name="name">
<cstring>m_exampleYear</cstring>
</property>
@@ -139,7 +139,7 @@
<number>2004</number>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -147,7 +147,7 @@
<string>Album:</string>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -155,7 +155,7 @@
<string>Genre:</string>
</property>
</widget>
- <widget class="QLabel" row="4" column="0">
+ <widget class="TQLabel" row="4" column="0">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -163,7 +163,7 @@
<string>Track number:</string>
</property>
</widget>
- <widget class="QSpinBox" row="4" column="1">
+ <widget class="TQSpinBox" row="4" column="1">
<property name="name">
<cstring>m_exampleTrack</cstring>
</property>
@@ -171,7 +171,7 @@
<number>1</number>
</property>
</widget>
- <widget class="QLineEdit" row="3" column="1">
+ <widget class="TQLineEdit" row="3" column="1">
<property name="name">
<cstring>m_exampleGenre</cstring>
</property>
@@ -179,7 +179,7 @@
<string>Genre</string>
</property>
</widget>
- <widget class="QLabel" row="5" column="0">
+ <widget class="TQLabel" row="5" column="0">
<property name="name">
<cstring>textLabel6</cstring>
</property>
@@ -267,16 +267,16 @@
<tabstop>m_exampleTrack</tabstop>
<tabstop>m_exampleYear</tabstop>
</tabstops>
-<signals>
+<Q_SIGNALS>
<signal>dataChanged()</signal>
<signal>fileChanged()</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
<slot access="protected">exampleSelectionChanged()</slot>
<slot access="protected">exampleDataChanged()</slot>
<slot access="protected">exampleFileChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/juk/filehandle.h b/juk/filehandle.h
index bbfd6c6..12216bb 100644
--- a/juk/filehandle.h
+++ b/juk/filehandle.h
@@ -36,7 +36,7 @@ class FileHandle
public:
FileHandle();
FileHandle(const FileHandle &f);
- explicit FileHandle(const TQFileInfo &info, const TQString &path = TQString::null);
+ explicit FileHandle(const TQFileInfo &info, const TQString &path = TQString());
explicit FileHandle(const TQString &path);
FileHandle(const TQString &path, CacheDataStream &s);
~FileHandle();
diff --git a/juk/filehandleproperties.h b/juk/filehandleproperties.h
index 4fc31f9..a930ad8 100644
--- a/juk/filehandleproperties.h
+++ b/juk/filehandleproperties.h
@@ -61,7 +61,7 @@ namespace FileHandleProperties
{
virtual TQString value(const FileHandle &) const
{
- return TQString::null;
+ return TQString();
}
};
@@ -75,7 +75,7 @@ namespace FileHandleProperties
static TQString property(const FileHandle &file, const TQCString &key)
{
- return propertyMap.contains(key) ? propertyMap[key]->value(file) : TQString::null;
+ return propertyMap.tqcontains(key) ? propertyMap[key]->value(file) : TQString();
}
static TQStringList properties()
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index c1acb2c..2155d11 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -60,8 +60,8 @@ class ConfirmationDialog : public KDialogBase
{
public:
ConfirmationDialog(const TQMap<TQString, TQString> &files,
- TQWidget *parent = 0, const char *name = 0)
- : KDialogBase(parent, name, true, i18n("Warning"), Ok | Cancel)
+ TQWidget *tqparent = 0, const char *name = 0)
+ : KDialogBase(tqparent, name, true, i18n("Warning"), Ok | Cancel)
{
TQVBox *vbox = makeVBoxMainWidget();
TQHBox *hbox = new TQHBox(vbox);
@@ -89,8 +89,8 @@ public:
}
lvHeight += lv->horizontalScrollBar()->height() + lv->header()->height();
- lv->setMinimumHeight(QMIN(lvHeight, 400));
- resize(QMIN(width(), 500), QMIN(minimumHeight(), 400));
+ lv->setMinimumHeight(TQMIN(lvHeight, 400));
+ resize(TQMIN(width(), 500), TQMIN(minimumHeight(), 400));
}
};
@@ -140,7 +140,7 @@ ConfigCategoryReader::ConfigCategoryReader() : CategoryReaderInterface(),
TQString ConfigCategoryReader::categoryValue(TagType type) const
{
if(!m_currentItem)
- return TQString::null;
+ return TQString();
Tag *tag = m_currentItem->file().tag();
@@ -164,7 +164,7 @@ TQString ConfigCategoryReader::categoryValue(TagType type) const
return tag->genre();
default:
- return TQString::null;
+ return TQString();
}
}
@@ -224,15 +224,15 @@ bool ConfigCategoryReader::isDisabled(const CategoryID &category) const
// Implementation of FileRenamerWidget
//
-FileRenamerWidget::FileRenamerWidget(TQWidget *parent) :
- FileRenamerBase(parent), CategoryReaderInterface(),
+FileRenamerWidget::FileRenamerWidget(TQWidget *tqparent) :
+ FileRenamerBase(tqparent), CategoryReaderInterface(),
m_exampleFromFile(false)
{
TQLabel *temp = new TQLabel(0);
m_exampleText->setPaletteBackgroundColor(temp->paletteBackgroundColor());
delete temp;
- layout()->setMargin(0); // We'll be wrapped by KDialogBase
+ tqlayout()->setMargin(0); // We'll be wrapped by KDialogBase
// This must be created before createTagRows() is called.
@@ -348,23 +348,23 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
row.downButton->setFlat(true);
upMapper->connect(row.upButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
- upMapper->setMapping(row.upButton, id);
+ upMapper->setMapping(TQT_TQOBJECT(row.upButton), id);
downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
- downMapper->setMapping(row.downButton, id);
+ downMapper->setMapping(TQT_TQOBJECT(row.downButton), id);
- TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category));
+ TQString labelText = TQString("<b>%1</b>").tqarg(TagRenamerOptions::tagTypeText(category));
TQLabel *label = new TQLabel(labelText, frame);
frame->setStretchFactor(label, 1);
- label->setAlignment(AlignCenter);
+ label->tqsetAlignment(AlignCenter);
TQVBox *options = new TQVBox(frame);
row.enableButton = new KPushButton(i18n("Remove"), options);
toggleMapper->connect(row.enableButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
- toggleMapper->setMapping(row.enableButton, id);
+ toggleMapper->setMapping(TQT_TQOBJECT(row.enableButton), id);
row.optionsButton = new KPushButton(i18n("Options"), options);
mapper->connect(row.optionsButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
- mapper->setMapping(row.optionsButton, id);
+ mapper->setMapping(TQT_TQOBJECT(row.optionsButton), id);
row.widget->show();
m_rows.append(row);
@@ -378,10 +378,10 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
void FileRenamerWidget::moveSignalMappings(unsigned oldId, unsigned newId)
{
- mapper->setMapping(m_rows[oldId].optionsButton, newId);
- downMapper->setMapping(m_rows[oldId].downButton, newId);
- upMapper->setMapping(m_rows[oldId].upButton, newId);
- toggleMapper->setMapping(m_rows[oldId].enableButton, newId);
+ mapper->setMapping(TQT_TQOBJECT(m_rows[oldId].optionsButton), newId);
+ downMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].downButton), newId);
+ upMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].upButton), newId);
+ toggleMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].enableButton), newId);
}
bool FileRenamerWidget::removeRow(unsigned id)
@@ -410,9 +410,9 @@ bool FileRenamerWidget::removeRow(unsigned id)
if(m_rows[id].position > 0)
checkboxPosition = m_rows[id].position - 1;
- // The checkbox is contained within a layout widget, so the layout
+ // The checkbox is contained within a tqlayout widget, so the tqlayout
// widget is the one the needs to die.
- delete m_folderSwitches[checkboxPosition]->parent();
+ delete m_folderSwitches[checkboxPosition]->tqparent();
m_folderSwitches.erase(&m_folderSwitches[checkboxPosition]);
// Go through all the rows and if they have the same category and a
@@ -480,10 +480,10 @@ void FileRenamerWidget::createTagRows()
m_rows.reserve(categoryOrder.count());
m_folderSwitches.reserve(categoryOrder.count() - 1);
- mapper = new TQSignalMapper(this, "signal mapper");
- toggleMapper = new TQSignalMapper(this, "toggle mapper");
- upMapper = new TQSignalMapper(this, "up button mapper");
- downMapper = new TQSignalMapper(this, "down button mapper");
+ mapper = new TQSignalMapper(TQT_TQOBJECT(this), "signal mapper");
+ toggleMapper = new TQSignalMapper(TQT_TQOBJECT(this), "toggle mapper");
+ upMapper = new TQSignalMapper(TQT_TQOBJECT(this), "up button mapper");
+ downMapper = new TQSignalMapper(TQT_TQOBJECT(this), "down button mapper");
connect(mapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(showCategoryOption(int)));
connect(toggleMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(slotRemoveRow(int)));
@@ -578,7 +578,7 @@ TQString FileRenamerWidget::fileCategoryValue(TagType category) const
return tag->genre();
default:
- return TQString::null;
+ return TQString();
}
}
@@ -609,7 +609,7 @@ TQString FileRenamerWidget::categoryValue(TagType category) const
return example->m_exampleGenre->text();
default:
- return TQString::null;
+ return TQString();
}
}
@@ -675,17 +675,17 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction)
// Move the item two spaces above/below its previous position. It has to
// be 2 spaces because of the checkbox.
- TQBoxLayout *layout = dynamic_cast<TQBoxLayout *>(m_mainFrame->layout());
+ TQBoxLayout *tqlayout = dynamic_cast<TQBoxLayout *>(m_mainFrame->tqlayout());
- layout->remove(l);
- layout->insertWidget(2 * newPos, l);
+ tqlayout->remove(l);
+ tqlayout->insertWidget(2 * newPos, l);
// Move the top item two spaces in the opposite direction, for a similar
// reason.
- layout->remove(w);
- layout->insertWidget(2 * pos, w);
- layout->invalidate();
+ tqlayout->remove(w);
+ tqlayout->insertWidget(2 * pos, w);
+ tqlayout->tqinvalidate();
TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged()));
}
@@ -778,7 +778,7 @@ void FileRenamerWidget::insertCategory()
// Set its down button to be disabled.
m_rows[id].downButton->setEnabled(false);
- m_mainFrame->layout()->invalidate();
+ m_mainFrame->tqlayout()->tqinvalidate();
m_mainView->update();
// Now update according to the code in loadConfig().
@@ -864,7 +864,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
if(itemMap.isEmpty() || ConfirmationDialog(map).exec() != TQDialog::Accepted)
return;
- KApplication::setOverrideCursor(Qt::waitCursor);
+ KApplication::setOverrideCursor(TQt::waitCursor);
for(TQMap<TQString, TQString>::ConstIterator it = map.begin();
it != map.end(); ++it)
{
@@ -875,7 +875,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
setFolderIcon(it.data(), itemMap[it.key()]);
}
else
- errorFiles << i18n("%1 to %2").arg(it.key()).arg(it.data());
+ errorFiles << i18n("%1 to %2").tqarg(it.key()).tqarg(it.data());
processEvents();
}
@@ -906,7 +906,7 @@ bool FileRenamer::moveFile(const TQString &src, const TQString &dest)
// Get just the directory.
KURL dir = dstURL;
- dir.setFileName(TQString::null);
+ dir.setFileName(TQString());
// Create the directory.
if(!KStandardDirs::exists(dir.path()))
@@ -939,7 +939,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item)
path.append("/" + (*it));
kdDebug() << "Checking path: " << path << endl;
- if((*it).find(item->file().tag()->album()) != -1 &&
+ if((*it).tqfind(item->file().tag()->album()) != -1 &&
!TQFile::exists(path + "/.directory"))
{
// Seems to be a match, let's set the folder icon for the current
@@ -952,7 +952,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item)
config.setGroup("Desktop Entry");
if(!config.hasKey("Icon")) {
- config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").arg(path));
+ config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").tqarg(path));
config.sync();
}
@@ -1011,7 +1011,7 @@ TQString FileRenamer::fileName(const CategoryReaderInterface &interface)
// The user can use the folder separator checkbox to add folders, so don't allow
// slashes that slip in to accidentally create new folders. Should we filter this
// back out when showing it in the GUI?
- value.replace('/', "%2f");
+ value.tqreplace('/', "%2f");
if(!pastLast && interface.hasFolderSeparator(i))
value.append(dirSeparator);
diff --git a/juk/filerenamer.h b/juk/filerenamer.h
index 0978a39..fe3a2a7 100644
--- a/juk/filerenamer.h
+++ b/juk/filerenamer.h
@@ -61,7 +61,7 @@ struct Row
/**
* A list of rows, each of which may have its own category options and other
* associated data. There is no relation between the order of rows in the vector and their
- * GUI layout. Instead, each Row has a position member which indicates what GUI position it
+ * GUI tqlayout. Instead, each Row has a position member which indicates what GUI position it
* takes up. The index into the vector is known as the row identifier (which is unique but
* not necessarily constant).
*/
@@ -140,9 +140,10 @@ private:
class FileRenamerWidget : public FileRenamerBase, public CategoryReaderInterface
{
Q_OBJECT
+ TQ_OBJECT
public:
- FileRenamerWidget(TQWidget *parent);
+ FileRenamerWidget(TQWidget *tqparent);
~FileRenamerWidget();
/// Maximum number of total categories the widget will allow.
@@ -185,7 +186,7 @@ private:
/**
* This function adds a "Insert Folder separator" checkbox to the end of
- * the current layout. The setting defaults to being unchecked.
+ * the current tqlayout. The setting defaults to being unchecked.
*/
void addFolderSeparatorCheckbox();
@@ -335,7 +336,7 @@ private:
/**
* This moves the widget \p l in the direction given by \p direction, taking
* care to make sure that the checkboxes are not moved, and that they are
- * enabled or disabled as appropriate for the new layout, and that the up and
+ * enabled or disabled as appropriate for the new tqlayout, and that the up and
* down buttons are also adjusted as necessary.
*
* @param id the identifier of the row to move
@@ -383,7 +384,7 @@ private:
/**
* This function returns the identifier of the row in the m_rows index that
- * contains \p category and matches \p categoryNum.
+ * tqcontains \p category and matches \p categoryNum.
*
* @param category the category to find.
* @return the identifier of the category, or MAX_CATEGORIES if it couldn't
@@ -426,14 +427,14 @@ private slots:
virtual void slotRemoveRow(int id);
/**
- * This function moves \p category up in the layout.
+ * This function moves \p category up in the tqlayout.
*
* @param id the unique id of the widget to move up.
*/
virtual void moveItemUp(int id);
/**
- * This function moves \p category down in the layout.
+ * This function moves \p category down in the tqlayout.
*
* @param id the unique id of the widget to move down.
*/
diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui
index 2837097..10a36f1 100644
--- a/juk/filerenamerbase.ui
+++ b/juk/filerenamerbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>FileRenamerBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>FileRenamerBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -27,9 +27,9 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<grid>
<property name="name">
@@ -58,7 +58,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1_6</cstring>
</property>
@@ -66,15 +66,15 @@
<string>Music folder:</string>
</property>
</widget>
- <widget class="QLayoutWidget" row="2" column="1">
+ <widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<item>
<property name="text">
<string>Album Tag</string>
@@ -133,7 +133,7 @@
<number>26</number>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -144,7 +144,7 @@
<cstring>m_category</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1_7</cstring>
</property>
@@ -168,7 +168,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QScrollView">
+ <widget class="TQScrollView">
<property name="name">
<cstring>m_mainView</cstring>
</property>
@@ -195,7 +195,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -214,9 +214,9 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -232,7 +232,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -257,7 +257,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -266,7 +266,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_exampleText</cstring>
</property>
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -307,7 +307,7 @@
<customwidgets>
<customwidget>
<class>QScrollView</class>
- <header location="global">qscrollview.h</header>
+ <header location="global">tqscrollview.h</header>
<sizehint>
<width>100</width>
<height>30</height>
@@ -330,13 +330,13 @@
<connections>
<connection>
<sender>m_separator</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TTQString&amp;)</signal>
<receiver>FileRenamerBase</receiver>
<slot>exampleTextChanged()</slot>
</connection>
<connection>
<sender>m_musicFolder</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>FileRenamerBase</receiver>
<slot>exampleTextChanged()</slot>
</connection>
@@ -360,12 +360,12 @@
<tabstop>m_insertCategory</tabstop>
<tabstop>m_showExample</tabstop>
</tabstops>
-<slots>
+<Q_SLOTS>
<slot access="protected">exampleTextChanged()</slot>
<slot access="protected">toggleExampleDialog()</slot>
<slot access="protected">insertCategory()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
@@ -373,7 +373,7 @@
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>qscrollview.h</includehint>
+ <includehint>tqscrollview.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
</UI>
diff --git a/juk/filerenamerconfigdlg.cpp b/juk/filerenamerconfigdlg.cpp
index 8a741d0..a1f4368 100644
--- a/juk/filerenamerconfigdlg.cpp
+++ b/juk/filerenamerconfigdlg.cpp
@@ -19,8 +19,8 @@
#include "filerenamer.h"
#include "filerenamerconfigdlg.h"
-FileRenamerConfigDlg::FileRenamerConfigDlg(TQWidget *parent) :
- KDialogBase(parent, "file renamer dialog", true,
+FileRenamerConfigDlg::FileRenamerConfigDlg(TQWidget *tqparent) :
+ KDialogBase(tqparent, "file renamer dialog", true,
i18n("File Renamer Options"), Ok | Cancel),
m_renamerWidget(new FileRenamerWidget(this))
{
diff --git a/juk/filerenamerconfigdlg.h b/juk/filerenamerconfigdlg.h
index 0c42ab5..fc95318 100644
--- a/juk/filerenamerconfigdlg.h
+++ b/juk/filerenamerconfigdlg.h
@@ -23,8 +23,9 @@ class FileRenamerWidget;
class FileRenamerConfigDlg : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- FileRenamerConfigDlg(TQWidget *parent);
+ FileRenamerConfigDlg(TQWidget *tqparent);
protected slots:
virtual void accept();
diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp
index d40fd81..cc9ab7f 100644
--- a/juk/filerenameroptions.cpp
+++ b/juk/filerenameroptions.cpp
@@ -25,32 +25,32 @@
#include "filerenameroptions.h"
-FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent,
+FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *tqparent,
const TagRenamerOptions &options) :
- FileRenamerTagOptionsBase(parent), m_options(options)
+ FileRenamerTagOptionsBase(tqparent), m_options(options)
{
- layout()->setSpacing(KDialog::spacingHint());
- layout()->setMargin(0);
+ tqlayout()->setSpacing(KDialog::spacingHint());
+ tqlayout()->setMargin(0);
- m_emptyTagGroup->layout()->setSpacing(KDialog::spacingHint());
- m_trackGroup->layout()->setSpacing(KDialog::spacingHint());
+ m_emptyTagGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+ m_trackGroup->tqlayout()->setSpacing(KDialog::spacingHint());
m_emptyValueLayout->setSpacing(KDialog::spacingHint());
m_exampleLayout->setSpacing(KDialog::spacingHint());
m_spinLayout->setSpacing(KDialog::spacingHint());
m_widthLayout->setSpacing(KDialog::spacingHint());
m_tagLayout->setSpacing(KDialog::spacingHint());
- m_tagFormatGroup->layout()->setSpacing(KDialog::spacingHint());
+ m_tagFormatGroup->tqlayout()->setSpacing(KDialog::spacingHint());
if(m_options.category() != Track)
m_trackGroup->hide();
TQString tagText = m_options.tagTypeText();
- setCaption(caption().arg(tagText));
- m_tagFormatGroup->setTitle(m_tagFormatGroup->title().arg(tagText));
- m_emptyTagGroup->setTitle(m_emptyTagGroup->title().arg(tagText));
- m_description->setText(m_description->text().arg(tagText));
- m_tagLabel->setText(m_tagLabel->text().arg(tagText));
+ setCaption(caption().tqarg(tagText));
+ m_tagFormatGroup->setTitle(m_tagFormatGroup->title().tqarg(tagText));
+ m_emptyTagGroup->setTitle(m_emptyTagGroup->title().tqarg(tagText));
+ m_description->setText(m_description->text().tqarg(tagText));
+ m_tagLabel->setText(m_tagLabel->text().tqarg(tagText));
m_prefixText->setText(options.prefix());
m_suffixText->setText(options.suffix());
@@ -115,10 +115,10 @@ void FileRenamerTagOptions::slotEmptyActionChanged()
m_options.setEmptyAction(TagRenamerOptions::ForceEmptyInclude);
}
-TagOptionsDialog::TagOptionsDialog(TQWidget *parent,
+TagOptionsDialog::TagOptionsDialog(TQWidget *tqparent,
const TagRenamerOptions &options,
unsigned categoryNumber) :
- KDialogBase(parent, 0, true, i18n("File Renamer"), Ok | Cancel),
+ KDialogBase(tqparent, 0, true, i18n("File Renamer"), Ok | Cancel),
m_options(options),
m_categoryNumber(categoryNumber)
{
diff --git a/juk/filerenameroptions.h b/juk/filerenameroptions.h
index 0740882..88248f6 100644
--- a/juk/filerenameroptions.h
+++ b/juk/filerenameroptions.h
@@ -28,9 +28,10 @@
class FileRenamerTagOptions : public FileRenamerTagOptionsBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- FileRenamerTagOptions(TQWidget *parent, const TagRenamerOptions &options);
+ FileRenamerTagOptions(TQWidget *tqparent, const TagRenamerOptions &options);
const TagRenamerOptions &options() const { return m_options; }
@@ -51,9 +52,10 @@ class FileRenamerTagOptions : public FileRenamerTagOptionsBase
class TagOptionsDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- TagOptionsDialog(TQWidget *parent, const TagRenamerOptions &options, unsigned categoryNumber);
+ TagOptionsDialog(TQWidget *tqparent, const TagRenamerOptions &options, unsigned categoryNumber);
const TagRenamerOptions &options() const { return m_options; }
diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui
index 1e40ce6..be88699 100644
--- a/juk/filerenameroptionsbase.ui
+++ b/juk/filerenameroptionsbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>FileRenamerTagOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>FileRenamerTagOptionsBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>m_tagFormatGroup</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_description</cstring>
</property>
@@ -40,11 +40,11 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>m_tagLayout</cstring>
</property>
@@ -65,22 +65,22 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_prefixText</cstring>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignRight</set>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_tagLabel</cstring>
</property>
@@ -88,11 +88,11 @@
<string>%1</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_suffixText</cstring>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignLeft</set>
</property>
</widget>
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -115,7 +115,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_substitution</cstring>
</property>
@@ -127,13 +127,13 @@
<property name="text">
<string>Substitution Example</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
</vbox>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>m_emptyTagGroup</cstring>
</property>
@@ -144,7 +144,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>m_includeEmptyButton</cstring>
</property>
@@ -152,7 +152,7 @@
<string>Include in the &amp;filename anyways</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>m_ignoreTagButton</cstring>
</property>
@@ -163,7 +163,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>m_emptyValueLayout</cstring>
</property>
@@ -174,7 +174,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>m_useValueButton</cstring>
</property>
@@ -182,7 +182,7 @@
<string>Use &amp;this value:</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_emptyTagValue</cstring>
</property>
@@ -197,7 +197,7 @@
</widget>
</vbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>m_trackGroup</cstring>
</property>
@@ -208,7 +208,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel10</cstring>
</property>
@@ -218,11 +218,11 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>m_widthLayout</cstring>
</property>
@@ -233,7 +233,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>m_spinLayout</cstring>
</property>
@@ -244,7 +244,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -271,7 +271,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>m_exampleLayout</cstring>
</property>
@@ -282,7 +282,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLabel" row="1" column="1">
+ <widget class="TQLabel" row="1" column="1">
<property name="name">
<cstring>m_doubleDigitExample</cstring>
</property>
@@ -295,7 +295,7 @@
<string>014</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>m_singleDigitExample</cstring>
</property>
@@ -308,25 +308,25 @@
<string>003</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_singleDigit</cstring>
</property>
<property name="text">
<string>3 -&gt;</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>m_doubleDigit</cstring>
</property>
<property name="text">
<string>14 -&gt;</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -346,7 +346,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -413,12 +413,12 @@
<slot>slotEmptyActionChanged()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot access="protected">slotBracketsChanged()</slot>
<slot access="protected">slotTrackWidthChanged()</slot>
<slot access="protected">slotEmptyActionChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>
diff --git a/juk/folderplaylist.h b/juk/folderplaylist.h
index 4369a6f..7e4557f 100644
--- a/juk/folderplaylist.h
+++ b/juk/folderplaylist.h
@@ -20,10 +20,11 @@
class FolderPlaylist : public Playlist
{
Q_OBJECT
+ TQ_OBJECT
public:
- FolderPlaylist(PlaylistCollection *collection, const TQString &folder = TQString::null,
- const TQString &name = TQString::null);
+ FolderPlaylist(PlaylistCollection *collection, const TQString &folder = TQString(),
+ const TQString &name = TQString());
virtual ~FolderPlaylist();
TQString folder() const;
diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp
index 39f371a..2c52012 100644
--- a/juk/gstreamerplayer.cpp
+++ b/juk/gstreamerplayer.cpp
@@ -107,18 +107,18 @@ bool GStreamerPlayer::paused() const
int GStreamerPlayer::totalTime() const
{
- return time(GST_QUERY_TOTAL) / GST_SECOND;
+ return time(GST_TQUERY_TOTAL) / GST_SECOND;
}
int GStreamerPlayer::currentTime() const
{
- return time(GST_QUERY_POSITION) / GST_SECOND;
+ return time(GST_TQUERY_POSITION) / GST_SECOND;
}
int GStreamerPlayer::position() const
{
- long long total = time(GST_QUERY_TOTAL);
- long long current = time(GST_QUERY_POSITION);
+ long long total = time(GST_TQUERY_TOTAL);
+ long long current = time(GST_TQUERY_POSITION);
return total > 0 ? int((double(current) / double(total)) * double(1000) + 0.5) : 0;
}
@@ -130,7 +130,7 @@ void GStreamerPlayer::seek(int seekTime)
void GStreamerPlayer::seekPosition(int position)
{
- long long total = time(GST_QUERY_TOTAL);
+ long long total = time(GST_TQUERY_TOTAL);
if(total > 0)
seek(int(double(position) / double(1000) * double(totalTime()) + 0.5));
}
@@ -142,7 +142,7 @@ void GStreamerPlayer::seekPosition(int position)
void GStreamerPlayer::readConfig()
{
KConfigGroup config(KGlobal::config(), "GStreamerPlayer");
- m_sinkName = config.readEntry("SinkName", TQString::null);
+ m_sinkName = config.readEntry("SinkName", TQString());
}
void GStreamerPlayer::setupPipeline()
diff --git a/juk/gstreamerplayer.h b/juk/gstreamerplayer.h
index 6cc8ebf..fe08c83 100644
--- a/juk/gstreamerplayer.h
+++ b/juk/gstreamerplayer.h
@@ -18,6 +18,10 @@
#include "config.h"
+#ifdef Q_MOC_RUN
+#define HAVE_GSTREAMER 1
+#endif // Q_MOC_RUN
+
#if HAVE_GSTREAMER
#include <gst/gst.h>
@@ -27,6 +31,7 @@
class GStreamerPlayer : public Player
{
Q_OBJECT
+ TQ_OBJECT
public:
GStreamerPlayer();
diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp
index 26758fd..53aa927 100644
--- a/juk/historyplaylist.cpp
+++ b/juk/historyplaylist.cpp
@@ -90,16 +90,16 @@ void HistoryPlaylist::slotCreateNewItem()
// HistoryPlaylistItem public members
////////////////////////////////////////////////////////////////////////////////
-HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) :
- PlaylistItem(item, parent, after),
- m_dateTime(TQDateTime::currentDateTime())
+HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after) :
+ PlaylistItem(item, tqparent, after),
+ m_dateTime(TQDateTime::tqcurrentDateTime())
{
setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
}
-HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) :
- PlaylistItem(item, parent),
- m_dateTime(TQDateTime::currentDateTime())
+HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent) :
+ PlaylistItem(item, tqparent),
+ m_dateTime(TQDateTime::tqcurrentDateTime())
{
setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
}
@@ -123,7 +123,7 @@ TQDataStream &operator<<(TQDataStream &s, const HistoryPlaylist &p)
{
PlaylistItemList l = const_cast<HistoryPlaylist *>(&p)->items();
- s << Q_INT32(l.count());
+ s << TQ_INT32(l.count());
for(PlaylistItemList::ConstIterator it = l.begin(); it != l.end(); ++it) {
const HistoryPlaylistItem *i = static_cast<HistoryPlaylistItem *>(*it);
@@ -136,7 +136,7 @@ TQDataStream &operator<<(TQDataStream &s, const HistoryPlaylist &p)
TQDataStream &operator>>(TQDataStream &s, HistoryPlaylist &p)
{
- Q_INT32 count;
+ TQ_INT32 count;
s >> count;
HistoryPlaylistItem *after = 0;
diff --git a/juk/historyplaylist.h b/juk/historyplaylist.h
index 5f2776d..13cf543 100644
--- a/juk/historyplaylist.h
+++ b/juk/historyplaylist.h
@@ -23,8 +23,8 @@
class HistoryPlaylistItem : public PlaylistItem
{
public:
- HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after);
- HistoryPlaylistItem(CollectionListItem *item, Playlist *parent);
+ HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after);
+ HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent);
virtual ~HistoryPlaylistItem();
TQDateTime dateTime() const { return m_dateTime; }
@@ -37,6 +37,7 @@ private:
class HistoryPlaylist : public Playlist
{
Q_OBJECT
+ TQ_OBJECT
public:
HistoryPlaylist(PlaylistCollection *collection);
diff --git a/juk/juk.cpp b/juk/juk.cpp
index 35c08df..47a9469 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -43,8 +43,8 @@ using namespace ActionCollection;
// public members
////////////////////////////////////////////////////////////////////////////////
-JuK::JuK(TQWidget *parent, const char *name) :
- KMainWindow(parent, name, WDestructiveClose),
+JuK::JuK(TQWidget *tqparent, const char *name) :
+ KMainWindow(tqparent, name, WDestructiveClose),
m_player(PlayerManager::instance()),
m_shuttingDown(false)
{
@@ -72,7 +72,7 @@ JuK::JuK(TQWidget *parent, const char *name) :
SplashScreen::finishedLoading();
TQTimer::singleShot(0, CollectionList::instance(), TQT_SLOT(slotCheckCache()));
- TQTimer::singleShot(0, this, TQT_SLOT(slotProcessArgs()));
+ TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotProcessArgs()));
m_sliderAction->slotUpdateOrientation();
}
@@ -112,52 +112,52 @@ void JuK::setupActions()
{
ActionCollection::actions()->setWidget(this);
- KStdAction::quit(this, TQT_SLOT(slotQuit()), actions());
- KStdAction::undo(this, TQT_SLOT(slotUndo()), actions());
- KStdAction::cut(kapp, TQT_SLOT(cut()), actions());
- KStdAction::copy(kapp, TQT_SLOT(copy()), actions());
- KStdAction::paste(kapp, TQT_SLOT(paste()), actions());
- KStdAction::clear(kapp, TQT_SLOT(clear()), actions());
- KStdAction::selectAll(kapp, TQT_SLOT(selectAll()), actions());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), ActionCollection::actions());
+ KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ActionCollection::actions());
+ KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), ActionCollection::actions());
+ KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), ActionCollection::actions());
+ KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), ActionCollection::actions());
+ KStdAction::clear(TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions());
+ KStdAction::selectAll(TQT_TQOBJECT(kapp), TQT_SLOT(selectAll()), ActionCollection::actions());
- new KAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQT_SLOT(clear()), actions(), "removeFromPlaylist");
+ new KAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
- KActionMenu *actionMenu = new KActionMenu(i18n("&Random Play"), "roll", actions(), "actionMenu");
+ KActionMenu *actionMenu = new KActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu");
actionMenu->setDelayed(false);
- KRadioAction *ka = new KRadioAction(i18n("&Disable Random Play"), "player_playlist", 0, actions(), "disableRandomPlay");
+ KRadioAction *ka = new KRadioAction(i18n("&Disable Random Play"), "player_playlist", 0, ActionCollection::actions(), "disableRandomPlay");
ka->setExclusiveGroup("randomPlayGroup");
actionMenu->insert(ka);
- m_randomPlayAction = new KRadioAction(i18n("Use &Random Play"), "roll", 0, actions(), "randomPlay");
+ m_randomPlayAction = new KRadioAction(i18n("Use &Random Play"), "roll", 0, ActionCollection::actions(), "randomPlay");
m_randomPlayAction->setExclusiveGroup("randomPlayGroup");
actionMenu->insert(m_randomPlayAction);
- ka = new KRadioAction(i18n("Use &Album Random Play"), "roll", 0, actions(), "albumRandomPlay");
+ ka = new KRadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay");
ka->setExclusiveGroup("randomPlayGroup");
connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool)));
actionMenu->insert(ka);
- new KAction(i18n("&Play"), "player_play", 0, m_player, TQT_SLOT(play()), actions(), "play");
- new KAction(i18n("P&ause"), "player_pause", 0, m_player, TQT_SLOT(pause()), actions(), "pause");
- new KAction(i18n("&Stop"), "player_stop", 0, m_player, TQT_SLOT(stop()), actions(), "stop");
+ new KAction(i18n("&Play"), "player_play", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play");
+ new KAction(i18n("P&ause"), "player_pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause");
+ new KAction(i18n("&Stop"), "player_stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop");
- new KToolBarPopupAction(i18n("previous track", "Previous"), "player_start", KShortcut(), m_player, TQT_SLOT(back()), actions(), "back");
- new KAction(i18n("next track", "&Next"), "player_end", KShortcut(), m_player, TQT_SLOT(forward()), actions(), "forward");
- new KToggleAction(i18n("&Loop Playlist"), 0, KShortcut(), actions(), "loopPlaylist");
+ new KToolBarPopupAction(i18n("previous track", "Previous"), "player_start", KShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back");
+ new KAction(i18n("next track", "&Next"), "player_end", KShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward");
+ new KToggleAction(i18n("&Loop Playlist"), 0, KShortcut(), ActionCollection::actions(), "loopPlaylist");
KToggleAction *resizeColumnAction =
new KToggleAction(i18n("&Resize Playlist Columns Manually"),
- KShortcut(), actions(), "resizeColumnsManually");
+ KShortcut(), ActionCollection::actions(), "resizeColumnsManually");
resizeColumnAction->setCheckedState(i18n("&Resize Column Headers Automatically"));
// the following are not visible by default
- new KAction(i18n("Mute"), "mute", 0, m_player, TQT_SLOT(mute()), actions(), "mute");
- new KAction(i18n("Volume Up"), "volumeUp", 0, m_player, TQT_SLOT(volumeUp()), actions(), "volumeUp");
- new KAction(i18n("Volume Down"), "volumeDown", 0, m_player, TQT_SLOT(volumeDown()), actions(), "volumeDown");
- new KAction(i18n("Play / Pause"), "playPause", 0, m_player, TQT_SLOT(playPause()), actions(), "playPause");
- new KAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQT_SLOT(seekForward()), actions(), "seekForward");
- new KAction(i18n("Seek Back"), "seekBack", 0, m_player, TQT_SLOT(seekBack()), actions(), "seekBack");
+ new KAction(i18n("Mute"), "mute", 0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute");
+ new KAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp");
+ new KAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown");
+ new KAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause");
+ new KAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
+ new KAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack");
//////////////////////////////////////////////////
// settings menu
@@ -165,42 +165,42 @@ void JuK::setupActions()
m_toggleSplashAction =
new KToggleAction(i18n("Show Splash Screen on Startup"),
- KShortcut(), actions(), "showSplashScreen");
+ KShortcut(), ActionCollection::actions(), "showSplashScreen");
m_toggleSplashAction->setCheckedState(i18n("Hide Splash Screen on Startup"));
m_toggleSystemTrayAction =
new KToggleAction(i18n("&Dock in System Tray"),
- KShortcut(), actions(), "toggleSystemTray");
+ KShortcut(), ActionCollection::actions(), "toggleSystemTray");
m_toggleDockOnCloseAction =
new KToggleAction(i18n("&Stay in System Tray on Close"),
- KShortcut(), actions(), "dockOnClose");
+ KShortcut(), ActionCollection::actions(), "dockOnClose");
m_togglePopupsAction =
new KToggleAction(i18n("Popup &Track Announcement"),
- KShortcut(), this, 0, actions(), "togglePopups");
+ KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups");
new KToggleAction(i18n("Save &Play Queue on Exit"),
- KShortcut(), this, 0, actions(), "saveUpcomingTracks");
+ KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks");
connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(slotToggleSystemTray(bool)));
- m_outputSelectAction = PlayerManager::playerSelectAction(actions());
+ m_outputSelectAction = PlayerManager::playerSelectAction(ActionCollection::actions());
if(m_outputSelectAction)
m_outputSelectAction->setCurrentItem(0);
- new KAction(i18n("&Tag Guesser..."), 0, 0, this, TQT_SLOT(slotConfigureTagGuesser()),
- actions(), "tagGuesserConfig");
+ new KAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()),
+ ActionCollection::actions(), "tagGuesserConfig");
- new KAction(i18n("&File Renamer..."), 0, 0, this, TQT_SLOT(slotConfigureFileRenamer()),
- actions(), "fileRenamerConfig");
+ new KAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()),
+ ActionCollection::actions(), "fileRenamerConfig");
- KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actions());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions());
//////////////////////////////////////////////////
// just in the toolbar
//////////////////////////////////////////////////
- m_sliderAction = new SliderAction(i18n("Track Position"), actions(),
+ m_sliderAction = new SliderAction(i18n("Track Position"), ActionCollection::actions(),
"trackPositionAction");
}
@@ -213,7 +213,7 @@ void JuK::setupSystemTray()
m_toggleDockOnCloseAction->setEnabled(true);
m_togglePopupsAction->setEnabled(true);
- connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotAboutToQuit()));
+ connect(m_systemTray, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit()));
}
else {
m_systemTray = 0;
@@ -224,7 +224,7 @@ void JuK::setupSystemTray()
void JuK::setupGlobalAccels()
{
- m_accel = new KGlobalAccel(this);
+ m_accel = new KGlobalAccel(TQT_TQOBJECT(this));
KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQT_SLOT(activate()));
KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQT_SLOT(activate()));
@@ -236,7 +236,7 @@ void JuK::setupGlobalAccels()
KeyDialog::insert(m_accel, "VolumeUp", i18n("Volume Up"), action("volumeUp"), TQT_SLOT(activate()));
KeyDialog::insert(m_accel, "VolumeDown", i18n("Volume Down"), action("volumeDown"), TQT_SLOT(activate()));
KeyDialog::insert(m_accel, "Mute", i18n("Mute"), action("mute"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), this, TQT_SLOT(slotShowHide()));
+ KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), TQT_TQOBJECT(this), TQT_SLOT(slotShowHide()));
KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQT_SLOT(activate()));
m_accel->setConfigGroup("Shortcuts");
@@ -267,7 +267,7 @@ void JuK::createDirs()
void JuK::keyPressEvent(TQKeyEvent *e)
{
- if (e->key() >= Qt::Key_Back && e->key() <= Qt::Key_MediaLast)
+ if (e->key() >= TQt::Key_Back && e->key() <= TQt::Key_MediaLast)
e->accept();
KMainWindow::keyPressEvent(e);
}
@@ -446,7 +446,7 @@ void JuK::slotToggleSystemTray(bool enabled)
void JuK::slotEditKeys()
{
- KeyDialog::configure(m_accel, actions(), this);
+ KeyDialog::configure(m_accel, ActionCollection::actions(), this);
}
void JuK::slotConfigureTagGuesser()
diff --git a/juk/juk.h b/juk/juk.h
index bdb3499..818c403 100644
--- a/juk/juk.h
+++ b/juk/juk.h
@@ -37,9 +37,10 @@ class PlaylistSplitter;
class JuK : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
- JuK(TQWidget* parent = 0, const char *name = 0);
+ JuK(TQWidget* tqparent = 0, const char *name = 0);
virtual ~JuK();
virtual KActionCollection *actionCollection() const;
diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp
index d19021e..a4e4a7c 100644
--- a/juk/k3bexporter.cpp
+++ b/juk/k3bexporter.cpp
@@ -86,7 +86,7 @@ class PlaylistAction : public KAction
return;
// Invoke the slot using some trickery.
- // XXX: Use the TQMetaObject to do this in Qt 4.
+ // XXX: Use the TQMetaObject to do this in TQt 4.
connect(this, TQT_SIGNAL(activated()), recipient, m_slot);
emit(activated());
disconnect(this, TQT_SIGNAL(activated()), recipient, m_slot);
@@ -97,7 +97,7 @@ class PlaylistAction : public KAction
PlaylistRecipientMap m_playlistRecipient;
};
-K3bExporter::K3bExporter(Playlist *parent) : PlaylistExporter(parent), m_parent(parent)
+K3bExporter::K3bExporter(Playlist *tqparent) : PlaylistExporter(tqparent), m_parent(tqparent)
{
}
@@ -263,8 +263,8 @@ K3bExporter::K3bOpenMode K3bExporter::openMode()
return Abort;
}
-K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *parent) : K3bExporter(0),
- m_playlistBox(parent)
+K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *tqparent) : K3bExporter(0),
+ m_playlistBox(tqparent)
{
}
diff --git a/juk/k3bexporter.h b/juk/k3bexporter.h
index 0c41410..fa49dc8 100644
--- a/juk/k3bexporter.h
+++ b/juk/k3bexporter.h
@@ -30,9 +30,10 @@ class PlaylistAction;
class K3bExporter : public PlaylistExporter
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bExporter(Playlist *parent = 0);
+ K3bExporter(Playlist *tqparent = 0);
/**
* Returns a KAction that can be used to invoke the export.
@@ -77,8 +78,9 @@ private:
class K3bPlaylistExporter : public K3bExporter
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bPlaylistExporter(PlaylistBox *parent = 0);
+ K3bPlaylistExporter(PlaylistBox *tqparent = 0);
virtual KAction *action();
diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp
index c8d24a5..46455c3 100644
--- a/juk/keydialog.cpp
+++ b/juk/keydialog.cpp
@@ -28,44 +28,44 @@
const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
{ "PlayPause",
{ { KShortcut::null(), KShortcut::null() },
- { Qt::CTRL+Qt::ALT+Qt::Key_P, KKey::QtWIN+Qt::ALT+Qt::Key_P },
- { Qt::Key_MediaPlay, Qt::Key_MediaPlay } } },
+ { TQt::CTRL+TQt::ALT+TQt::Key_P, KKey::QtWIN+TQt::ALT+TQt::Key_P },
+ { TQt::Key_MediaPlay, TQt::Key_MediaPlay } } },
{ "Stop",
{ { KShortcut::null(), KShortcut::null() },
- { Qt::CTRL+Qt::ALT+Qt::Key_S, KKey::QtWIN+Qt::ALT+Qt::Key_S },
- { Qt::Key_MediaStop, Qt::Key_MediaStop } } },
+ { TQt::CTRL+TQt::ALT+TQt::Key_S, KKey::QtWIN+TQt::ALT+TQt::Key_S },
+ { TQt::Key_MediaStop, TQt::Key_MediaStop } } },
{ "Back",
{ { KShortcut::null(), KShortcut::null() },
- { Qt::CTRL+Qt::ALT+Qt::Key_Left, KKey::QtWIN+Qt::ALT+Qt::Key_Left },
- { Qt::Key_MediaPrev, Qt::Key_MediaPrev } } },
+ { TQt::CTRL+TQt::ALT+TQt::Key_Left, KKey::QtWIN+TQt::ALT+TQt::Key_Left },
+ { TQt::Key_MediaPrev, TQt::Key_MediaPrev } } },
{ "Forward",
{ { KShortcut::null(), KShortcut::null() },
- { Qt::CTRL+Qt::ALT+Qt::Key_Right, KKey::QtWIN+Qt::ALT+Qt::Key_Right },
- { Qt::Key_MediaNext, Qt::Key_MediaNext } } },
+ { TQt::CTRL+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::ALT+TQt::Key_Right },
+ { TQt::Key_MediaNext, TQt::Key_MediaNext } } },
{ "ForwardAlbum",
{ { KShortcut::null(), KShortcut::null() },
- { Qt::CTRL+Qt::ALT+Qt::Key_Up, KKey::QtWIN+Qt::ALT+Qt::Key_Up },
- { Qt::CTRL+Qt::Key_MediaNext, Qt::CTRL+Qt::Key_MediaNext } } },
+ { TQt::CTRL+TQt::ALT+TQt::Key_Up, KKey::QtWIN+TQt::ALT+TQt::Key_Up },
+ { TQt::CTRL+TQt::Key_MediaNext, TQt::CTRL+TQt::Key_MediaNext } } },
{ "SeekBack",
{ { KShortcut::null(), KShortcut::null() },
- { Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_Left, KKey::QtWIN+Qt::SHIFT+Qt::ALT+Qt::Key_Left },
- { Qt::SHIFT+Qt::Key_MediaPrev, Qt::SHIFT+Qt::Key_MediaPrev } } },
+ { TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Left, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Left },
+ { TQt::SHIFT+TQt::Key_MediaPrev, TQt::SHIFT+TQt::Key_MediaPrev } } },
{ "SeekForward",
{ { KShortcut::null(), KShortcut::null() },
- { Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_Right, KKey::QtWIN+Qt::SHIFT+Qt::ALT+Qt::Key_Right },
- { Qt::SHIFT+Qt::Key_MediaNext, Qt::SHIFT+Qt::Key_MediaNext } } },
+ { TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Right },
+ { TQt::SHIFT+TQt::Key_MediaNext, TQt::SHIFT+TQt::Key_MediaNext } } },
{ "VolumeUp",
{ { KShortcut::null(), KShortcut::null() },
- { Qt::CTRL+Qt::ALT+Qt::SHIFT+Qt::Key_Up, KKey::QtWIN+Qt::ALT+Qt::SHIFT+Qt::Key_Up },
- { Qt::Key_VolumeUp, Qt::Key_VolumeUp } } },
+ { TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Up, KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Up },
+ { TQt::Key_VolumeUp, TQt::Key_VolumeUp } } },
{ "VolumeDown",
{ { KShortcut::null(), KShortcut::null() },
- { Qt::CTRL+Qt::ALT+Qt::SHIFT+Qt::Key_Down, KKey::QtWIN+Qt::ALT+Qt::SHIFT+Qt::Key_Down },
- { Qt::Key_VolumeDown, Qt::Key_VolumeDown } } },
+ { TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Down, KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Down },
+ { TQt::Key_VolumeDown, TQt::Key_VolumeDown } } },
{ "Mute",
{ { KShortcut::null(), KShortcut::null() },
- { Qt::CTRL+Qt::ALT+Qt::Key_M, KKey::QtWIN+Qt::ALT+Qt::Key_M },
- { Qt::Key_VolumeMute, Qt::Key_VolumeMute } } },
+ { TQt::CTRL+TQt::ALT+TQt::Key_M, KKey::QtWIN+TQt::ALT+TQt::Key_M },
+ { TQt::Key_VolumeMute, TQt::Key_VolumeMute } } },
{ "ShowHide",
{ { KShortcut::null(), KShortcut::null() },
{ KShortcut::null(), KShortcut::null() },
@@ -75,8 +75,8 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]);
KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection,
- TQWidget *parent, const char *name)
- : KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
+ TQWidget *tqparent, const char *name)
+ : KDialogBase(tqparent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
{
// Read key group from configuration
@@ -172,11 +172,11 @@ void KeyDialog::slotDefault()
}
int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection,
- TQWidget *parent)
+ TQWidget *tqparent)
{
// Create and show dialog - update connections if accepted
- int retcode = KeyDialog(keys, actionCollection, parent).configure();
+ int retcode = KeyDialog(keys, actionCollection, tqparent).configure();
if(retcode == Accepted)
keys->updateConnections();
@@ -198,7 +198,7 @@ void KeyDialog::insert(KGlobalAccel *keys, const TQString &action, const TQStrin
break;
}
}
- keys->insert(action, label, TQString::null, def3, def4, objSlot, methodSlot);
+ keys->insert(action, label, TQString(), def3, def4, objSlot, methodSlot);
}
#include "keydialog.moc"
diff --git a/juk/keydialog.h b/juk/keydialog.h
index 13801ee..83c14d9 100644
--- a/juk/keydialog.h
+++ b/juk/keydialog.h
@@ -26,12 +26,13 @@
class KeyDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
- * Constructs a KeyDialog called @p name as a child of @p parent.
+ * Constructs a KeyDialog called @p name as a child of @p tqparent.
*/
- KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0);
+ KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *tqparent = 0, const char* name = 0);
/**
* Destructor. Deletes all resources used by a KeyDialog object.
@@ -43,7 +44,7 @@ public:
* accelerators and actions. It behaves essentially like the functions
* in KKeyDialog.
*/
- static int configure(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0);
+ static int configure(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *tqparent = 0);
/**
* This is a member function, provided to create a global accelerator with
diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp
index cb45c68..72519b9 100644
--- a/juk/ktrm.cpp
+++ b/juk/ktrm.cpp
@@ -43,7 +43,7 @@ class KTRMLookup;
extern "C"
{
#if HAVE_MUSICBRAINZ >= 4
- static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status);
+ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFiletqStatus status);
#else
static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
#endif
@@ -69,7 +69,7 @@ public:
{
int id;
- if(!m_fileMap.contains(lookup->file())) {
+ if(!m_fileMap.tqcontains(lookup->file())) {
#if HAVE_MUSICBRAINZ >= 4
id = tp_AddFile(m_pimp, TQFile::encodeName(lookup->file()), 0);
#else
@@ -95,9 +95,9 @@ public:
bool lookupMapContains(int fileId) const
{
m_lookupMapMutex.lock();
- bool contains = m_lookupMap.contains(fileId);
+ bool tqcontains = m_lookupMap.tqcontains(fileId);
m_lookupMapMutex.unlock();
- return contains;
+ return tqcontains;
}
KTRMLookup *lookup(int fileId) const
@@ -202,17 +202,17 @@ private:
* A custom event type used for signalling that a TRM lookup is finished.
*/
-class KTRMEvent : public QCustomEvent
+class KTRMEvent : public TQCustomEvent
{
public:
- enum Status {
+ enum tqStatus {
Recognized,
Unrecognized,
Collision,
Error
};
- KTRMEvent(int fileId, Status status) :
+ KTRMEvent(int fileId, tqStatus status) :
TQCustomEvent(id),
m_fileId(fileId),
m_status(status) {}
@@ -222,7 +222,7 @@ public:
return m_fileId;
}
- Status status() const
+ tqStatus status() const
{
return m_status;
}
@@ -231,7 +231,7 @@ public:
private:
int m_fileId;
- Status m_status;
+ tqStatus m_status;
};
/**
@@ -239,10 +239,10 @@ private:
* thread) for the lookup.
*/
-class KTRMEventHandler : public QObject
+class KTRMEventHandler : public TQObject
{
public:
- static void send(int fileId, KTRMEvent::Status status)
+ static void send(int fileId, KTRMEvent::tqStatus status)
{
KApplication::postEvent(instance(), new KTRMEvent(fileId, status));
}
@@ -303,7 +303,7 @@ protected:
* Callback fuction for TunePimp lookup events.
*/
#if HAVE_MUSICBRAINZ >= 4
-static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFileStatus status)
+static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFiletqStatus status)
#else
static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId)
#endif
@@ -313,7 +313,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type,
#if HAVE_MUSICBRAINZ < 4
track_t track = tp_GetTrack(pimp, fileId);
- TPFileStatus status = tr_GetStatus(track);
+ TPFiletqStatus status = tr_GettqStatus(track);
#endif
switch(status) {
@@ -496,7 +496,7 @@ void KTRMLookup::unrecognized()
tr_Lock(track);
tr_GetTRM(track, trm, 255);
if ( !trm[0] ) {
- tr_SetStatus(track, ePending);
+ tr_SettqStatus(track, ePending);
tp_Wake(KTRMRequestHandler::instance()->tunePimp(), track);
}
else
diff --git a/juk/mediafiles.cpp b/juk/mediafiles.cpp
index 3752ec0..7a0eb6a 100644
--- a/juk/mediafiles.cpp
+++ b/juk/mediafiles.cpp
@@ -45,9 +45,9 @@ namespace MediaFiles {
static const char playlistExtension[] = ".m3u";
}
-TQStringList MediaFiles::openDialog(TQWidget *parent)
+TQStringList MediaFiles::openDialog(TQWidget *tqparent)
{
- KFileDialog dialog(TQString::null, TQString::null, parent, "filedialog", true);
+ KFileDialog dialog(TQString(), TQString(), tqparent, "filedialog", true);
dialog.setOperationMode(KFileDialog::Opening);
dialog.setCaption(i18n("Open"));
@@ -60,11 +60,11 @@ TQStringList MediaFiles::openDialog(TQWidget *parent)
return convertURLsToLocal(dialog.selectedFiles());
}
-TQString MediaFiles::savePlaylistDialog(const TQString &playlistName, TQWidget *parent)
+TQString MediaFiles::savePlaylistDialog(const TQString &playlistName, TQWidget *tqparent)
{
TQString fileName = KFileDialog::getSaveFileName(playlistName + playlistExtension,
TQString("*").append(playlistExtension),
- parent,
+ tqparent,
i18n("Playlists"));
if(!fileName.isEmpty() && !fileName.endsWith(playlistExtension))
fileName.append(playlistExtension);
diff --git a/juk/mediafiles.h b/juk/mediafiles.h
index 342739e..ea6a434 100644
--- a/juk/mediafiles.h
+++ b/juk/mediafiles.h
@@ -24,15 +24,15 @@
namespace MediaFiles
{
/**
- * Creates a JuK specific KFileDialog with the specified parent.
+ * Creates a JuK specific KFileDialog with the specified tqparent.
*/
- TQStringList openDialog(TQWidget *parent = 0);
+ TQStringList openDialog(TQWidget *tqparent = 0);
/**
* Creates a JuK specific KFileDialog for saving a playlist with the name
- * playlistName and the specified parent and returns the file name.
+ * playlistName and the specified tqparent and returns the file name.
*/
- TQString savePlaylistDialog(const TQString &playlistName, TQWidget *parent = 0);
+ TQString savePlaylistDialog(const TQString &playlistName, TQWidget *tqparent = 0);
/**
* Returns true if fileName is a supported media file.
diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp
index 577e240..6a6eb45 100644
--- a/juk/musicbrainzquery.cpp
+++ b/juk/musicbrainzquery.cpp
@@ -68,7 +68,7 @@ void MusicBrainzLookup::error()
void MusicBrainzLookup::message(const TQString &s) const
{
KMainWindow *w = static_cast<KMainWindow *>(kapp->mainWidget());
- w->statusBar()->message(TQString("%1 (%2)").arg(s).arg(m_file.fileInfo().fileName()), 3000);
+ w->statusBar()->message(TQString("%1 (%2)").tqarg(s).tqarg(m_file.fileInfo().fileName()), 3000);
}
void MusicBrainzLookup::confirmation()
@@ -76,20 +76,20 @@ void MusicBrainzLookup::confirmation()
// Here we do a bit of queuing to make sure that we don't pop up multiple
// instances of the confirmation dialog at once.
- static TQValueList< QPair<FileHandle, KTRMResultList> > queue;
+ static TQValueList< TQPair<FileHandle, KTRMResultList> > queue;
if(results().isEmpty())
return;
if(!queue.isEmpty()) {
- queue.append(qMakePair(m_file, results()));
+ queue.append(tqMakePair(m_file, results()));
return;
}
- queue.append(qMakePair(m_file, results()));
+ queue.append(tqMakePair(m_file, results()));
while(!queue.isEmpty()) {
- QPair<FileHandle, KTRMResultList> item = queue.first();
+ TQPair<FileHandle, KTRMResultList> item = queue.first();
FileHandle file = item.first;
KTRMResultList results = item.second;
TrackPickerDialog dialog(file.fileInfo().fileName(), results);
diff --git a/juk/musicbrainzquery.h b/juk/musicbrainzquery.h
index d88b166..195006e 100644
--- a/juk/musicbrainzquery.h
+++ b/juk/musicbrainzquery.h
@@ -13,8 +13,8 @@
* *
***************************************************************************/
-#ifndef MUSICBRAINZQUERY_H
-#define MUSICBRAINZQUERY_H
+#ifndef MUSICBRAINZTQUERY_H
+#define MUSICBRAINZTQUERY_H
#include <config.h>
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index 4256ecf..ebf03b9 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -39,17 +39,17 @@
static const int imageSize = 64;
-struct Line : public QFrame
+struct Line : public TQFrame
{
- Line(TQWidget *parent) : TQFrame(parent) { setFrameShape(VLine); }
+ Line(TQWidget *tqparent) : TQFrame(tqparent) { setFrameShape(VLine); }
};
////////////////////////////////////////////////////////////////////////////////
// NowPlaying
////////////////////////////////////////////////////////////////////////////////
-NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const char *name) :
- TQHBox(parent, name),
+NowPlaying::NowPlaying(TQWidget *tqparent, PlaylistCollection *collection, const char *name) :
+ TQHBox(tqparent, name),
m_observer(this, collection),
m_collection(collection)
{
@@ -58,9 +58,9 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c
CollectionList::instance()->addObserver(&m_observer);
- layout()->setMargin(5);
- layout()->setSpacing(3);
- setFixedHeight(imageSize + 2 + layout()->margin() * 2);
+ tqlayout()->setMargin(5);
+ tqlayout()->setSpacing(3);
+ setFixedHeight(imageSize + 2 + tqlayout()->margin() * 2);
setStretchFactor(new CoverItem(this), 0);
setStretchFactor(new TrackItem(this), 2);
@@ -105,11 +105,11 @@ void NowPlaying::slotUpdate()
// CoverItem
////////////////////////////////////////////////////////////////////////////////
-CoverItem::CoverItem(NowPlaying *parent) :
- TQLabel(parent, "CoverItem"),
- NowPlayingItem(parent)
+CoverItem::CoverItem(NowPlaying *tqparent) :
+ TQLabel(tqparent, "CoverItem"),
+ NowPlayingItem(tqparent)
{
- setFixedHeight(parent->height() - parent->layout()->margin() * 2);
+ setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2);
setFrameStyle(Box | Plain);
setLineWidth(1);
setMargin(1);
@@ -123,7 +123,7 @@ void CoverItem::update(const FileHandle &file)
if(file.coverInfo()->hasCover()) {
show();
TQImage image = file.coverInfo()->pixmap(CoverInfo::Thumbnail).convertToImage();
- setPixmap(image.smoothScale(imageSize, imageSize, TQImage::ScaleMin));
+ setPixmap(image.smoothScale(imageSize, imageSize, TQ_ScaleMin));
}
else
hide();
@@ -138,7 +138,7 @@ void CoverItem::mouseReleaseEvent(TQMouseEvent *event)
if(event->x() >= 0 && event->y() >= 0 &&
event->x() < width() && event->y() < height() &&
- event->button() == LeftButton &&
+ event->button() == Qt::LeftButton &&
m_file.coverInfo()->hasCover())
{
m_file.coverInfo()->popup();
@@ -159,7 +159,7 @@ void CoverItem::mouseMoveEvent(TQMouseEvent *e)
return;
TQPoint diff = m_dragStart - e->globalPos();
- if(QABS(diff.x()) > 1 || QABS(diff.y()) > 1) {
+ if(TQABS(diff.x()) > 1 || TQABS(diff.y()) > 1) {
// Start a drag.
@@ -214,21 +214,21 @@ void CoverItem::dropEvent(TQDropEvent *e)
// TrackItem
////////////////////////////////////////////////////////////////////////////////
-TrackItem::TrackItem(NowPlaying *parent) :
- TQWidget(parent, "TrackItem"),
- NowPlayingItem(parent)
+TrackItem::TrackItem(NowPlaying *tqparent) :
+ TQWidget(tqparent, "TrackItem"),
+ NowPlayingItem(tqparent)
{
- setFixedHeight(parent->height() - parent->layout()->margin() * 2);
- setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+ setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2);
+ tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
- TQVBoxLayout *layout = new TQVBoxLayout(this);
+ TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
m_label = new LinkLabel(this);
m_label->setLinkUnderline(false);
- layout->addStretch();
- layout->addWidget(m_label);
- layout->addStretch();
+ tqlayout->addStretch();
+ tqlayout->addWidget(m_label);
+ tqlayout->addStretch();
connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this,
TQT_SLOT(slotOpenLink(const TQString &)));
@@ -242,7 +242,7 @@ void TrackItem::update(const FileHandle &file)
void TrackItem::slotOpenLink(const TQString &link)
{
- PlaylistCollection *collection = NowPlayingItem::parent()->collection();
+ PlaylistCollection *collection = NowPlayingItem::tqparent()->collection();
if(link == "artist")
collection->showMore(m_file.tag()->artist());
@@ -259,7 +259,7 @@ void TrackItem::slotUpdate()
TQString title = TQStyleSheet::escape(m_file.tag()->title());
TQString artist = TQStyleSheet::escape(m_file.tag()->artist());
TQString album = TQStyleSheet::escape(m_file.tag()->album());
- TQString separator = (artist.isNull() || album.isNull()) ? TQString::null : TQString(" - ");
+ TQString separator = (artist.isNull() || album.isNull()) ? TQString() : TQString(" - ");
// This block-o-nastiness makes the font smaller and smaller until it actually fits.
@@ -269,32 +269,32 @@ void TrackItem::slotUpdate()
"<br />"
"<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>";
- if(NowPlayingItem::parent()->collection()->showMoreActive())
- format.append(TQString(" (<a href=\"clear\">%1</a>)").arg(i18n("back to playlist")));
+ if(NowPlayingItem::tqparent()->collection()->showMoreActive())
+ format.append(TQString(" (<a href=\"clear\">%1</a>)").tqarg(i18n("back to playlist")));
format.append("</font>");
do {
- m_label->setText(format.arg(size).arg(title).arg(size - 2)
- .arg(artist).arg(separator).arg(album));
+ m_label->setText(format.tqarg(size).tqarg(title).tqarg(size - 2)
+ .tqarg(artist).tqarg(separator).tqarg(album));
--size;
} while(m_label->heightForWidth(m_label->width()) > imageSize && size >= 0);
- m_label->setFixedHeight(QMIN(imageSize, m_label->heightForWidth(m_label->width())));
+ m_label->setFixedHeight(TQMIN(imageSize, m_label->heightForWidth(m_label->width())));
}
////////////////////////////////////////////////////////////////////////////////
// HistoryItem
////////////////////////////////////////////////////////////////////////////////
-HistoryItem::HistoryItem(NowPlaying *parent) :
- LinkLabel(parent, "HistoryItem"),
- NowPlayingItem(parent)
+HistoryItem::HistoryItem(NowPlaying *tqparent) :
+ LinkLabel(tqparent, "HistoryItem"),
+ NowPlayingItem(tqparent)
{
- setFixedHeight(parent->height() - parent->layout()->margin() * 2);
- setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+ setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2);
+ tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
setLinkUnderline(false);
- setText(TQString("<b>%1</b>").arg(i18n("History")));
+ setText(TQString("<b>%1</b>").tqarg(i18n("History")));
m_timer = new TQTimer(this);
connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying()));
@@ -309,14 +309,14 @@ void HistoryItem::update(const FileHandle &file)
m_history.remove(m_history.fromLast());
TQString format = "<br /><a href=\"%1\"><font size=\"-1\">%2</font></a>";
- TQString current = TQString("<b>%1</b>").arg(i18n("History"));
+ TQString current = TQString("<b>%1</b>").tqarg(i18n("History"));
TQString previous;
for(TQValueList<Item>::ConstIterator it = m_history.begin();
it != m_history.end(); ++it)
{
previous = current;
- current.append(format.arg((*it).anchor).arg(TQStyleSheet::escape((*it).file.tag()->title())));
+ current.append(format.tqarg((*it).anchor).tqarg(TQStyleSheet::escape((*it).file.tag()->title())));
setText(current);
if(heightForWidth(width()) > imageSize) {
setText(previous);
@@ -342,7 +342,7 @@ void HistoryItem::openLink(const TQString &link)
(*it).playlist->clearSelection();
(*it).playlist->setSelected(item, true);
(*it).playlist->ensureItemVisible(item);
- NowPlayingItem::parent()->collection()->raise((*it).playlist);
+ NowPlayingItem::tqparent()->collection()->raise((*it).playlist);
}
break;
}
diff --git a/juk/nowplaying.h b/juk/nowplaying.h
index 0a60c27..bacc658 100644
--- a/juk/nowplaying.h
+++ b/juk/nowplaying.h
@@ -37,12 +37,13 @@ class Playlist;
* when the playing item changes.
*/
-class NowPlaying : public QHBox
+class NowPlaying : public TQHBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- NowPlaying(TQWidget *parent, PlaylistCollection *collection,
+ NowPlaying(TQWidget *tqparent, PlaylistCollection *collection,
const char *name = 0);
void addItem(NowPlayingItem *item);
PlaylistCollection *collection() const;
@@ -53,9 +54,9 @@ private slots:
private:
struct Observer : public PlaylistObserver
{
- Observer(NowPlaying *parent, PlaylistInterface *playlist) :
+ Observer(NowPlaying *tqparent, PlaylistInterface *playlist) :
PlaylistObserver(playlist),
- m_parent(parent) {}
+ m_parent(tqparent) {}
virtual void updateCurrent() {}
virtual void updateData() { m_parent->slotUpdate(); }
NowPlaying *m_parent;
@@ -75,9 +76,9 @@ class NowPlayingItem
{
public:
virtual void update(const FileHandle &file) = 0;
- NowPlaying *parent() const { return m_parent; }
+ NowPlaying *tqparent() const { return m_parent; }
protected:
- NowPlayingItem(NowPlaying *parent) : m_parent(parent) { parent->addItem(this); }
+ NowPlayingItem(NowPlaying *tqparent) : m_parent(tqparent) { tqparent->addItem(this); }
private:
NowPlaying *m_parent;
};
@@ -90,7 +91,7 @@ private:
class CoverItem : public TQLabel, public NowPlayingItem
{
public:
- CoverItem(NowPlaying *parent);
+ CoverItem(NowPlaying *tqparent);
virtual void update(const FileHandle &file);
virtual void mouseReleaseEvent(TQMouseEvent *event);
@@ -114,7 +115,7 @@ private:
class LinkLabel : public KActiveLabel
{
public:
- LinkLabel(TQWidget *parent, const char *name = 0) : KActiveLabel(parent, name) {}
+ LinkLabel(TQWidget *tqparent, const char *name = 0) : KActiveLabel(tqparent, name) {}
virtual void openLink(const TQString &) {}
};
@@ -126,9 +127,10 @@ public:
class TrackItem : public TQWidget, public NowPlayingItem
{
Q_OBJECT
+ TQ_OBJECT
public:
- TrackItem(NowPlaying *parent);
+ TrackItem(NowPlaying *tqparent);
virtual void update(const FileHandle &file);
private slots:
@@ -147,9 +149,10 @@ private:
class HistoryItem : public LinkLabel, public NowPlayingItem
{
Q_OBJECT
+ TQ_OBJECT
public:
- HistoryItem(NowPlaying *parent);
+ HistoryItem(NowPlaying *tqparent);
virtual void update(const FileHandle &file);
virtual void openLink(const TQString &link);
diff --git a/juk/player.h b/juk/player.h
index 600e3db..69910aa 100644
--- a/juk/player.h
+++ b/juk/player.h
@@ -20,7 +20,7 @@
#include "filehandle.h"
-class Player : public QObject
+class Player : public TQObject
{
public:
virtual ~Player() {}
diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp
index 1964727..d62c84c 100644
--- a/juk/playermanager.cpp
+++ b/juk/playermanager.cpp
@@ -46,7 +46,7 @@
using namespace ActionCollection;
-enum PlayerManagerStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 };
+enum PlayerManagertqStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 };
////////////////////////////////////////////////////////////////////////////////
// helper functions
@@ -194,7 +194,7 @@ TQStringList PlayerManager::trackProperties()
TQString PlayerManager::trackProperty(const TQString &property) const
{
if(!playing() && !paused())
- return TQString::null;
+ return TQString();
return m_file.property(property);
}
@@ -220,7 +220,7 @@ FileHandle PlayerManager::playingFile() const
TQString PlayerManager::playingString() const
{
if(!playing())
- return TQString::null;
+ return TQString();
TQString str = m_file.tag()->artist() + " - " + m_file.tag()->title();
if(m_file.tag()->artist().isEmpty())
@@ -239,10 +239,10 @@ void PlayerManager::setStatusLabel(StatusLabel *label)
m_statusLabel = label;
}
-KSelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static
+KSelectAction *PlayerManager::playerSelectAction(TQObject *tqparent) // static
{
KSelectAction *action = 0;
- action = new KSelectAction(i18n("&Output To"), 0, parent, "outputSelect");
+ action = new KSelectAction(i18n("&Output To"), 0, tqparent, "outputSelect");
TQStringList l;
#if HAVE_ARTS
diff --git a/juk/playermanager.h b/juk/playermanager.h
index c23c075..3b38476 100644
--- a/juk/playermanager.h
+++ b/juk/playermanager.h
@@ -33,6 +33,7 @@ class PlaylistInterface;
class PlayerManager : public Player, public PlayerIface
{
Q_OBJECT
+ TQ_OBJECT
protected:
PlayerManager();
@@ -61,7 +62,7 @@ public:
TQString randomPlayMode() const;
- static KSelectAction *playerSelectAction(TQObject *parent);
+ static KSelectAction *playerSelectAction(TQObject *tqparent);
public slots:
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index fb21888..51cb509 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -80,11 +80,11 @@ static bool manualResize()
* A tooltip specialized to show full filenames over the file name column.
*/
-class PlaylistToolTip : public QToolTip
+class PlaylistToolTip : public TQToolTip
{
public:
- PlaylistToolTip(TQWidget *parent, Playlist *playlist) :
- TQToolTip(parent), m_playlist(playlist) {}
+ PlaylistToolTip(TQWidget *tqparent, Playlist *playlist) :
+ TQToolTip(tqparent), m_playlist(playlist) {}
virtual void maybeTip(const TQPoint &p)
{
@@ -102,7 +102,7 @@ public:
(column == m_playlist->columnOffset() + PlaylistItem::CoverColumn &&
item->file().coverInfo()->hasCover()))
{
- TQRect r = m_playlist->itemRect(item);
+ TQRect r = m_playlist->tqitemRect(item);
int headerPosition = m_playlist->header()->sectionPos(column);
r.setLeft(headerPosition);
r.setRight(headerPosition + m_playlist->header()->sectionSize(column));
@@ -312,7 +312,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQString &name,
const TQString &iconName) :
KListView(collection->playlistStack(), name.latin1()),
m_collection(collection),
- m_fetcher(new WebImageFetcher(this)),
+ m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
m_selectedCount(0),
m_allowDuplicates(false),
m_polished(false),
@@ -336,7 +336,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items
const TQString &name, const TQString &iconName) :
KListView(collection->playlistStack(), name.latin1()),
m_collection(collection),
- m_fetcher(new WebImageFetcher(this)),
+ m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
m_selectedCount(0),
m_allowDuplicates(false),
m_polished(false),
@@ -361,7 +361,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil
const TQString &iconName) :
KListView(collection->playlistStack()),
m_collection(collection),
- m_fetcher(new WebImageFetcher(this)),
+ m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
m_selectedCount(0),
m_allowDuplicates(false),
m_polished(false),
@@ -385,7 +385,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil
Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) :
KListView(collection->playlistStack()),
m_collection(collection),
- m_fetcher(new WebImageFetcher(this)),
+ m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
m_selectedCount(0),
m_allowDuplicates(false),
m_polished(false),
@@ -543,7 +543,7 @@ void Playlist::save()
TQFile file(m_fileName);
if(!file.open(IO_WriteOnly))
- return KMessageBox::error(this, i18n("Could not save to file %1.").arg(m_fileName));
+ return KMessageBox::error(this, i18n("Could not save to file %1.").tqarg(m_fileName));
TQTextStream stream(&file);
@@ -727,12 +727,12 @@ void Playlist::synchronizePlayingItems(const PlaylistList &sources, bool setMast
void Playlist::copy()
{
- kapp->clipboard()->setData(dragObject(0), QClipboard::Clipboard);
+ kapp->tqclipboard()->setData(dragObject(0), TQClipboard::Clipboard);
}
void Playlist::paste()
{
- decode(kapp->clipboard()->data(), static_cast<PlaylistItem *>(currentItem()));
+ decode(kapp->tqclipboard()->data(), static_cast<PlaylistItem *>(currentItem()));
}
void Playlist::clear()
@@ -750,7 +750,7 @@ void Playlist::slotRefresh()
if(l.isEmpty())
l = visibleItems();
- KApplication::setOverrideCursor(Qt::waitCursor);
+ KApplication::setOverrideCursor(TQt::waitCursor);
for(PlaylistItemList::Iterator it = l.begin(); it != l.end(); ++it) {
(*it)->refreshFromDisk();
@@ -800,7 +800,7 @@ void Playlist::slotRemoveCover()
return;
int button = KMessageBox::warningContinueCancel(this,
i18n("Are you sure you want to delete these covers?"),
- TQString::null,
+ TQString(),
i18n("&Delete Covers"));
if(button == KMessageBox::Continue)
refreshAlbums(items);
@@ -877,7 +877,7 @@ void Playlist::slotCoverChanged(int coverId)
void Playlist::slotGuessTagInfo(TagGuesser::Type type)
{
- KApplication::setOverrideCursor(Qt::waitCursor);
+ KApplication::setOverrideCursor(TQt::waitCursor);
PlaylistItemList items = selectedItems();
setDynamicListsFrozen(true);
@@ -922,7 +922,7 @@ void Playlist::slotWeightDirty(int column)