From 1d9d9f5ce46f0220f7b1b350f5ad4e6dc5079ac6 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 18 Apr 2011 03:28:57 +0000 Subject: [PATCH] Finish TQt4 porting of Amarok This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1228394 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- amarok/src/Options1.ui | 100 +- amarok/src/Options1.ui.h | 10 +- amarok/src/Options2.ui | 82 +- amarok/src/Options2.ui.h | 14 +- amarok/src/Options4.ui | 92 +- amarok/src/Options5.ui | 64 +- amarok/src/Options5.ui.h | 8 +- amarok/src/Options7.ui | 10 +- amarok/src/Options8.ui | 42 +- amarok/src/Options8.ui.h | 2 +- amarok/src/actionclasses.cpp | 32 +- amarok/src/actionclasses.h | 13 +- amarok/src/amarok.h | 25 +- amarok/src/amarok_play_audiocd.desktop | 4 +- amarok/src/amarokcore/amarok.kcfg | 4 +- amarok/src/amarokcore/amarokdcophandler.cpp | 12 +- amarok/src/amarokcore/amarokdcophandler.h | 16 +- amarok/src/amarokcore/amarokdcopiface.h | 8 +- amarok/src/amarokcore/crashhandler.cpp | 54 +- amarok/src/analyzers/analyzerbase.cpp | 18 +- amarok/src/analyzers/analyzerbase.h | 20 +- amarok/src/analyzers/analyzerfactory.cpp | 50 +- amarok/src/analyzers/baranalyzer.cpp | 8 +- amarok/src/analyzers/baranalyzer.h | 2 +- amarok/src/analyzers/blockanalyzer.cpp | 26 +- amarok/src/analyzers/boomanalyzer.cpp | 4 +- amarok/src/analyzers/boomanalyzer.h | 1 + amarok/src/analyzers/glanalyzer.cpp | 6 +- amarok/src/analyzers/glanalyzer.h | 2 +- amarok/src/analyzers/glanalyzer2.cpp | 8 +- amarok/src/analyzers/glanalyzer2.h | 2 +- amarok/src/analyzers/glanalyzer3.cpp | 12 +- amarok/src/analyzers/glanalyzer3.h | 2 +- amarok/src/analyzers/sonogram.cpp | 6 +- amarok/src/analyzers/turbine.h | 2 +- amarok/src/app.cpp | 142 +- amarok/src/app.h | 5 +- amarok/src/atomicstring.cpp | 10 +- amarok/src/atomicstring.h | 8 +- amarok/src/browserToolBar.h | 4 +- amarok/src/browserbar.cpp | 46 +- amarok/src/browserbar.h | 7 +- amarok/src/clicklineedit.cpp | 12 +- amarok/src/clicklineedit.h | 5 +- amarok/src/collectionbrowser.cpp | 436 +- amarok/src/collectionbrowser.h | 33 +- amarok/src/collectiondb.cpp | 1252 +- amarok/src/collectiondb.h | 174 +- .../collectionscanner/collectionscanner.cpp | 28 +- .../src/collectionscanner/collectionscanner.h | 3 +- .../collectionscannerdcophandler.h | 1 + amarok/src/colorgenerator.h | 2 +- amarok/src/columnlist.cpp | 10 +- amarok/src/columnlist.h | 6 +- amarok/src/configdialog.cpp | 50 +- amarok/src/configdialog.h | 5 +- amarok/src/contextbrowser.cpp | 395 +- amarok/src/contextbrowser.h | 5 +- amarok/src/coverfetcher.cpp | 56 +- amarok/src/coverfetcher.h | 11 +- amarok/src/covermanager.cpp | 80 +- amarok/src/covermanager.h | 21 +- amarok/src/cuefile.cpp | 24 +- amarok/src/cuefile.h | 1 + amarok/src/database_refactor/collectiondb.cpp | 326 +- amarok/src/database_refactor/collectiondb.h | 9 +- amarok/src/database_refactor/dbenginebase.cpp | 18 +- amarok/src/database_refactor/dbenginebase.h | 6 +- .../sqlite/sqlite_dbengine.cpp | 36 +- .../sqlite/sqlite_dbengine.h | 6 +- amarok/src/dbsetup.ui | 60 +- amarok/src/dbsetup.ui.h | 2 +- amarok/src/debug.h | 22 +- amarok/src/deletedialog.cpp | 12 +- amarok/src/deletedialog.h | 8 +- amarok/src/deletedialogbase.ui | 32 +- .../massstorage/massstoragedevicehandler.cpp | 14 +- amarok/src/device/nfs/nfsdevicehandler.cpp | 16 +- amarok/src/device/smb/smbdevicehandler.cpp | 20 +- amarok/src/devicemanager.cpp | 12 +- amarok/src/devicemanager.h | 3 +- amarok/src/directorylist.cpp | 46 +- amarok/src/directorylist.h | 27 +- amarok/src/dynamicmode.cpp | 24 +- amarok/src/editfilterdialog.cpp | 10 +- amarok/src/editfilterdialog.h | 3 +- amarok/src/engine/akode/akode-engine.cpp | 2 +- amarok/src/engine/helix/COPYING | 4 +- amarok/src/engine/helix/Makefile.test | 20 +- .../src/engine/helix/helix-configdialog.cpp | 70 +- amarok/src/engine/helix/helix-configdialog.h | 18 +- amarok/src/engine/helix/helix-engine.cpp | 14 +- amarok/src/engine/helix/helix-engine.h | 1 + amarok/src/engine/helix/helix-sp/gain.cpp | 2 +- amarok/src/engine/helix/helix-sp/gain.h | 2 +- .../helix-include/client/include/hxclsnk.h | 26 +- .../helix-include/common/container/hxbuffer.h | 8 +- .../helix-include/common/dbgtool/hxassert.h | 156 +- .../helix-include/common/include/hxausvc.h | 164 +- .../helix-include/common/include/hxauth.h | 44 +- .../helix-include/common/include/hxccf.h | 6 +- .../helix-include/common/include/hxcom.h | 20 +- .../helix-include/common/include/hxcomm.h | 48 +- .../helix-include/common/include/hxcore.h | 218 +- .../helix-include/common/include/hxengin.h | 286 +- .../helix-include/common/include/hxerror.h | 14 +- .../helix-include/common/include/hxfiles.h | 272 +- .../helix-include/common/include/hxiids.h | 12 +- .../helix-include/common/include/hxmon.h | 262 +- .../helix-include/common/include/hxpiids.h | 2 +- .../helix-include/common/include/hxplugn.h | 120 +- .../helix-include/common/include/hxprefs.h | 28 +- .../helix-include/common/include/hxresult.h | 14 +- .../helix-include/common/include/hxtbuf.h | 4 +- .../helix-include/common/include/hxtypes.h | 6 +- .../helix-include/common/include/hxvalue.h | 36 +- .../helix-include/common/include/hxvsrc.h | 40 +- .../helix-include/common/include/hxwin.h | 230 +- .../helix-include/common/include/hxwintyp.h | 2 +- .../helix-include/common/include/ihxpckts.h | 140 +- .../helix-include/runtime/hlxclib/stdlib.h | 2 +- .../helix-include/runtime/hlxclib/string.h | 2 +- amarok/src/engine/helix/helix-sp/helix-sp.cpp | 6 +- .../src/engine/helix/helix-sp/hspadvisesink.h | 24 +- .../engine/helix/helix-sp/hspalsadevice.cpp | 6 +- .../src/engine/helix/helix-sp/hspalsadevice.h | 24 +- amarok/src/engine/helix/helix-sp/hspauthmgr.h | 4 +- .../src/engine/helix/helix-sp/hspcontext.cpp | 2 +- amarok/src/engine/helix/helix-sp/hspcontext.h | 12 +- amarok/src/engine/helix/helix-sp/hsperror.h | 4 +- amarok/src/engine/helix/helix-sp/hsphook.cpp | 6 +- amarok/src/engine/helix/helix-sp/hsphook.h | 34 +- .../src/engine/helix/helix-sp/hspvoladvise.h | 6 +- amarok/src/engine/helix/hxplayercontrol.cpp | 236 +- amarok/src/engine/helix/hxplayercontrol.h | 8 +- amarok/src/engine/kdemm/kdemmengine.cpp | 2 +- amarok/src/engine/kdemm/kdemmengine.h | 1 + amarok/src/engine/mas/masengine.cpp | 8 +- amarok/src/engine/mas/masengine.h | 1 + amarok/src/engine/nmm/HostList.cpp | 26 +- amarok/src/engine/nmm/HostList.h | 1 + amarok/src/engine/nmm/HostListItem.cpp | 36 +- amarok/src/engine/nmm/HostListItem.h | 6 +- amarok/src/engine/nmm/NmmLocation.h | 2 +- amarok/src/engine/nmm/ServerregistryPing.cpp | 2 +- amarok/src/engine/nmm/ServerregistryPing.h | 5 +- amarok/src/engine/nmm/nmm_configdialog.cpp | 4 +- amarok/src/engine/nmm/nmm_configdialog.h | 1 + amarok/src/engine/nmm/nmm_configdialogbase.ui | 44 +- amarok/src/engine/nmm/nmm_engine.cpp | 8 +- amarok/src/engine/nmm/nmm_engine.h | 3 +- amarok/src/engine/xine/xine-config.cpp | 2 +- amarok/src/engine/xine/xine-config.h | 7 +- amarok/src/engine/xine/xine-engine.cpp | 22 +- amarok/src/engine/xine/xine-engine.h | 5 +- amarok/src/engine/xine/xineconfigbase.ui | 114 +- amarok/src/engine/yauap/yauap-engine.cpp | 8 +- amarok/src/engine/yauap/yauap-engine.h | 7 +- amarok/src/enginebase.h | 3 +- amarok/src/enginecontroller.cpp | 20 +- amarok/src/enginecontroller.h | 1 + amarok/src/engineobserver.cpp | 4 +- amarok/src/equalizergraph.cpp | 20 +- amarok/src/equalizergraph.h | 12 +- amarok/src/equalizerpresetmanager.cpp | 10 +- amarok/src/equalizerpresetmanager.h | 9 +- amarok/src/equalizersetup.cpp | 34 +- amarok/src/equalizersetup.h | 9 +- amarok/src/expression.cpp | 16 +- amarok/src/filebrowser.cpp | 38 +- amarok/src/filebrowser.h | 10 +- amarok/src/firstrunwizard.ui | 32 +- amarok/src/firstrunwizard.ui.h | 4 +- amarok/src/hintlineedit.cpp | 18 +- amarok/src/hintlineedit.h | 9 +- amarok/src/htmlview.cpp | 168 +- amarok/src/htmlview.h | 3 +- amarok/src/iconloader.cpp | 10 +- amarok/src/inotify/inotify-syscalls.h | 4 +- amarok/src/inotify/inotify.h | 14 +- amarok/src/k3bexporter.cpp | 2 +- amarok/src/kbookmarkhandler.cpp | 10 +- amarok/src/kbookmarkhandler.h | 2 +- amarok/src/konquisidebar/universalamarok.cpp | 16 +- amarok/src/konquisidebar/universalamarok.h | 14 +- amarok/src/ktrm.cpp | 42 +- amarok/src/ktrm.h | 7 +- amarok/src/lastfm.cpp | 144 +- amarok/src/lastfm.h | 31 +- amarok/src/loader/loader.cpp | 6 +- amarok/src/loader/loader.h | 2 +- .../magnatunealbumdownloader.h | 3 +- .../magnatuneartistinfobox.cpp | 18 +- .../magnatunebrowser/magnatuneartistinfobox.h | 5 +- .../src/magnatunebrowser/magnatunebrowser.cpp | 4 +- .../src/magnatunebrowser/magnatunebrowser.h | 3 +- .../magnatunedownloaddialog.cpp | 4 +- .../magnatunedownloaddialog.h | 5 +- .../magnatunedownloaddialogbase.ui | 28 +- .../magnatunedownloadinfo.cpp | 36 +- .../magnatunebrowser/magnatunelistview.cpp | 4 +- .../src/magnatunebrowser/magnatunelistview.h | 2 +- .../magnatunelistviewitems.cpp | 20 +- .../magnatunebrowser/magnatunelistviewitems.h | 6 +- .../magnatunepurchasedialog.cpp | 4 +- .../magnatunepurchasedialog.h | 5 +- .../magnatunepurchasedialogbase.ui | 84 +- .../magnatunepurchasehandler.cpp | 10 +- .../magnatunepurchasehandler.h | 9 +- .../magnatuneredownloaddialog.cpp | 4 +- .../magnatuneredownloaddialog.h | 3 +- .../magnatuneredownloaddialogbase.ui | 18 +- .../magnatuneredownloadhandler.cpp | 12 +- .../magnatuneredownloadhandler.h | 5 +- .../magnatunebrowser/magnatunexmlparser.cpp | 6 +- .../src/magnatunebrowser/magnatunexmlparser.h | 11 +- amarok/src/main.cpp | 2 +- amarok/src/mediabrowser.cpp | 332 +- amarok/src/mediabrowser.h | 58 +- amarok/src/mediadevice/daap/addhostbase.ui | 26 +- amarok/src/mediadevice/daap/codes.rb | 4 +- amarok/src/mediadevice/daap/daapclient.cpp | 80 +- amarok/src/mediadevice/daap/daapclient.h | 17 +- .../authentication/contentfetcher.cpp | 4 +- .../authentication/contentfetcher.h | 7 +- .../mediadevice/daap/daapreader/reader.cpp | 42 +- .../src/mediadevice/daap/daapreader/reader.h | 15 +- amarok/src/mediadevice/daap/daapserver.cpp | 8 +- amarok/src/mediadevice/daap/daapserver.h | 5 +- .../daap/mongrel/http11/ext_help.h | 2 +- .../mediadevice/daap/mongrel/http11/http11.c | 12 +- .../daap/mongrel/http11/tst_delete.c | 38 +- .../daap/mongrel/lib/gem_plugin.rb | 2 +- .../mediadevice/daap/mongrel/lib/mongrel.rb | 4 +- .../daap/mongrel/lib/mongrel/cgi.rb | 6 +- .../daap/mongrel/lib/mongrel/configurator.rb | 2 +- .../daap/mongrel/lib/mongrel/handlers.rb | 4 +- .../mongrel/lib/rubygems/custom_require.rb | 12 +- .../mongrel/lib/rubygems/dependency_list.rb | 8 +- .../daap/mongrel/lib/rubygems/gem_commands.rb | 6 +- .../daap/mongrel/lib/rubygems/open-uri.rb | 2 +- .../daap/mongrel/lib/rubygems/package.rb | 8 +- .../mongrel/lib/rubygems/remote_installer.rb | 2 +- .../daap/mongrel/lib/rubygems/source_index.rb | 2 +- .../daap/mongrel/lib/rubygems/validator.rb | 4 +- amarok/src/mediadevice/daap/proxy.cpp | 4 +- amarok/src/mediadevice/daap/proxy.h | 7 +- .../generic/genericmediadevice.cpp | 162 +- .../mediadevice/generic/genericmediadevice.h | 9 +- .../generic/genericmediadeviceconfigdialog.ui | 96 +- .../genericmediadeviceconfigdialog.ui.h | 22 +- amarok/src/mediadevice/ifp/ifpmediadevice.cpp | 76 +- amarok/src/mediadevice/ifp/ifpmediadevice.h | 15 +- .../src/mediadevice/ipod/ipodmediadevice.cpp | 160 +- amarok/src/mediadevice/ipod/ipodmediadevice.h | 9 +- amarok/src/mediadevice/mtp/mtpmediadevice.cpp | 122 +- amarok/src/mediadevice/mtp/mtpmediadevice.h | 29 +- amarok/src/mediadevice/njb/njbmediadevice.cpp | 28 +- amarok/src/mediadevice/njb/njbmediadevice.h | 9 +- amarok/src/mediadevice/njb/playlist.cpp | 18 +- amarok/src/mediadevice/njb/playlist.h | 2 +- amarok/src/mediadevice/njb/track.cpp | 6 +- .../riokarma/riokarmamediadevice.cpp | 14 +- .../riokarma/riokarmamediadevice.h | 7 +- amarok/src/mediadevicemanager.cpp | 22 +- amarok/src/mediadevicemanager.h | 3 +- amarok/src/medium.cpp | 52 +- amarok/src/medium.h | 2 +- amarok/src/mediumpluginmanager.cpp | 58 +- amarok/src/mediumpluginmanager.h | 10 +- amarok/src/metabundle.cpp | 162 +- amarok/src/metabundle.h | 14 +- amarok/src/metabundlesaver.cpp | 12 +- amarok/src/metabundlesaver.h | 5 +- amarok/src/metadata/asf/asfattribute.cpp | 8 +- amarok/src/metadata/asf/asfattribute.h | 6 +- amarok/src/metadata/asf/asffile.cpp | 8 +- amarok/src/metadata/asf/asffile.h | 2 +- amarok/src/metadata/m4a/mp4file.h | 2 +- amarok/src/metadata/m4a/mp4mvhdbox.cpp | 2 +- amarok/src/metadata/m4a/mp4mvhdbox.h | 2 +- amarok/src/metadata/m4a/mp4propsproxy.h | 2 +- amarok/src/metadata/trueaudio/ttafile.h | 2 +- amarok/src/metadata/wavpack/wvfile.h | 2 +- amarok/src/moodbar.cpp | 32 +- amarok/src/moodbar.h | 10 +- amarok/src/mountpointmanager.cpp | 48 +- amarok/src/mountpointmanager.h | 1 + amarok/src/multitabbar.cpp | 198 +- amarok/src/multitabbar.h | 25 +- amarok/src/multitabbar_p.h | 11 +- amarok/src/mydirlister.h | 18 +- amarok/src/mydiroperator.cpp | 4 +- amarok/src/mydiroperator.h | 3 +- amarok/src/newdynamic.ui | 32 +- amarok/src/organizecollectiondialog.ui | 86 +- amarok/src/organizecollectiondialog.ui.h | 24 +- amarok/src/osd.cpp | 168 +- amarok/src/osd.h | 15 +- amarok/src/pixmapviewer.cpp | 4 +- amarok/src/pixmapviewer.h | 1 + amarok/src/playerwindow.cpp | 110 +- amarok/src/playerwindow.h | 8 +- amarok/src/playlist.cpp | 344 +- amarok/src/playlist.h | 23 +- amarok/src/playlistbrowser.cpp | 364 +- amarok/src/playlistbrowser.h | 50 +- amarok/src/playlistbrowseritem.cpp | 360 +- amarok/src/playlistbrowseritem.h | 96 +- amarok/src/playlistitem.cpp | 82 +- amarok/src/playlistitem.h | 4 +- amarok/src/playlistloader.cpp | 56 +- amarok/src/playlistloader.h | 15 +- amarok/src/playlistselection.cpp | 50 +- amarok/src/playlistselection.h | 19 +- amarok/src/playlistwindow.cpp | 130 +- amarok/src/playlistwindow.h | 13 +- amarok/src/plugin/plugin.cpp | 6 +- amarok/src/plugin/plugin.h | 4 +- amarok/src/plugin/pluginconfig.h | 3 +- amarok/src/pluginmanager.cpp | 18 +- amarok/src/pluginmanager.h | 8 +- amarok/src/podcastbundle.h | 26 +- amarok/src/podcastsettings.cpp | 8 +- amarok/src/podcastsettings.h | 7 +- amarok/src/podcastsettingsbase.ui | 28 +- amarok/src/prettypopupmenu.cpp | 30 +- amarok/src/prettypopupmenu.h | 3 +- amarok/src/qstringx.h | 30 +- amarok/src/queuemanager.cpp | 56 +- amarok/src/queuemanager.h | 16 +- amarok/src/refreshimages.cpp | 6 +- amarok/src/refreshimages.h | 5 +- amarok/src/scancontroller.cpp | 22 +- amarok/src/scancontroller.h | 12 +- amarok/src/scriptmanager.cpp | 88 +- amarok/src/scriptmanager.h | 11 +- amarok/src/scriptmanagerbase.ui | 24 +- amarok/src/scripts/alarm/COPYING | 4 +- amarok/src/scripts/alarm/alarm.py | 2 +- .../amarok_live/amarok.live.remaster.part1.sh | 2 +- amarok/src/scripts/amarok_live/amarok_live.py | 12 +- amarok/src/scripts/common/Zeroconf.py | 6 +- amarok/src/scripts/databasescripts/TODO | 2 +- .../databasescripts/databaseScripts.rb | 32 +- amarok/src/scripts/embedcover/COPYING | 4 +- amarok/src/scripts/embedcover/addimage2mp3.rb | 2 +- amarok/src/scripts/graphequalizer/eqdialog.ui | 44 +- .../src/scripts/graphequalizer/eqdialog.ui.h | 2 +- .../graphequalizer/equalizercanvasview.cpp | 14 +- .../graphequalizer/equalizercanvasview.h | 20 +- .../scripts/graphequalizer/equalizerdialog.h | 7 +- .../src/scripts/graphequalizer/stdinreader.h | 8 +- amarok/src/scripts/lyrics_astraweb/COPYING | 4 +- amarok/src/scripts/lyrics_lyrc/COPYING | 4 +- amarok/src/scripts/mp3fix/COPYING | 4 +- amarok/src/scripts/playlist2html/Playlist.py | 6 +- amarok/src/scripts/score_default/COPYING | 4 +- amarok/src/scripts/score_impulsive/COPYING | 4 +- amarok/src/scripts/templates/amarok.rb | 2 +- .../scripts/templates/python_qt_template.py | 14 +- amarok/src/scripts/webcontrol/Playlist.py | 12 +- .../src/scripts/webcontrol/RequestHandler.py | 30 +- amarok/src/scripts/webcontrol/WebControl.py | 58 +- amarok/src/scripts/webcontrol/main.js | 2 +- amarok/src/scrobbler.cpp | 56 +- amarok/src/scrobbler.h | 4 +- amarok/src/sliderwidget.cpp | 70 +- amarok/src/sliderwidget.h | 13 +- amarok/src/smartplaylisteditor.cpp | 68 +- amarok/src/smartplaylisteditor.h | 20 +- amarok/src/socketserver.cpp | 30 +- amarok/src/socketserver.h | 18 +- amarok/src/sqlite/sqlite3.c | 10066 ++++++++-------- amarok/src/sqlite/sqlite3.h | 566 +- amarok/src/starmanager.cpp | 4 +- amarok/src/starmanager.h | 3 +- amarok/src/statistics.cpp | 86 +- amarok/src/statistics.h | 13 +- amarok/src/statusbar/overlayWidget.cpp | 16 +- amarok/src/statusbar/overlayWidget.h | 8 +- amarok/src/statusbar/popupMessage.cpp | 66 +- amarok/src/statusbar/popupMessage.h | 13 +- amarok/src/statusbar/progressBar.cpp | 20 +- amarok/src/statusbar/progressBar.h | 6 +- amarok/src/statusbar/queueLabel.cpp | 40 +- amarok/src/statusbar/queueLabel.h | 7 +- amarok/src/statusbar/selectLabel.h | 15 +- amarok/src/statusbar/squeezedtextlabel.cpp | 30 +- amarok/src/statusbar/squeezedtextlabel.h | 15 +- amarok/src/statusbar/statusBarBase.cpp | 84 +- amarok/src/statusbar/statusBarBase.h | 27 +- amarok/src/statusbar/statusbar.cpp | 44 +- amarok/src/statusbar/statusbar.h | 3 +- amarok/src/statusbar/timeLabel.h | 6 +- amarok/src/statusbar/toggleLabel.h | 11 +- amarok/src/systray.cpp | 18 +- amarok/src/systray.h | 4 +- amarok/src/tagdialog.cpp | 136 +- amarok/src/tagdialog.h | 7 +- amarok/src/tagdialogbase.ui | 118 +- amarok/src/tagdialogbase.ui.h | 2 +- amarok/src/tagguesser.cpp | 42 +- amarok/src/tagguesserconfigdialog.ui | 20 +- amarok/src/tagguesserconfigdialog.ui.h | 2 +- amarok/src/threadmanager.cpp | 26 +- amarok/src/threadmanager.h | 41 +- amarok/src/tooltip.cpp | 56 +- amarok/src/tooltip.h | 13 +- amarok/src/trackpickerdialog.cpp | 12 +- amarok/src/trackpickerdialog.h | 3 +- amarok/src/trackpickerdialogbase.ui | 22 +- amarok/src/tracktooltip.cpp | 50 +- amarok/src/tracktooltip.h | 5 +- amarok/src/transferdialog.cpp | 16 +- amarok/src/transferdialog.h | 1 + amarok/src/vis/libvisual/CMakeLists.txt | 2 +- amarok/src/xmlloader.cpp | 8 +- amarok/src/xmlloader.h | 11 +- amarok/src/xmlloader_p.h | 6 +- amarok/src/xspfplaylist.cpp | 34 +- amarok/src/xspfplaylist.h | 2 +- 422 files changed, 12815 insertions(+), 12595 deletions(-) diff --git a/amarok/src/Options1.ui b/amarok/src/Options1.ui index 5fa3f3bf..b8d48942 100644 --- a/amarok/src/Options1.ui +++ b/amarok/src/Options1.ui @@ -1,10 +1,10 @@ Options1 - + General - + 0 0 @@ -30,7 +30,7 @@ 0 - + generalBox @@ -44,7 +44,7 @@ unnamed - + kcfg_ShowSplashscreen @@ -58,7 +58,7 @@ Check to enable the splashscreen during Amarok startup. - + kcfg_ShowTrayIcon @@ -72,9 +72,9 @@ Check to enable the Amarok system tray icon. - + - layout5 + tqlayout5 @@ -90,14 +90,14 @@ Fixed - + 16 21 - + kcfg_AnimateTrayIcon @@ -116,7 +116,7 @@ - + kcfg_ShowPlayerWindow @@ -130,15 +130,15 @@ Check to enable an extra player window. - + - layout4 + tqlayout4 unnamed - + textLabel1 @@ -155,7 +155,7 @@ Size of the cover image in the context viewer in pixels. - + kcfg_CoverPreviewSize @@ -188,7 +188,7 @@ Expanding - + 30 20 @@ -197,19 +197,19 @@ - + - layout7 + tqlayout7 unnamed - + textLabel1_2 - + 150 0 @@ -234,7 +234,7 @@ 0 - + 150 0 @@ -254,7 +254,7 @@ Expanding - + 50 21 @@ -263,22 +263,22 @@ - + - layout8 + tqlayout8 unnamed - + checkBox_customBrowser true - + 150 0 @@ -303,7 +303,7 @@ 0 - + 150 0 @@ -323,7 +323,7 @@ Expanding - + 50 21 @@ -334,7 +334,7 @@ - + componentsBox @@ -348,7 +348,7 @@ unnamed - + kcfg_UseScores @@ -362,7 +362,7 @@ Scores for tracks are calculated automatically, based on your listening habits. - + kcfg_UseRatings @@ -395,7 +395,7 @@ You need the <a href='http://amarok.kde.org/wiki/Moodbar'>moodbar package</a> installed to enable the moodbar feature. - + moodFrame @@ -421,7 +421,7 @@ 0 - + kcfg_ShowMoodbar @@ -441,9 +441,9 @@ Displays a visual representation of the current track in the slider bar of the player window and a column in the playlist window. - + - layout8_2_2 + tqlayout8_2_2 @@ -459,14 +459,14 @@ Fixed - + 16 21 - + kcfg_MakeMoodier @@ -483,7 +483,7 @@ When enabled, the hue distribution is quantised and respread evenly, giving a prettier but less meaningful output. - + Happy Like a Rainbow @@ -516,7 +516,7 @@ Expanding - + 130 20 @@ -525,9 +525,9 @@ - + - layout7_2_2 + tqlayout7_2_2 @@ -543,14 +543,14 @@ Fixed - + 16 21 - + kcfg_MoodsWithMusic @@ -573,7 +573,7 @@ - + groupBox2 @@ -587,7 +587,7 @@ unnamed - + kcfg_SavePlaylist @@ -601,7 +601,7 @@ If checked, Amarok saves the current playlist on quit and restores it when restarted. - + kcfg_RelativePlaylist @@ -615,7 +615,7 @@ If checked, Amarok uses a relative path for the tracks of manually saved playlists - + kcfg_AutoShowContextBrowser @@ -641,7 +641,7 @@ Expanding - + 20 30 @@ -685,13 +685,13 @@ Options1.ui.h - + slotUpdateMoodFrame() - + init() - + kcombobox.h klineedit.h diff --git a/amarok/src/Options1.ui.h b/amarok/src/Options1.ui.h index ec21b172..e4f8e723 100644 --- a/amarok/src/Options1.ui.h +++ b/amarok/src/Options1.ui.h @@ -3,7 +3,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -37,11 +37,11 @@ void Options1::init() else ++it; } -#ifdef Q_WS_MAC - if ( KStandardDirs::findExe( "open" ) != TQString::null ) +#ifdef TQ_WS_MAC + if ( KStandardDirs::findExe( "open" ) != TQString() ) browsers.prepend( i18n( "Default Browser" ) ); #else - if ( KStandardDirs::findExe( "kfmclient" ) != TQString::null ) + if ( KStandardDirs::findExe( "kfmclient" ) != TQString() ) browsers.prepend( i18n( "Default KDE Browser" ) ); #endif @@ -51,7 +51,7 @@ void Options1::init() if( index >= 0 ) kComboBox_browser->setCurrentItem( index ); else if( AmarokConfig::externalBrowser() == -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC "open" #else "kfmclient openURL" diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui index 71f2a31e..bb21ca0f 100644 --- a/amarok/src/Options2.ui +++ b/amarok/src/Options2.ui @@ -1,10 +1,10 @@ Options2 - + Options2 - + 0 0 @@ -27,7 +27,7 @@ 0 - + groupBox6 @@ -38,7 +38,7 @@ unnamed - + kcfg_UseCustomIconTheme @@ -54,7 +54,7 @@ - + groupBox4 @@ -65,7 +65,7 @@ unnamed - + kcfg_UseCustomFonts @@ -82,7 +82,7 @@ Check to enable custom fonts. - + fontGroupBox @@ -113,7 +113,7 @@ unnamed - + textLabel3 @@ -157,7 +157,7 @@ The font to use in the playlist window. - + textLabel1 @@ -172,7 +172,7 @@ Player Window: - + AlignVCenter @@ -182,7 +182,7 @@ The font to use in the player window. - + textLabel3_2 @@ -252,7 +252,7 @@ - + groupBox3 @@ -263,7 +263,7 @@ unnamed - + radioGroup @@ -280,9 +280,9 @@ 0 - + - layout2 + tqlayout2 @@ -291,7 +291,7 @@ 0 - + kcfg_SchemeCustom @@ -308,7 +308,7 @@ If selected, Amarok uses the user-defined colors in the playlist. - + customSchemeBox @@ -334,7 +334,7 @@ unnamed - + fgLabel @@ -349,7 +349,7 @@ 0 - + 0 0 @@ -400,7 +400,7 @@ Selects the color to use as foreground (text) color in the playlist. - + bgColor @@ -443,13 +443,13 @@ 0 - + 0 0 - + 192 32767 @@ -476,7 +476,7 @@ - + kcfg_SchemeKDE @@ -493,7 +493,7 @@ If selected, Amarok uses the KDE standard colors in the playlist. - + kcfg_SchemeAmarok @@ -526,15 +526,15 @@ Horizontal - + - layout5 + tqlayout5 unnamed - + textLabel1_3 @@ -563,7 +563,7 @@ - + contextGroupBox @@ -574,15 +574,15 @@ unnamed - + - layout6 + tqlayout6 unnamed - + textLabel1_2 @@ -614,15 +614,15 @@ - + - layout5 + tqlayout5 unnamed - + installPushButton @@ -636,7 +636,7 @@ Select and install a new Context Browser style. - + retrievePushButton @@ -660,14 +660,14 @@ Expanding - + 40 20 - + uninstallPushButton @@ -695,7 +695,7 @@ Expanding - + 20 30 @@ -745,17 +745,17 @@ Options2.ui.h - + installPushButton_clicked() retrievePushButton_clicked() uninstallPushButton_clicked() styleComboBox_activated( const QString & s ) updateStyleComboBox() - + init() - + kfontrequester.h kfontrequester.h diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h index 5601daff..fe6d6e36 100644 --- a/amarok/src/Options2.ui.h +++ b/amarok/src/Options2.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -41,8 +41,8 @@ class AmarokThemeNewStuff : public KNewStuff { public: - AmarokThemeNewStuff(const TQString &type, TQWidget *parentWidget=0) - : KNewStuff( type, parentWidget ) + AmarokThemeNewStuff(const TQString &type, TQWidget *tqparentWidget=0) + : KNewStuff( type, tqparentWidget ) {} bool install( const TQString& fileName ) @@ -80,7 +80,7 @@ void Options2::init() // This method is basically lifted from ScriptManager::slotInstallScript() void Options2::installPushButton_clicked() { - KFileDialog dia( TQString::null, "*.tar *.tar.bz2 *.tar.gz|" + i18n( "Style Packages (*.tar, *.tar.bz2, *.tar.gz)" ), 0, 0, true ); + KFileDialog dia( TQString(), "*.tar *.tar.bz2 *.tar.gz|" + i18n( "Style Packages (*.tar, *.tar.bz2, *.tar.gz)" ), 0, 0, true ); kapp->setTopWidget( &dia ); dia.setCaption( kapp->makeStdCaption( i18n( "Select Style Package" ) ) ); dia.setMode( KFile::File | KFile::ExistingOnly ); @@ -108,7 +108,7 @@ void Options2::retrievePushButton_clicked() // Delete KNewStuff's configuration entries. These entries reflect which styles // are already installed. As we cannot yet keep them in sync after uninstalling // styles, we deactivate the check marks entirely. - Amarok::config()->deleteGroup( "KNewStuffStatus" ); + Amarok::config()->deleteGroup( "KNewStufftqStatus" ); // we need this because KNewStuffGeneric's install function isn't clever enough AmarokThemeNewStuff *kns = new AmarokThemeNewStuff( "amarok/themes", this ); @@ -137,7 +137,7 @@ void Options2::uninstallPushButton_clicked() return; if( KMessageBox::warningContinueCancel( 0, - i18n( "

