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
v3.5.13-sru
tpearson 12 years ago
parent e9db3e45ed
commit 1d9d9f5ce4
  1. 100
      amarok/src/Options1.ui
  2. 10
      amarok/src/Options1.ui.h
  3. 82
      amarok/src/Options2.ui
  4. 14
      amarok/src/Options2.ui.h
  5. 92
      amarok/src/Options4.ui
  6. 64
      amarok/src/Options5.ui
  7. 8
      amarok/src/Options5.ui.h
  8. 10
      amarok/src/Options7.ui
  9. 42
      amarok/src/Options8.ui
  10. 2
      amarok/src/Options8.ui.h
  11. 32
      amarok/src/actionclasses.cpp
  12. 13
      amarok/src/actionclasses.h
  13. 25
      amarok/src/amarok.h
  14. 4
      amarok/src/amarok_play_audiocd.desktop
  15. 4
      amarok/src/amarokcore/amarok.kcfg
  16. 12
      amarok/src/amarokcore/amarokdcophandler.cpp
  17. 16
      amarok/src/amarokcore/amarokdcophandler.h
  18. 8
      amarok/src/amarokcore/amarokdcopiface.h
  19. 54
      amarok/src/amarokcore/crashhandler.cpp
  20. 18
      amarok/src/analyzers/analyzerbase.cpp
  21. 20
      amarok/src/analyzers/analyzerbase.h
  22. 50
      amarok/src/analyzers/analyzerfactory.cpp
  23. 8
      amarok/src/analyzers/baranalyzer.cpp
  24. 2
      amarok/src/analyzers/baranalyzer.h
  25. 26
      amarok/src/analyzers/blockanalyzer.cpp
  26. 4
      amarok/src/analyzers/boomanalyzer.cpp
  27. 1
      amarok/src/analyzers/boomanalyzer.h
  28. 6
      amarok/src/analyzers/glanalyzer.cpp
  29. 2
      amarok/src/analyzers/glanalyzer.h
  30. 8
      amarok/src/analyzers/glanalyzer2.cpp
  31. 2
      amarok/src/analyzers/glanalyzer2.h
  32. 12
      amarok/src/analyzers/glanalyzer3.cpp
  33. 2
      amarok/src/analyzers/glanalyzer3.h
  34. 6
      amarok/src/analyzers/sonogram.cpp
  35. 2
      amarok/src/analyzers/turbine.h
  36. 142
      amarok/src/app.cpp
  37. 5
      amarok/src/app.h
  38. 10
      amarok/src/atomicstring.cpp
  39. 8
      amarok/src/atomicstring.h
  40. 4
      amarok/src/browserToolBar.h
  41. 46
      amarok/src/browserbar.cpp
  42. 7
      amarok/src/browserbar.h
  43. 12
      amarok/src/clicklineedit.cpp
  44. 5
      amarok/src/clicklineedit.h
  45. 436
      amarok/src/collectionbrowser.cpp
  46. 33
      amarok/src/collectionbrowser.h
  47. 1252
      amarok/src/collectiondb.cpp
  48. 174
      amarok/src/collectiondb.h
  49. 28
      amarok/src/collectionscanner/collectionscanner.cpp
  50. 3
      amarok/src/collectionscanner/collectionscanner.h
  51. 1
      amarok/src/collectionscanner/collectionscannerdcophandler.h
  52. 2
      amarok/src/colorgenerator.h
  53. 10
      amarok/src/columnlist.cpp
  54. 6
      amarok/src/columnlist.h
  55. 50
      amarok/src/configdialog.cpp
  56. 5
      amarok/src/configdialog.h
  57. 395
      amarok/src/contextbrowser.cpp
  58. 5
      amarok/src/contextbrowser.h
  59. 56
      amarok/src/coverfetcher.cpp
  60. 11
      amarok/src/coverfetcher.h
  61. 80
      amarok/src/covermanager.cpp
  62. 21
      amarok/src/covermanager.h
  63. 24
      amarok/src/cuefile.cpp
  64. 1
      amarok/src/cuefile.h
  65. 326
      amarok/src/database_refactor/collectiondb.cpp
  66. 9
      amarok/src/database_refactor/collectiondb.h
  67. 18
      amarok/src/database_refactor/dbenginebase.cpp
  68. 6
      amarok/src/database_refactor/dbenginebase.h
  69. 36
      amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp
  70. 6
      amarok/src/database_refactor/sqlite/sqlite_dbengine.h
  71. 60
      amarok/src/dbsetup.ui
  72. 2
      amarok/src/dbsetup.ui.h
  73. 22
      amarok/src/debug.h
  74. 12
      amarok/src/deletedialog.cpp
  75. 8
      amarok/src/deletedialog.h
  76. 32
      amarok/src/deletedialogbase.ui
  77. 14
      amarok/src/device/massstorage/massstoragedevicehandler.cpp
  78. 16
      amarok/src/device/nfs/nfsdevicehandler.cpp
  79. 20
      amarok/src/device/smb/smbdevicehandler.cpp
  80. 12
      amarok/src/devicemanager.cpp
  81. 3
      amarok/src/devicemanager.h
  82. 46
      amarok/src/directorylist.cpp
  83. 27
      amarok/src/directorylist.h
  84. 24
      amarok/src/dynamicmode.cpp
  85. 10
      amarok/src/editfilterdialog.cpp
  86. 3
      amarok/src/editfilterdialog.h
  87. 2
      amarok/src/engine/akode/akode-engine.cpp
  88. 4
      amarok/src/engine/helix/COPYING
  89. 20
      amarok/src/engine/helix/Makefile.test
  90. 70
      amarok/src/engine/helix/helix-configdialog.cpp
  91. 18
      amarok/src/engine/helix/helix-configdialog.h
  92. 14
      amarok/src/engine/helix/helix-engine.cpp
  93. 1
      amarok/src/engine/helix/helix-engine.h
  94. 2
      amarok/src/engine/helix/helix-sp/gain.cpp
  95. 2
      amarok/src/engine/helix/helix-sp/gain.h
  96. 26
      amarok/src/engine/helix/helix-sp/helix-include/client/include/hxclsnk.h
  97. 8
      amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h
  98. 156
      amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
  99. 164
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxausvc.h
  100. 44
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxauth.h
  101. 6
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxccf.h
  102. 20
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h
  103. 48
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h
  104. 218
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
  105. 286
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h
  106. 14
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxerror.h
  107. 272
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h
  108. 12
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h
  109. 262
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h
  110. 2
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h
  111. 120
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxplugn.h
  112. 28
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxprefs.h
  113. 14
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h
  114. 4
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtbuf.h
  115. 6
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h
  116. 36
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvalue.h
  117. 40
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvsrc.h
  118. 230
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
  119. 2
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h
  120. 140
      amarok/src/engine/helix/helix-sp/helix-include/common/include/ihxpckts.h
  121. 2
      amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h
  122. 2
      amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h
  123. 6
      amarok/src/engine/helix/helix-sp/helix-sp.cpp
  124. 24
      amarok/src/engine/helix/helix-sp/hspadvisesink.h
  125. 6
      amarok/src/engine/helix/helix-sp/hspalsadevice.cpp
  126. 24
      amarok/src/engine/helix/helix-sp/hspalsadevice.h
  127. 4
      amarok/src/engine/helix/helix-sp/hspauthmgr.h
  128. 2
      amarok/src/engine/helix/helix-sp/hspcontext.cpp
  129. 12
      amarok/src/engine/helix/helix-sp/hspcontext.h
  130. 4
      amarok/src/engine/helix/helix-sp/hsperror.h
  131. 6
      amarok/src/engine/helix/helix-sp/hsphook.cpp
  132. 34
      amarok/src/engine/helix/helix-sp/hsphook.h
  133. 6
      amarok/src/engine/helix/helix-sp/hspvoladvise.h
  134. 236
      amarok/src/engine/helix/hxplayercontrol.cpp
  135. 8
      amarok/src/engine/helix/hxplayercontrol.h
  136. 2
      amarok/src/engine/kdemm/kdemmengine.cpp
  137. 1
      amarok/src/engine/kdemm/kdemmengine.h
  138. 8
      amarok/src/engine/mas/masengine.cpp
  139. 1
      amarok/src/engine/mas/masengine.h
  140. 26
      amarok/src/engine/nmm/HostList.cpp
  141. 1
      amarok/src/engine/nmm/HostList.h
  142. 36
      amarok/src/engine/nmm/HostListItem.cpp
  143. 6
      amarok/src/engine/nmm/HostListItem.h
  144. 2
      amarok/src/engine/nmm/NmmLocation.h
  145. 2
      amarok/src/engine/nmm/ServerregistryPing.cpp
  146. 5
      amarok/src/engine/nmm/ServerregistryPing.h
  147. 4
      amarok/src/engine/nmm/nmm_configdialog.cpp
  148. 1
      amarok/src/engine/nmm/nmm_configdialog.h
  149. 44
      amarok/src/engine/nmm/nmm_configdialogbase.ui
  150. 8
      amarok/src/engine/nmm/nmm_engine.cpp
  151. 3
      amarok/src/engine/nmm/nmm_engine.h
  152. 2
      amarok/src/engine/xine/xine-config.cpp
  153. 7
      amarok/src/engine/xine/xine-config.h
  154. 22
      amarok/src/engine/xine/xine-engine.cpp
  155. 5
      amarok/src/engine/xine/xine-engine.h
  156. 114
      amarok/src/engine/xine/xineconfigbase.ui
  157. 8
      amarok/src/engine/yauap/yauap-engine.cpp
  158. 7
      amarok/src/engine/yauap/yauap-engine.h
  159. 3
      amarok/src/enginebase.h
  160. 20
      amarok/src/enginecontroller.cpp
  161. 1
      amarok/src/enginecontroller.h
  162. 4
      amarok/src/engineobserver.cpp
  163. 20
      amarok/src/equalizergraph.cpp
  164. 12
      amarok/src/equalizergraph.h
  165. 10
      amarok/src/equalizerpresetmanager.cpp
  166. 9
      amarok/src/equalizerpresetmanager.h
  167. 34
      amarok/src/equalizersetup.cpp
  168. 9
      amarok/src/equalizersetup.h
  169. 16
      amarok/src/expression.cpp
  170. 38
      amarok/src/filebrowser.cpp
  171. 10
      amarok/src/filebrowser.h
  172. 32
      amarok/src/firstrunwizard.ui
  173. 4
      amarok/src/firstrunwizard.ui.h
  174. 18
      amarok/src/hintlineedit.cpp
  175. 9
      amarok/src/hintlineedit.h
  176. 168
      amarok/src/htmlview.cpp
  177. 3
      amarok/src/htmlview.h
  178. 10
      amarok/src/iconloader.cpp
  179. 4
      amarok/src/inotify/inotify-syscalls.h
  180. 14
      amarok/src/inotify/inotify.h
  181. 2
      amarok/src/k3bexporter.cpp
  182. 10
      amarok/src/kbookmarkhandler.cpp
  183. 2
      amarok/src/kbookmarkhandler.h
  184. 16
      amarok/src/konquisidebar/universalamarok.cpp
  185. 14
      amarok/src/konquisidebar/universalamarok.h
  186. 42
      amarok/src/ktrm.cpp
  187. 7
      amarok/src/ktrm.h
  188. 144
      amarok/src/lastfm.cpp
  189. 31
      amarok/src/lastfm.h
  190. 6
      amarok/src/loader/loader.cpp
  191. 2
      amarok/src/loader/loader.h
  192. 3
      amarok/src/magnatunebrowser/magnatunealbumdownloader.h
  193. 18
      amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
  194. 5
      amarok/src/magnatunebrowser/magnatuneartistinfobox.h
  195. 4
      amarok/src/magnatunebrowser/magnatunebrowser.cpp
  196. 3
      amarok/src/magnatunebrowser/magnatunebrowser.h
  197. 4
      amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
  198. 5
      amarok/src/magnatunebrowser/magnatunedownloaddialog.h
  199. 28
      amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
  200. 36
      amarok/src/magnatunebrowser/magnatunedownloadinfo.cpp
  201. 4
      amarok/src/magnatunebrowser/magnatunelistview.cpp
  202. 2
      amarok/src/magnatunebrowser/magnatunelistview.h
  203. 20
      amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
  204. 6
      amarok/src/magnatunebrowser/magnatunelistviewitems.h
  205. 4
      amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp
  206. 5
      amarok/src/magnatunebrowser/magnatunepurchasedialog.h
  207. 84
      amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
  208. 10
      amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
  209. 9
      amarok/src/magnatunebrowser/magnatunepurchasehandler.h
  210. 4
      amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
  211. 3
      amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
  212. 18
      amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
  213. 12
      amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
  214. 5
      amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
  215. 6
      amarok/src/magnatunebrowser/magnatunexmlparser.cpp
  216. 11
      amarok/src/magnatunebrowser/magnatunexmlparser.h
  217. 2
      amarok/src/main.cpp
  218. 332
      amarok/src/mediabrowser.cpp
  219. 58
      amarok/src/mediabrowser.h
  220. 26
      amarok/src/mediadevice/daap/addhostbase.ui
  221. 4
      amarok/src/mediadevice/daap/codes.rb
  222. 80
      amarok/src/mediadevice/daap/daapclient.cpp
  223. 17
      amarok/src/mediadevice/daap/daapclient.h
  224. 4
      amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp
  225. 7
      amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h
  226. 42
      amarok/src/mediadevice/daap/daapreader/reader.cpp
  227. 15
      amarok/src/mediadevice/daap/daapreader/reader.h
  228. 8
      amarok/src/mediadevice/daap/daapserver.cpp
  229. 5
      amarok/src/mediadevice/daap/daapserver.h
  230. 2
      amarok/src/mediadevice/daap/mongrel/http11/ext_help.h
  231. 12
      amarok/src/mediadevice/daap/mongrel/http11/http11.c
  232. 38
      amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c
  233. 2
      amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb
  234. 4
      amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb
  235. 6
      amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb
  236. 2
      amarok/src/mediadevice/daap/mongrel/lib/mongrel/configurator.rb
  237. 4
      amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb
  238. 12
      amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb
  239. 8
      amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb
  240. 6
      amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb
  241. 2
      amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb
  242. 8
      amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb
  243. 2
      amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb
  244. 2
      amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb
  245. 4
      amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb
  246. 4
      amarok/src/mediadevice/daap/proxy.cpp
  247. 7
      amarok/src/mediadevice/daap/proxy.h
  248. 162
      amarok/src/mediadevice/generic/genericmediadevice.cpp
  249. 9
      amarok/src/mediadevice/generic/genericmediadevice.h
  250. 96
      amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
  251. 22
      amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h
  252. 76
      amarok/src/mediadevice/ifp/ifpmediadevice.cpp
  253. 15
      amarok/src/mediadevice/ifp/ifpmediadevice.h
  254. 160
      amarok/src/mediadevice/ipod/ipodmediadevice.cpp
  255. 9
      amarok/src/mediadevice/ipod/ipodmediadevice.h
  256. 122
      amarok/src/mediadevice/mtp/mtpmediadevice.cpp
  257. 29
      amarok/src/mediadevice/mtp/mtpmediadevice.h
  258. 28
      amarok/src/mediadevice/njb/njbmediadevice.cpp
  259. 9
      amarok/src/mediadevice/njb/njbmediadevice.h
  260. 18
      amarok/src/mediadevice/njb/playlist.cpp
  261. 2
      amarok/src/mediadevice/njb/playlist.h
  262. 6
      amarok/src/mediadevice/njb/track.cpp
  263. 14
      amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
  264. 7
      amarok/src/mediadevice/riokarma/riokarmamediadevice.h
  265. 22
      amarok/src/mediadevicemanager.cpp
  266. 3
      amarok/src/mediadevicemanager.h
  267. 52
      amarok/src/medium.cpp
  268. 2
      amarok/src/medium.h
  269. 58
      amarok/src/mediumpluginmanager.cpp
  270. 10
      amarok/src/mediumpluginmanager.h
  271. 162
      amarok/src/metabundle.cpp
  272. 14
      amarok/src/metabundle.h
  273. 12
      amarok/src/metabundlesaver.cpp
  274. 5
      amarok/src/metabundlesaver.h
  275. 8
      amarok/src/metadata/asf/asfattribute.cpp
  276. 6
      amarok/src/metadata/asf/asfattribute.h
  277. 8
      amarok/src/metadata/asf/asffile.cpp
  278. 2
      amarok/src/metadata/asf/asffile.h
  279. 2
      amarok/src/metadata/m4a/mp4file.h
  280. 2
      amarok/src/metadata/m4a/mp4mvhdbox.cpp
  281. 2
      amarok/src/metadata/m4a/mp4mvhdbox.h
  282. 2
      amarok/src/metadata/m4a/mp4propsproxy.h
  283. 2
      amarok/src/metadata/trueaudio/ttafile.h
  284. 2
      amarok/src/metadata/wavpack/wvfile.h
  285. 32
      amarok/src/moodbar.cpp
  286. 10
      amarok/src/moodbar.h
  287. 48
      amarok/src/mountpointmanager.cpp
  288. 1
      amarok/src/mountpointmanager.h
  289. 198
      amarok/src/multitabbar.cpp
  290. 25
      amarok/src/multitabbar.h
  291. 11
      amarok/src/multitabbar_p.h
  292. 18
      amarok/src/mydirlister.h
  293. 4
      amarok/src/mydiroperator.cpp
  294. 3
      amarok/src/mydiroperator.h
  295. 32
      amarok/src/newdynamic.ui
  296. 86
      amarok/src/organizecollectiondialog.ui
  297. 24
      amarok/src/organizecollectiondialog.ui.h
  298. 168
      amarok/src/osd.cpp
  299. 15
      amarok/src/osd.h
  300. 4
      amarok/src/pixmapviewer.cpp
  301. 1
      amarok/src/pixmapviewer.h
  302. 110
      amarok/src/playerwindow.cpp
  303. 8
      amarok/src/playerwindow.h
  304. 344
      amarok/src/playlist.cpp
  305. 23
      amarok/src/playlist.h
  306. 364
      amarok/src/playlistbrowser.cpp
  307. 50
      amarok/src/playlistbrowser.h
  308. 360
      amarok/src/playlistbrowseritem.cpp
  309. 96
      amarok/src/playlistbrowseritem.h
  310. 82
      amarok/src/playlistitem.cpp
  311. 4
      amarok/src/playlistitem.h
  312. 56
      amarok/src/playlistloader.cpp
  313. 15
      amarok/src/playlistloader.h
  314. 50
      amarok/src/playlistselection.cpp
  315. 19
      amarok/src/playlistselection.h
  316. 130
      amarok/src/playlistwindow.cpp
  317. 13
      amarok/src/playlistwindow.h
  318. 6
      amarok/src/plugin/plugin.cpp
  319. 4
      amarok/src/plugin/plugin.h
  320. 3
      amarok/src/plugin/pluginconfig.h
  321. 18
      amarok/src/pluginmanager.cpp
  322. 8
      amarok/src/pluginmanager.h
  323. 26
      amarok/src/podcastbundle.h
  324. 8
      amarok/src/podcastsettings.cpp
  325. 7
      amarok/src/podcastsettings.h
  326. 28
      amarok/src/podcastsettingsbase.ui
  327. 30
      amarok/src/prettypopupmenu.cpp
  328. 3
      amarok/src/prettypopupmenu.h
  329. 30
      amarok/src/qstringx.h
  330. 56
      amarok/src/queuemanager.cpp
  331. 16
      amarok/src/queuemanager.h
  332. 6
      amarok/src/refreshimages.cpp
  333. 5
      amarok/src/refreshimages.h
  334. 22
      amarok/src/scancontroller.cpp
  335. 12
      amarok/src/scancontroller.h
  336. 88
      amarok/src/scriptmanager.cpp
  337. 11
      amarok/src/scriptmanager.h
  338. 24
      amarok/src/scriptmanagerbase.ui
  339. 4
      amarok/src/scripts/alarm/COPYING
  340. 2
      amarok/src/scripts/alarm/alarm.py
  341. 2
      amarok/src/scripts/amarok_live/amarok.live.remaster.part1.sh
  342. 12
      amarok/src/scripts/amarok_live/amarok_live.py
  343. 6
      amarok/src/scripts/common/Zeroconf.py
  344. 2
      amarok/src/scripts/databasescripts/TODO
  345. 32
      amarok/src/scripts/databasescripts/databaseScripts.rb
  346. 4
      amarok/src/scripts/embedcover/COPYING
  347. 2
      amarok/src/scripts/embedcover/addimage2mp3.rb
  348. 44
      amarok/src/scripts/graphequalizer/eqdialog.ui
  349. 2
      amarok/src/scripts/graphequalizer/eqdialog.ui.h
  350. 14
      amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
  351. 20
      amarok/src/scripts/graphequalizer/equalizercanvasview.h
  352. 7
      amarok/src/scripts/graphequalizer/equalizerdialog.h
  353. 8
      amarok/src/scripts/graphequalizer/stdinreader.h
  354. 4
      amarok/src/scripts/lyrics_astraweb/COPYING
  355. 4
      amarok/src/scripts/lyrics_lyrc/COPYING
  356. 4
      amarok/src/scripts/mp3fix/COPYING
  357. 6
      amarok/src/scripts/playlist2html/Playlist.py
  358. 4
      amarok/src/scripts/score_default/COPYING
  359. 4
      amarok/src/scripts/score_impulsive/COPYING
  360. 2
      amarok/src/scripts/templates/amarok.rb
  361. 14
      amarok/src/scripts/templates/python_qt_template.py
  362. 12
      amarok/src/scripts/webcontrol/Playlist.py
  363. 30
      amarok/src/scripts/webcontrol/RequestHandler.py
  364. 58
      amarok/src/scripts/webcontrol/WebControl.py
  365. 2
      amarok/src/scripts/webcontrol/main.js
  366. 56
      amarok/src/scrobbler.cpp
  367. 4
      amarok/src/scrobbler.h
  368. 70
      amarok/src/sliderwidget.cpp
  369. 13
      amarok/src/sliderwidget.h
  370. 68
      amarok/src/smartplaylisteditor.cpp
  371. 20
      amarok/src/smartplaylisteditor.h
  372. 30
      amarok/src/socketserver.cpp
  373. 18
      amarok/src/socketserver.h
  374. 10066
      amarok/src/sqlite/sqlite3.c
  375. 566
      amarok/src/sqlite/sqlite3.h
  376. 4
      amarok/src/starmanager.cpp
  377. 3
      amarok/src/starmanager.h
  378. 86
      amarok/src/statistics.cpp
  379. 13
      amarok/src/statistics.h
  380. 16
      amarok/src/statusbar/overlayWidget.cpp
  381. 8
      amarok/src/statusbar/overlayWidget.h
  382. 66
      amarok/src/statusbar/popupMessage.cpp
  383. 13
      amarok/src/statusbar/popupMessage.h
  384. 20
      amarok/src/statusbar/progressBar.cpp
  385. 6
      amarok/src/statusbar/progressBar.h
  386. 40
      amarok/src/statusbar/queueLabel.cpp
  387. 7
      amarok/src/statusbar/queueLabel.h
  388. 15
      amarok/src/statusbar/selectLabel.h
  389. 30
      amarok/src/statusbar/squeezedtextlabel.cpp
  390. 15
      amarok/src/statusbar/squeezedtextlabel.h
  391. 84
      amarok/src/statusbar/statusBarBase.cpp
  392. 27
      amarok/src/statusbar/statusBarBase.h
  393. 44
      amarok/src/statusbar/statusbar.cpp
  394. 3
      amarok/src/statusbar/statusbar.h
  395. 6
      amarok/src/statusbar/timeLabel.h
  396. 11
      amarok/src/statusbar/toggleLabel.h
  397. 18
      amarok/src/systray.cpp
  398. 4
      amarok/src/systray.h
  399. 136
      amarok/src/tagdialog.cpp
  400. 7
      amarok/src/tagdialog.h
  401. 118
      amarok/src/tagdialogbase.ui
  402. 2
      amarok/src/tagdialogbase.ui.h
  403. 42
      amarok/src/tagguesser.cpp
  404. 20
      amarok/src/tagguesserconfigdialog.ui
  405. 2
      amarok/src/tagguesserconfigdialog.ui.h
  406. 26
      amarok/src/threadmanager.cpp
  407. 41
      amarok/src/threadmanager.h
  408. 56
      amarok/src/tooltip.cpp
  409. 13
      amarok/src/tooltip.h
  410. 12
      amarok/src/trackpickerdialog.cpp
  411. 3
      amarok/src/trackpickerdialog.h
  412. 22
      amarok/src/trackpickerdialogbase.ui
  413. 50
      amarok/src/tracktooltip.cpp
  414. 5
      amarok/src/tracktooltip.h
  415. 16
      amarok/src/transferdialog.cpp
  416. 1
      amarok/src/transferdialog.h
  417. 2
      amarok/src/vis/libvisual/CMakeLists.txt
  418. 8
      amarok/src/xmlloader.cpp
  419. 11
      amarok/src/xmlloader.h
  420. 6
      amarok/src/xmlloader_p.h
  421. 34
      amarok/src/xspfplaylist.cpp
  422. 2
      amarok/src/xspfplaylist.h