Are you sure you want to uninstall the theme %1?

" ).arg( name ), + i18n( "

Are you sure you want to uninstall the theme %1?

" ).tqarg( name ), i18n("Uninstall Theme"), i18n("Uninstall") ) == KMessageBox::Cancel ) return; @@ -152,7 +152,7 @@ void Options2::uninstallPushButton_clicked() if( !KIO::NetAccess::del( themeDir, 0 ) ) { KMessageBox::sorry( 0, i18n( "

Could not uninstall this theme.

" "

You may not have sufficient permissions to delete the folder %1

." - ).arg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) ); + ).tqarg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) ); return; } diff --git a/amarok/src/Options4.ui b/amarok/src/Options4.ui index f55eab85..b4ba9c3c 100644 --- a/amarok/src/Options4.ui +++ b/amarok/src/Options4.ui @@ -1,10 +1,10 @@ Options4 - + Options4 - + 0 0 @@ -24,7 +24,7 @@ unnamed - + opt_crossfade @@ -36,7 +36,7 @@ 0 - + 0 180 @@ -59,7 +59,7 @@ unnamed - + radioButtonNormalPlayback @@ -73,15 +73,15 @@ Enable normal track transition. You may insert a gap of silence between tracks. - + - layout11 + tqlayout11 unnamed - + trackDelayLengthLabel @@ -93,7 +93,7 @@ 0 - + 150 0 @@ -106,7 +106,7 @@ kcfg_TrackDelayLength - + kcfg_TrackDelayLength @@ -118,7 +118,7 @@ 0 - + 160 0 @@ -142,7 +142,7 @@ - + kcfg_Crossfade @@ -156,23 +156,23 @@ Enable crossfading between tracks. - + - layout9 + tqlayout9 unnamed - + - layout7 + tqlayout7 unnamed - + crossfadeLengthLabel @@ -187,7 +187,7 @@ 0 - + 150 0 @@ -200,7 +200,7 @@ kcfg_CrossfadeLength - + crossfadeDropdownText @@ -215,7 +215,7 @@ 0 - + 150 0 @@ -230,15 +230,15 @@ - + - layout8 + tqlayout8 unnamed - + kcfg_CrossfadeLength @@ -253,7 +253,7 @@ 0 - + 50 0 @@ -278,7 +278,7 @@ The length of the crossfade between tracks, in milliseconds. - + Always @@ -308,7 +308,7 @@ 0 - + 50 0 @@ -338,7 +338,7 @@ Fixed - + 16 20 @@ -347,7 +347,7 @@ - + kcfg_FadeoutOnExit @@ -358,7 +358,7 @@ If checked, Amarok will fade out the music on program exit. - + kcfg_ResumePlayback @@ -379,14 +379,14 @@ Expanding - + 31 30 - + opt_crossfade_2 @@ -398,7 +398,7 @@ 0 - + 0 120 @@ -421,7 +421,7 @@ unnamed - + radioButtonNormalPlayback_2 @@ -445,30 +445,30 @@ Fixed - + 16 20 - + - layout9_2 + tqlayout9_2 unnamed - + - layout7_2 + tqlayout7_2 unnamed - + fadeoutLengthLabel @@ -483,7 +483,7 @@ 0 - + 150 0 @@ -498,15 +498,15 @@ - + - layout8_2 + tqlayout8_2 unnamed - + kcfg_FadeoutLength @@ -521,7 +521,7 @@ 0 - + 50 0 @@ -550,7 +550,7 @@ - + kcfg_Fadeout @@ -618,5 +618,5 @@ setEnabled(bool) - + diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui index 50c54cc8..5681e76e 100644 --- a/amarok/src/Options5.ui +++ b/amarok/src/Options5.ui @@ -1,10 +1,10 @@ Options5 - + Options5 - + 0 0 @@ -19,7 +19,7 @@ 0 - + kcfg_OsdEnabled @@ -36,9 +36,9 @@ Check to enable the On-Screen-Display. The OSD briefly displays track data when a new track is played. - + - layout2 + tqlayout2 @@ -54,14 +54,14 @@ Fixed - + 16 20 - + mainBox @@ -78,7 +78,7 @@ 0 - + fontBox @@ -119,7 +119,7 @@ The font to use for the On-Screen Display. - + kcfg_OsdDrawShadow @@ -129,7 +129,7 @@ - + groupBox9 @@ -140,9 +140,9 @@ unnamed - + - layout3 + tqlayout3 @@ -151,7 +151,7 @@ 2 - + kcfg_OsdUseCustomColors @@ -165,9 +165,9 @@ Check to enable custom colors for the On-Screen-Display. - + - layout1 + tqlayout1 @@ -183,14 +183,14 @@ Fixed - + 16 20 - + colorsBox @@ -213,7 +213,7 @@ 0 - + textLabel2_2 @@ -293,7 +293,7 @@ The color of the OSD background. - + textLabel2 @@ -318,7 +318,7 @@ - + kcfg_OsdUseFakeTranslucency @@ -328,7 +328,7 @@ - + osdText @@ -345,7 +345,7 @@ unnamed - + kcfg_OsdUsePlaylistColumns @@ -377,7 +377,7 @@ - + groupBox22 @@ -388,7 +388,7 @@ unnamed - + textLabel1 @@ -458,7 +458,7 @@ The screen that should display the OSD. - + textLabel2_3 @@ -504,26 +504,26 @@ - qapplication.h - qdesktopwidget.h + tqapplication.h + tqdesktopwidget.h osd.h OSDPreviewWidget *m_pOSDPreview; - + settingsChanged() - - + + slotPositionChanged() useCustomColorsToggled( bool on ) - + init() hideEvent( QHideEvent * ) showEvent( QShowEvent * ) - + ktextedit.h diff --git a/amarok/src/Options5.ui.h b/amarok/src/Options5.ui.h index 22e0a04e..0bda6b20 100644 --- a/amarok/src/Options5.ui.h +++ b/amarok/src/Options5.ui.h @@ -18,7 +18,7 @@ email : fh@ez.no ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -32,7 +32,7 @@ email : fh@ez.no void Options5::init() { m_pOSDPreview = new OSDPreviewWidget( this ); //must be child!!! - m_pOSDPreview->setAlignment( static_cast( AmarokConfig::osdAlignment() ) ); + m_pOSDPreview->tqsetAlignment( static_cast( AmarokConfig::osdAlignment() ) ); m_pOSDPreview->setOffset( AmarokConfig::osdYOffset() ); connect( m_pOSDPreview, TQT_SIGNAL( positionChanged() ), TQT_SLOT( slotPositionChanged() ) ); @@ -56,7 +56,7 @@ void Options5::init() connect( kcfg_OsdEnabled, TQT_SIGNAL( toggled(bool) ), m_pOSDPreview, TQT_SLOT( setShown(bool) ) ); - Amarok::QStringx text = i18n( + Amarok::TQStringx text = i18n( "

Tags Displayed in OSD

" "You can use the following tokens:" "