@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>Options1</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>General</cstring>
</property>
<property name="geometry">
<property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@ -30,7 +30,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>generalBox</cstring>
</property>
@ -44,7 +44,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_ShowSplashscreen</cstring>
</property>
@ -58,7 +58,7 @@
<string>Check to enable the splashscreen during Amarok startup.</string>
</property>
</widget>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_ShowTrayIcon</cstring>
</property>
@ -72,9 +72,9 @@
<string>Check to enable the Amarok system tray icon.</string>
</property>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout5</cstring>
<cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
@ -90,14 +90,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>16</width>
<height>21</height>
</size>
</property>
</spacer>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_AnimateTrayIcon</cstring>
</property>
@ -116,7 +116,7 @@
</widget>
</hbox>
</widget>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_ShowPlayerWindow</cstring>
</property>
@ -130,15 +130,15 @@
<string>Check to enable an extra player window.</string>
</property>
</widget>
<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>textLabel1</cstring>
</property>
@ -155,7 +155,7 @@
<string>Size of the cover image in the context viewer in pixels.</string>
</property>
</widget>
<widget class="QSpinBox">
<widget class="TQSpinBox">
<property name="name">
<cstring>kcfg_CoverPreviewSize</cstring>
</property>
@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>30</width>
<height>20</height>
@ -197,19 +197,19 @@
</spacer>
</hbox>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout7</cstring>
<cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@ -234,7 +234,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@ -254,7 +254,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>50</width>
<height>21</height>
@ -263,22 +263,22 @@
</spacer>
</hbox>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout8</cstring>
<cstring>tqlayout8</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>checkBox_customBrowser</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@ -303,7 +303,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@ -323,7 +323,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>50</width>
<height>21</height>
@ -334,7 +334,7 @@
</widget>
</vbox>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>componentsBox</cstring>
</property>
@ -348,7 +348,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_UseScores</cstring>
</property>
@ -362,7 +362,7 @@
<string>Scores for tracks are calculated automatically, based on your listening habits.</string>
</property>
</widget>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_UseRatings</cstring>
</property>
@ -395,7 +395,7 @@
<string>You need the &lt;a href='http://amarok.kde.org/wiki/Moodbar'&gt;moodbar package&lt;/a&gt; installed to enable the moodbar feature.</string>
</property>
</widget>
<widget class="QFrame">
<widget class="TQFrame">
<property name="name">
<cstring>moodFrame</cstring>
</property>
@ -421,7 +421,7 @@
<property name="spacing">
<number>0</number>
</property>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_ShowMoodbar</cstring>
</property>
@ -441,9 +441,9 @@
<string>Displays a visual representation of the current track in the slider bar of the player window and a column in the playlist window.</string>
</property>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout8_2_2</cstring>
<cstring>tqlayout8_2_2</cstring>
</property>
<hbox>
<property name="name">
@ -459,14 +459,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>16</width>
<height>21</height>
</size>
</property>
</spacer>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_MakeMoodier</cstring>
</property>
@ -483,7 +483,7 @@
<string>When enabled, the hue distribution is quantised and respread evenly, giving a prettier but less meaningful output.</string>
</property>
</widget>
<widget class="QComboBox">
<widget class="TQComboBox">
<item>
<property name="text">
<string>Happy Like a Rainbow</string>
@ -516,7 +516,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>130</width>
<height>20</height>
@ -525,9 +525,9 @@
</spacer>
</hbox>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout7_2_2</cstring>
<cstring>tqlayout7_2_2</cstring>
</property>
<hbox>
<property name="name">
@ -543,14 +543,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>16</width>
<height>21</height>
</size>
</property>
</spacer>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_MoodsWithMusic</cstring>
</property>
@ -573,7 +573,7 @@
</widget>
</vbox>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@ -587,7 +587,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_SavePlaylist</cstring>
</property>
@ -601,7 +601,7 @@
<string>If checked, Amarok saves the current playlist on quit and restores it when restarted.</string>
</property>
</widget>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_RelativePlaylist</cstring>
</property>
@ -615,7 +615,7 @@
<string>If checked, Amarok uses a relative path for the tracks of manually saved playlists</string>
</property>
</widget>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_AutoShowContextBrowser</cstring>
</property>
@ -641,7 +641,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>30</height>
@ -685,13 +685,13 @@
<includes>
<include location="local" impldecl="in implementation">Options1.ui.h</include>
</includes>
<slots>
<Q_SLOTS>
<slot>slotUpdateMoodFrame()</slot>
</slots>
</Q_SLOTS>
<functions>
<function access="private" specifier="non virtual">init()</function>
</functions>
<layoutdefaults spacing="6" margin="11"/>
<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>

@ -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"

@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>Options2</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>Options2</cstring>
</property>
<property name="geometry">
<property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@ -27,7 +27,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>groupBox6</cstring>
</property>
@ -38,7 +38,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_UseCustomIconTheme</cstring>
</property>
@ -54,7 +54,7 @@
</widget>
</vbox>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>groupBox4</cstring>
</property>
@ -65,7 +65,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_UseCustomFonts</cstring>
</property>
@ -82,7 +82,7 @@
<string>Check to enable custom fonts.</string>
</property>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>fontGroupBox</cstring>
</property>
@ -113,7 +113,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@ -157,7 +157,7 @@
<string>The font to use in the playlist window.</string>
</property>
</widget>
<widget class="QLabel" row="1" column="0">
<widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@ -172,7 +172,7 @@
<property name="text">
<string>Player Window:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@ -182,7 +182,7 @@
<string>The font to use in the player window.</string>
</property>
</widget>
<widget class="QLabel" row="2" column="0">
<widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel3_2</cstring>
</property>
@ -252,7 +252,7 @@
</widget>
</vbox>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>groupBox3</cstring>
</property>
@ -263,7 +263,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QButtonGroup">
<widget class="TQButtonGroup">
<property name="name">
<cstring>radioGroup</cstring>
</property>
@ -280,9 +280,9 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QLayoutWidget" row="2" column="0">
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>layout2</cstring>
<cstring>tqlayout2</cstring>
</property>
<vbox>
<property name="name">
@ -291,7 +291,7 @@
<property name="spacing">
<number>0</number>
</property>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>kcfg_SchemeCustom</cstring>
</property>
@ -308,7 +308,7 @@
<string>If selected, Amarok uses the user-defined colors in the playlist.</string>
</property>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>customSchemeBox</cstring>
</property>
@ -334,7 +334,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>fgLabel</cstring>
</property>
@ -349,7 +349,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@ -400,7 +400,7 @@
<string>Selects the color to use as foreground (text) color in the playlist.</string>
</property>
</widget>
<widget class="QLabel" row="1" column="0">
<widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>bgColor</cstring>
</property>
@ -443,13 +443,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<property name="tqmaximumSize">
<size>
<width>192</width>
<height>32767</height>
@ -476,7 +476,7 @@
</widget>
</vbox>
</widget>
<widget class="QRadioButton" row="0" column="0">
<widget class="TQRadioButton" row="0" column="0">
<property name="name">
<cstring>kcfg_SchemeKDE</cstring>
</property>
@ -493,7 +493,7 @@
<string>If selected, Amarok uses the KDE standard colors in the playlist.</string>
</property>
</widget>
<widget class="QRadioButton" row="1" column="0">
<widget class="TQRadioButton" row="1" column="0">
<property name="name">
<cstring>kcfg_SchemeAmarok</cstring>
</property>
@ -526,15 +526,15 @@
<enum>Horizontal</enum>
</property>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout5</cstring>
<cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>textLabel1_3</cstring>
</property>
@ -563,7 +563,7 @@
</widget>
</vbox>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>contextGroupBox</cstring>
</property>
@ -574,15 +574,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout6</cstring>
<cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@ -614,15 +614,15 @@
</widget>
</hbox>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout5</cstring>
<cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>installPushButton</cstring>
</property>
@ -636,7 +636,7 @@
<string>Select and install a new Context Browser style.</string>
</property>
</widget>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>retrievePushButton</cstring>
</property>
@ -660,14 +660,14 @@
<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="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>uninstallPushButton</cstring>
</property>
@ -695,7 +695,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>30</height>
@ -745,17 +745,17 @@
<includes>
<include location="local" impldecl="in implementation">Options2.ui.h</include>
</includes>
<slots>
<Q_SLOTS>
<slot>installPushButton_clicked()</slot>
<slot>retrievePushButton_clicked()</slot>
<slot>uninstallPushButton_clicked()</slot>
<slot>styleComboBox_activated( const QString &amp; s )</slot>
<slot>updateStyleComboBox()</slot>
</slots>
</Q_SLOTS>
<functions>
<function access="private" specifier="non virtual">init()</function>
</functions>
<layoutdefaults spacing="6" margin="11"/>
<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontrequester.h</includehint>
<includehint>kfontrequester.h</includehint>

@ -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( "<p>Are you sure you want to uninstall the theme <strong>%1</strong>?</p>" ).arg( name ),
i18n( "<p>Are you sure you want to uninstall the theme <strong>%1</strong>?</p>" ).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( "<p>Could not uninstall this theme.</p>"
"<p>You may not have sufficient permissions to delete the folder <strong>%1<strong></p>."
).arg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) );
).tqarg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) );
return;
}

@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>Options4</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>Options4</cstring>
</property>
<property name="geometry">
<property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@ -24,7 +24,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QButtonGroup" row="0" column="0">
<widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>opt_crossfade</cstring>
</property>
@ -36,7 +36,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>0</width>
<height>180</height>
@ -59,7 +59,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
<widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>radioButtonNormalPlayback</cstring>
</property>
@ -73,15 +73,15 @@
<string>Enable normal track transition. You may insert a gap of silence between tracks.</string>
</property>
</widget>
<widget class="QLayoutWidget" row="1" column="1">
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
<cstring>layout11</cstring>
<cstring>tqlayout11</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>trackDelayLengthLabel</cstring>
</property>
@ -93,7 +93,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@ -106,7 +106,7 @@
<cstring>kcfg_TrackDelayLength</cstring>
</property>
</widget>
<widget class="QSpinBox">
<widget class="TQSpinBox">
<property name="name">
<cstring>kcfg_TrackDelayLength</cstring>
</property>
@ -118,7 +118,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>160</width>
<height>0</height>
@ -142,7 +142,7 @@
</widget>
</hbox>
</widget>
<widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
<widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_Crossfade</cstring>
</property>
@ -156,23 +156,23 @@
<string>Enable crossfading between tracks.</string>
</property>
</widget>
<widget class="QLayoutWidget" row="3" column="1">
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
<cstring>layout9</cstring>
<cstring>tqlayout9</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout7</cstring>
<cstring>tqlayout7</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>crossfadeLengthLabel</cstring>
</property>
@ -187,7 +187,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@ -200,7 +200,7 @@
<cstring>kcfg_CrossfadeLength</cstring>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>crossfadeDropdownText</cstring>
</property>
@ -215,7 +215,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@ -230,15 +230,15 @@
</widget>
</vbox>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout8</cstring>
<cstring>tqlayout8</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QSpinBox">
<widget class="TQSpinBox">
<property name="name">
<cstring>kcfg_CrossfadeLength</cstring>
</property>
@ -253,7 +253,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>50</width>
<height>0</height>
@ -278,7 +278,7 @@
<string>The length of the crossfade between tracks, in milliseconds.</string>
</property>
</widget>
<widget class="QComboBox">
<widget class="TQComboBox">
<item>
<property name="text">
<string>Always</string>
@ -308,7 +308,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>50</width>
<height>0</height>
@ -338,7 +338,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@ -347,7 +347,7 @@
</spacer>
</grid>
</widget>
<widget class="QCheckBox" row="2" column="0">
<widget class="TQCheckBox" row="2" column="0">
<property name="name">
<cstring>kcfg_FadeoutOnExit</cstring>
</property>
@ -358,7 +358,7 @@
<string>If checked, Amarok will fade out the music on program exit.</string>
</property>
</widget>
<widget class="QCheckBox" row="3" column="0">
<widget class="TQCheckBox" row="3" column="0">
<property name="name">
<cstring>kcfg_ResumePlayback</cstring>
</property>
@ -379,14 +379,14 @@
<property name="sizeType">
<enum>Expanding</enum>