Browse Source

Rename a number of old tq methods that are no longer tq specific

pull/1/head
Timothy Pearson 10 years ago
parent
commit
2d3d921590
  1. 36
      amarok/src/Options1.ui
  2. 20
      amarok/src/Options2.ui
  3. 4
      amarok/src/Options2.ui.h
  4. 40
      amarok/src/Options4.ui
  5. 10
      amarok/src/Options5.ui
  6. 4
      amarok/src/Options5.ui.h
  7. 12
      amarok/src/Options8.ui
  8. 2
      amarok/src/actionclasses.cpp
  9. 2
      amarok/src/amarok.h
  10. 2
      amarok/src/amarokcore/amarok.kcfg
  11. 8
      amarok/src/amarokcore/amarokdcophandler.cpp
  12. 8
      amarok/src/amarokcore/amarokdcophandler.h
  13. 8
      amarok/src/amarokcore/amarokdcopiface.h
  14. 40
      amarok/src/amarokcore/crashhandler.cpp
  15. 4
      amarok/src/analyzers/analyzerfactory.cpp
  16. 2
      amarok/src/analyzers/baranalyzer.h
  17. 12
      amarok/src/analyzers/blockanalyzer.cpp
  18. 2
      amarok/src/analyzers/boomanalyzer.cpp
  19. 22
      amarok/src/app.cpp
  20. 2
      amarok/src/atomicstring.cpp
  21. 20
      amarok/src/browserbar.cpp
  22. 8
      amarok/src/clicklineedit.cpp
  23. 74
      amarok/src/collectionbrowser.cpp
  24. 710
      amarok/src/collectiondb.cpp
  25. 4
      amarok/src/collectiondb.h
  26. 24
      amarok/src/configdialog.cpp
  27. 134
      amarok/src/contextbrowser.cpp
  28. 12
      amarok/src/coverfetcher.cpp
  29. 50
      amarok/src/covermanager.cpp
  30. 4
      amarok/src/covermanager.h
  31. 8
      amarok/src/cuefile.cpp
  32. 236
      amarok/src/database_refactor/collectiondb.cpp
  33. 6
      amarok/src/database_refactor/dbenginebase.cpp
  34. 8
      amarok/src/dbsetup.ui
  35. 2
      amarok/src/deletedialog.cpp
  36. 10
      amarok/src/deletedialogbase.ui
  37. 8
      amarok/src/device/massstorage/massstoragedevicehandler.cpp
  38. 12
      amarok/src/device/nfs/nfsdevicehandler.cpp
  39. 12
      amarok/src/device/smb/smbdevicehandler.cpp
  40. 16
      amarok/src/directorylist.cpp
  41. 6
      amarok/src/directorylist.h
  42. 12
      amarok/src/dynamicmode.cpp
  43. 8
      amarok/src/editfilterdialog.cpp
  44. 2
      amarok/src/engine/akode/akode-engine.cpp
  45. 24
      amarok/src/engine/helix/helix-configdialog.cpp
  46. 10
      amarok/src/engine/helix/helix-engine.cpp
  47. 16
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
  48. 4
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h
  49. 4
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h
  50. 16
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h
  51. 2
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h
  52. 6
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h
  53. 12
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
  54. 2
      amarok/src/engine/helix/helix-sp/helix-sp.cpp
  55. 214
      amarok/src/engine/helix/hxplayercontrol.cpp
  56. 4
      amarok/src/engine/helix/hxplayercontrol.h
  57. 4
      amarok/src/engine/kdemm/kdemmengine.cpp
  58. 2
      amarok/src/engine/mas/masengine.cpp
  59. 10
      amarok/src/engine/nmm/HostList.cpp
  60. 22
      amarok/src/engine/nmm/HostListItem.cpp
  61. 6
      amarok/src/engine/nmm/HostListItem.h
  62. 2
      amarok/src/engine/nmm/NmmLocation.h
  63. 2
      amarok/src/engine/nmm/nmm_configdialog.cpp
  64. 12
      amarok/src/engine/nmm/nmm_configdialogbase.ui
  65. 6
      amarok/src/engine/nmm/nmm_engine.cpp
  66. 2
      amarok/src/engine/nmm/nmm_engine.h
  67. 10
      amarok/src/engine/xine/xine-engine.cpp
  68. 26
      amarok/src/engine/xine/xineconfigbase.ui
  69. 2
      amarok/src/engine/yauap/yauap-engine.cpp
  70. 12
      amarok/src/enginecontroller.cpp
  71. 12
      amarok/src/equalizergraph.cpp
  72. 2
      amarok/src/equalizergraph.h
  73. 6
      amarok/src/equalizerpresetmanager.cpp
  74. 18
      amarok/src/equalizersetup.cpp
  75. 8
      amarok/src/filebrowser.cpp
  76. 10
      amarok/src/firstrunwizard.ui
  77. 140
      amarok/src/htmlview.cpp
  78. 8
      amarok/src/konquisidebar/universalamarok.cpp
  79. 2
      amarok/src/konquisidebar/universalamarok.h
  80. 16
      amarok/src/ktrm.cpp
  81. 92
      amarok/src/lastfm.cpp
  82. 2
      amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
  83. 2
      amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
  84. 14
      amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
  85. 2
      amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
  86. 6
      amarok/src/magnatunebrowser/magnatunexmlparser.cpp
  87. 4
      amarok/src/magnatunebrowser/magnatunexmlparser.h
  88. 68
      amarok/src/mediabrowser.cpp
  89. 10
      amarok/src/mediadevice/daap/addhostbase.ui
  90. 6
      amarok/src/mediadevice/daap/daapclient.cpp
  91. 4
      amarok/src/mediadevice/daap/daapreader/reader.cpp
  92. 2
      amarok/src/mediadevice/daap/daapserver.cpp
  93. 4
      amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb
  94. 2
      amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb
  95. 4
      amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb
  96. 2
      amarok/src/mediadevice/daap/proxy.cpp
  97. 38
      amarok/src/mediadevice/generic/genericmediadevice.cpp
  98. 18
      amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
  99. 6
      amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h
  100. 16
      amarok/src/mediadevice/ifp/ifpmediadevice.cpp
  101. 48
      amarok/src/mediadevice/ipod/ipodmediadevice.cpp
  102. 26
      amarok/src/mediadevice/mtp/mtpmediadevice.cpp
  103. 14
      amarok/src/mediadevice/njb/njbmediadevice.cpp
  104. 2
      amarok/src/mediadevice/njb/playlist.cpp
  105. 2
      amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
  106. 36
      amarok/src/mediumpluginmanager.cpp
  107. 2
      amarok/src/mediumpluginmanager.h
  108. 28
      amarok/src/metabundle.cpp
  109. 4
      amarok/src/metabundle.h
  110. 2
      amarok/src/metadata/m4a/mp4file.h
  111. 2
      amarok/src/metadata/m4a/mp4mvhdbox.cpp
  112. 2
      amarok/src/metadata/m4a/mp4mvhdbox.h
  113. 2
      amarok/src/metadata/trueaudio/ttafile.h
  114. 2
      amarok/src/metadata/wavpack/wvfile.h
  115. 6
      amarok/src/moodbar.cpp
  116. 2
      amarok/src/moodbar.h
  117. 22
      amarok/src/mountpointmanager.cpp
  118. 134
      amarok/src/multitabbar.cpp
  119. 4
      amarok/src/multitabbar.h
  120. 18
      amarok/src/mydirlister.h
  121. 2
      amarok/src/mydiroperator.cpp
  122. 14
      amarok/src/newdynamic.ui
  123. 16
      amarok/src/organizecollectiondialog.ui
  124. 6
      amarok/src/organizecollectiondialog.ui.h
  125. 28
      amarok/src/osd.cpp
  126. 6
      amarok/src/osd.h
  127. 22
      amarok/src/playerwindow.cpp
  128. 108
      amarok/src/playlist.cpp
  129. 4
      amarok/src/playlist.h
  130. 66
      amarok/src/playlistbrowser.cpp
  131. 80
      amarok/src/playlistbrowseritem.cpp
  132. 8
      amarok/src/playlistbrowseritem.h
  133. 20
      amarok/src/playlistitem.cpp
  134. 8
      amarok/src/playlistloader.cpp
  135. 8
      amarok/src/playlistselection.cpp
  136. 4
      amarok/src/playlistselection.h
  137. 30
      amarok/src/playlistwindow.cpp
  138. 2
      amarok/src/playlistwindow.h
  139. 16
      amarok/src/pluginmanager.cpp
  140. 4
      amarok/src/podcastsettings.cpp
  141. 4
      amarok/src/podcastsettingsbase.ui
  142. 16
      amarok/src/prettypopupmenu.cpp
  143. 2
      amarok/src/qstringx.h
  144. 12
      amarok/src/queuemanager.cpp
  145. 6
      amarok/src/refreshimages.cpp
  146. 4
      amarok/src/scancontroller.cpp
  147. 38
      amarok/src/scriptmanager.cpp
  148. 2
      amarok/src/scriptmanagerbase.ui
  149. 28
      amarok/src/scripts/databasescripts/databaseScripts.rb
  150. 14
      amarok/src/scripts/graphequalizer/eqdialog.ui
  151. 2
      amarok/src/scripts/graphequalizer/equalizerdialog.cpp
  152. 4
      amarok/src/scripts/graphequalizer/main.cpp
  153. 2
      amarok/src/scripts/graphequalizer/stdinreader.h
  154. 22
      amarok/src/scripts/webcontrol/RequestHandler.py
  155. 38
      amarok/src/scripts/webcontrol/WebControl.py
  156. 42
      amarok/src/scrobbler.cpp
  157. 18
      amarok/src/sliderwidget.cpp
  158. 26
      amarok/src/smartplaylisteditor.cpp
  159. 4
      amarok/src/socketserver.cpp
  160. 132
      amarok/src/sqlite/sqlite3.c
  161. 4
      amarok/src/sqlite/sqlite3.h
  162. 44
      amarok/src/statistics.cpp
  163. 2
      amarok/src/statistics.h
  164. 4
      amarok/src/statusbar/overlayWidget.cpp
  165. 14
      amarok/src/statusbar/popupMessage.cpp
  166. 4
      amarok/src/statusbar/popupMessage.h
  167. 10
      amarok/src/statusbar/progressBar.cpp
  168. 2
      amarok/src/statusbar/progressBar.h
  169. 32
      amarok/src/statusbar/queueLabel.cpp
  170. 6
      amarok/src/statusbar/selectLabel.h
  171. 16
      amarok/src/statusbar/squeezedtextlabel.cpp
  172. 6
      amarok/src/statusbar/squeezedtextlabel.h
  173. 34
      amarok/src/statusbar/statusBarBase.cpp
  174. 8
      amarok/src/statusbar/statusBarBase.h
  175. 36
      amarok/src/statusbar/statusbar.cpp
  176. 2
      amarok/src/statusbar/timeLabel.h
  177. 2
      amarok/src/statusbar/toggleLabel.h
  178. 10
      amarok/src/systray.cpp
  179. 2
      amarok/src/systray.h
  180. 56
      amarok/src/tagdialog.cpp
  181. 36
      amarok/src/tagdialogbase.ui
  182. 2
      amarok/src/tagguesserconfigdialog.ui
  183. 4
      amarok/src/threadmanager.cpp
  184. 4
      amarok/src/threadmanager.h
  185. 14
      amarok/src/tooltip.cpp
  186. 2
      amarok/src/tooltip.h
  187. 6
      amarok/src/trackpickerdialogbase.ui
  188. 26
      amarok/src/tracktooltip.cpp
  189. 16
      amarok/src/transferdialog.cpp
  190. 2
      amarok/src/xmlloader.cpp
  191. 2
      amarok/src/xspfplaylist.h

36
amarok/src/Options1.ui

@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>21</height>
@ -132,7 +132,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@ -199,7 +199,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -209,7 +209,7 @@
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -234,7 +234,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -254,7 +254,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>50</width>
<height>21</height>
@ -265,7 +265,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -278,7 +278,7 @@
<property name="enabled">
<bool>true</bool>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -303,7 +303,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -323,7 +323,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>50</width>
<height>21</height>
@ -443,7 +443,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8_2_2</cstring>
<cstring>layout8_2_2</cstring>
</property>
<hbox>
<property name="name">
@ -459,7 +459,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>21</height>
@ -516,7 +516,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@ -527,7 +527,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7_2_2</cstring>
<cstring>layout7_2_2</cstring>
</property>
<hbox>
<property name="name">
@ -543,7 +543,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>21</height>
@ -641,7 +641,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>30</height>

20
amarok/src/Options2.ui

@ -172,7 +172,7 @@
<property name="text">
<string>Player Window:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">
@ -282,7 +282,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@ -349,7 +349,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@ -443,13 +443,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>192</width>
<height>32767</height>
@ -528,7 +528,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -576,7 +576,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -616,7 +616,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -660,7 +660,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@ -695,7 +695,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>30</height>

4
amarok/src/Options2.ui.h

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

40
amarok/src/Options4.ui

@ -36,7 +36,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>180</height>
@ -75,7 +75,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -93,7 +93,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -118,7 +118,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@ -158,7 +158,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -166,7 +166,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@ -187,7 +187,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -215,7 +215,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -232,7 +232,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -253,7 +253,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@ -308,7 +308,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@ -338,7 +338,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -379,7 +379,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>30</height>
@ -398,7 +398,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>120</height>
@ -445,7 +445,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -454,7 +454,7 @@
</spacer>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
<cstring>tqlayout9_2</cstring>
<cstring>layout9_2</cstring>
</property>
<hbox>
<property name="name">
@ -462,7 +462,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7_2</cstring>
<cstring>layout7_2</cstring>
</property>
<vbox>
<property name="name">
@ -483,7 +483,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -500,7 +500,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8_2</cstring>
<cstring>layout8_2</cstring>
</property>
<vbox>
<property name="name">
@ -521,7 +521,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>

10
amarok/src/Options5.ui

@ -38,7 +38,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -142,7 +142,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -167,7 +167,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -183,7 +183,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>

4
amarok/src/Options5.ui.h

@ -33,7 +33,7 @@ email : fh@ez.no
void Options5::init()
{
m_pOSDPreview = new OSDPreviewWidget( this ); //must be child!!!
m_pOSDPreview->tqsetAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) );
m_pOSDPreview->setAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) );
m_pOSDPreview->setOffset( AmarokConfig::osdYOffset() );
connect( m_pOSDPreview, TQT_SIGNAL( positionChanged() ), TQT_SLOT( slotPositionChanged() ) );
@ -92,7 +92,7 @@ void Options5::init()
<< "%year " << "%length" << "%track" << "%filename" << "%directory"
<< "%type" << "%comment" << "%score" << "%playcount" << "%discnumber"
<< "%rating" << "%moodbar" << "%elapsed"
<< "%title {" + i18n( "Score: %1" ).tqarg( "%score" ) +'}' ) );
<< "%title {" + i18n( "Score: %1" ).arg( "%score" ) +'}' ) );
}
void

12
amarok/src/Options8.ui

@ -12,7 +12,7 @@
<height>418</height>
</rect>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>1</width>
<height>1</height>
@ -30,7 +30,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -54,7 +54,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>
@ -70,7 +70,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>-1</width>
<height>-1</height>
@ -111,7 +111,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@ -271,7 +271,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>30</height>

2
amarok/src/actionclasses.cpp

@ -434,7 +434,7 @@ VolumeAction::plug( TQWidget *w, int index )
m_slider = new Amarok::VolumeSlider( w, Amarok::VOLUME_MAX );
m_slider->setName( "ToolBarVolume" );
m_slider->setValue( AmarokConfig::masterVolume() );
m_slider->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Ignored );
m_slider->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Ignored );
TQToolTip::add( m_slider, i18n( "Volume control" ) );

2
amarok/src/amarok.h

@ -111,7 +111,7 @@ namespace Amarok
*/
class OverrideCursor { //defined in app.cpp
public:
OverrideCursor( TQt::tqCursorShape cursor = TQt::WaitCursor );
OverrideCursor( TQt::CursorShape cursor = TQt::WaitCursor );
~OverrideCursor();
};

2
amarok/src/amarokcore/amarok.kcfg

@ -443,7 +443,7 @@
</entry>
<entry key="Osd Y Offset" type="Int">
<label>Y position offset</label>
<whatsthis>The Y position of the OSD relative to the chosen screen and OSD tqalignment. If Top tqalignment is chosen the Y offset is the space between the upper part of the OSD and the top of the screen. If Bottom tqalignment is chosen the Y offset is the space between the bottom part of the OSD and the bottom of the screen.</whatsthis>
<whatsthis>The Y position of the OSD relative to the chosen screen and OSD alignment. If Top alignment is chosen the Y offset is the space between the upper part of the OSD and the top of the screen. If Bottom alignment is chosen the Y offset is the space between the bottom part of the OSD and the bottom of the screen.</whatsthis>
<default>50</default>
<min>0</min>
<max>10000</max>

8
amarok/src/amarokcore/amarokdcophandler.cpp

@ -72,7 +72,7 @@ namespace Amarok
return APP_VERSION;
}
bool DcopPlayerHandler::dynamicModetqStatus()
bool DcopPlayerHandler::dynamicModeStatus()
{
return Amarok::dynamicMode();
}
@ -95,17 +95,17 @@ namespace Amarok
return EngineController::engine()->state() == Engine::Playing;
}
bool DcopPlayerHandler::randomModetqStatus()
bool DcopPlayerHandler::randomModeStatus()
{
return AmarokConfig::randomMode();
}
bool DcopPlayerHandler::repeatPlaylisttqStatus()
bool DcopPlayerHandler::repeatPlaylistStatus()
{
return Amarok::repeatPlaylist();
}
bool DcopPlayerHandler::repeatTracktqStatus()
bool DcopPlayerHandler::repeatTrackStatus()
{
return Amarok::repeatTrack();
}

8
amarok/src/amarokcore/amarokdcophandler.h

@ -37,13 +37,13 @@ class DcopPlayerHandler : public TQObject, virtual public AmarokPlayerInterface
public:
virtual TQString version();
virtual bool dynamicModetqStatus();
virtual bool dynamicModeStatus();
virtual bool equalizerEnabled();
virtual bool osdEnabled();
virtual bool isPlaying();
virtual bool randomModetqStatus();
virtual bool repeatPlaylisttqStatus();
virtual bool repeatTracktqStatus();
virtual bool randomModeStatus();
virtual bool repeatPlaylistStatus();
virtual bool repeatTrackStatus();
virtual int getVolume();
virtual int sampleRate();
virtual float score ();

8
amarok/src/amarokcore/amarokdcopiface.h

@ -36,13 +36,13 @@ class AmarokPlayerInterface : virtual public DCOPObject
k_dcop:
virtual TQString version() = 0; ///< returns amarok version string
virtual bool dynamicModetqStatus() = 0; ///< Return dynamic mode status.
virtual bool dynamicModeStatus() = 0; ///< Return dynamic mode status.
virtual bool equalizerEnabled() = 0; ///< Return the equalizer status.
virtual bool osdEnabled() = 0; ///< Return the OSD display status.
virtual bool isPlaying() = 0; ///< Return true if something is playing now.
virtual bool randomModetqStatus() = 0; ///< Return random mode status.
virtual bool repeatPlaylisttqStatus() = 0; ///< Return repeat playlist status.
virtual bool repeatTracktqStatus() = 0; ///< Return repeat track status.
virtual bool randomModeStatus() = 0; ///< Return random mode status.
virtual bool repeatPlaylistStatus() = 0; ///< Return repeat playlist status.
virtual bool repeatTrackStatus() = 0; ///< Return repeat track status.
virtual int getVolume() = 0; ///< Return volume in range 0-100%.
virtual int sampleRate() = 0; ///< Return the sample rate of the currently playing track.
virtual float score() = 0; ///< Return the score of the currently playing track.

40
amarok/src/amarokcore/crashhandler.cpp

@ -20,7 +20,7 @@
#include <tqfile.h>
#include <tqregexp.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqglobal.h> //qVersion()
#include <cstdio> //popen, fread
@ -120,12 +120,12 @@ namespace Amarok
#endif
body = body.tqarg( AmarokConfig::soundSystem() )
.tqarg( qVersion() )
.tqarg( TAGLIB_MAJOR_VERSION )
.tqarg( TAGLIB_MINOR_VERSION )
.tqarg( TAGLIB_PATCH_VERSION )
.tqarg( cpucount );
body = body.arg( AmarokConfig::soundSystem() )
.arg( qVersion() )
.arg( TAGLIB_MAJOR_VERSION )
.arg( TAGLIB_MINOR_VERSION )
.arg( TAGLIB_PATCH_VERSION )
.arg( cpucount );
#ifdef NDEBUG
body += "NDEBUG: true";
@ -190,10 +190,10 @@ namespace Amarok
if( totalFrames > 0 ) {
const double validity = double(validFrames) / totalFrames;
subject += TQString("[validity: %1]").tqarg( validity, 0, 'f', 2 );
subject += TQString("[validity: %1]").arg( validity, 0, 'f', 2 );
if( validity <= 0.5 ) useful = false;
}
subject += TQString("[frames: %1]").tqarg( totalFrames, 3 /*padding*/ );
subject += TQString("[frames: %1]").arg( totalFrames, 3 /*padding*/ );
if( bt.find( TQRegExp(" at \\w*\\.cpp:\\d+\n") ) >= 0 )
subject += "[line numbers]";
@ -201,7 +201,7 @@ namespace Amarok
else
useful = false;
subject += TQString("[%1]").tqarg( AmarokConfig::soundSystem().remove( TQRegExp("-?engine") ) );
subject += TQString("[%1]").arg( AmarokConfig::soundSystem().remove( TQRegExp("-?engine") ) );
std::cout << subject.latin1() << std::endl;
@ -256,7 +256,7 @@ namespace Amarok
#if 0
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqvbox.h>
#include <kdialog.h>
#include <kpushbutton.h>
@ -265,10 +265,10 @@ namespace Amarok
Amarok::CrashHandlerWidget::CrashHandlerWidget()
{
TQBoxLayout *tqlayout = new TQHBoxLayout( this, 18, 12 );
TQBoxLayout *layout = new TQHBoxLayout( this, 18, 12 );
{
TQBoxLayout *lay = new TQVBoxLayout( tqlayout );
TQBoxLayout *lay = new TQVBoxLayout( layout );
TQLabel *label = new TQLabel( this );
label->setPixmap( locate( "data", "drkonqi/pics/konqi.png" ) );
label->setFrameStyle( TQFrame::Plain | TQFrame::Box );
@ -276,9 +276,9 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
lay->addItem( new TQSpacerItem( 3, 3, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
}
tqlayout = new TQVBoxLayout( tqlayout, 6 );
layout = new TQVBoxLayout( layout, 6 );
tqlayout->add( new TQLabel( /*i18n*/(
layout->add( new TQLabel( /*i18n*/(
"<p>" "Amarok has crashed! We are terribly sorry about this :("
"<p>" "However you now have an opportunity to help us fix this crash so that it doesn't "
"happen again! Click <b>Send Email</b> and Amarok will prepare an email that you "
@ -286,11 +286,11 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
"as soon as possible."
"<p>" "Thanks for choosing Amarok.<br>" ), this ) );
tqlayout = new TQHBoxLayout( tqlayout, 6 );
layout = new TQHBoxLayout( layout, 6 );
tqlayout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) );
tqlayout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) );
tqlayout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) );
layout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) );
layout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) );
layout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) );
static_cast<TQPushButton*>(child("email"))->setDefault( true );
@ -298,6 +298,6 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
connect( child( "close" ), TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
setCaption( i18n("Crash Handler") );
setFixedSize( tqsizeHint() );
setFixedSize( sizeHint() );
}
#endif

4
amarok/src/analyzers/analyzerfactory.cpp

@ -73,7 +73,7 @@ TQWidget *Analyzer::Factory::createAnalyzer( TQWidget *parent )
case 5:
#endif
analyzer = new TQLabel( i18n( "Click for Analyzers" ), parent ); //blank analyzer to satisfy Grue
static_cast<TQLabel *>(analyzer)->tqsetAlignment( TQt::AlignCenter );
static_cast<TQLabel *>(analyzer)->setAlignment( TQt::AlignCenter );
break;
default:
@ -114,7 +114,7 @@ TQWidget *Analyzer::Factory::createPlaylistAnalyzer( TQWidget *parent)
case 4:
#endif
analyzer = new TQLabel( i18n( "Click for Analyzers" ), parent ); //blank analyzer to satisfy Grue
static_cast<TQLabel *>(analyzer)->tqsetAlignment( TQt::AlignCenter );
static_cast<TQLabel *>(analyzer)->setAlignment( TQt::AlignCenter );
break;
default:

2
amarok/src/analyzers/baranalyzer.h

@ -21,7 +21,7 @@ class BarAnalyzer : public Analyzer::Base2D
//virtual void transform( Scope& );
/**
* Resizes the widget to a new tqgeometry according to @p e
* Resizes the widget to a new geometry according to @p e
* @param e The resize-event
*/
void resizeEvent( TQResizeEvent * e);

12
amarok/src/analyzers/blockanalyzer.cpp

@ -354,7 +354,7 @@ ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 )
void
BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
{
const TQColor bg = tqpalette().active().background();
const TQColor bg = palette().active().background();
const TQColor fg = ensureContrast( bg, KGlobalSettings::activeTitleColor() );
m_topBarPixmap.fill( fg );
@ -372,11 +372,11 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
p.fillRect( 0, y*(HEIGHT+1), WIDTH, HEIGHT, TQColor( r+int(dr*y), g+int(dg*y), b+int(db*y) ) );
{
const TQColor bg = tqpalette().active().background().dark( 112 );
const TQColor bg = palette().active().background().dark( 112 );
//make a complimentary fadebar colour
//TODO dark is not always correct, dumbo!
int h,s,v; tqpalette().active().background().dark( 150 ).getHsv( &h, &s, &v );
int h,s,v; palette().active().background().dark( 150 ).getHsv( &h, &s, &v );
const TQColor fg( h + 120, s, v, TQColor::Hsv );
const double dr = fg.red() - bg.red();
@ -386,7 +386,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
// Precalculate all fade-bar pixmaps
for( uint y = 0; y < FADE_SIZE; ++y ) {
m_fade_bars[y].fill( tqpalette().active().background() );
m_fade_bars[y].fill( palette().active().background() );
TQPainter f( &m_fade_bars[y] );
for( int z = 0; (uint)z < m_rows; ++z ) {
const double Y = 1.0 - (log10( FADE_SIZE - y ) / log10( FADE_SIZE ));
@ -401,7 +401,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
void
BlockAnalyzer::drawBackground()
{
const TQColor bg = tqpalette().active().background();
const TQColor bg = palette().active().background();
const TQColor bgdark = bg.dark( 112 );
background()->fill( bg );
@ -430,7 +430,7 @@ BlockAnalyzer::contextMenuEvent( TQContextMenuEvent *e )
{
const uint v = ids[x];
menu.insertItem( i18n( "%1 fps" ).tqarg( 1000/v ), v );
menu.insertItem( i18n( "%1 fps" ).arg( 1000/v ), v );
menu.setItemChecked( v, v == timeout() );
}

2
amarok/src/analyzers/boomanalyzer.cpp

@ -5,7 +5,7 @@
#include "boomanalyzer.h"
#include <cmath>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpainter.h>
#include <tqslider.h>
#include <tqspinbox.h>

22
amarok/src/app.cpp

@ -72,7 +72,7 @@ email : markey@web.de
#include <tqeventloop.h> //applySettings()
#include <tqfile.h>
#include <tqobjectlist.h> //applyColorScheme()
#include <tqpalette.h> //applyColorScheme()
#include <palette.h> //applyColorScheme()
#include <tqpixmap.h> //TQPixmap::setDefaultOptimization()
#include <tqpopupmenu.h> //genericEventHandler
#include <tqtimer.h> //showHyperThreadingWarning()
@ -96,7 +96,7 @@ int App::mainThreadId = 0;
static AEEventHandlerUPP appleEventProcessorUPP = 0;
OStqStatus
OSStatus
appleEventProcessor(const AppleEvent *ae, AppleEvent *, long /*handlerRefCon*/)
{
OSType aeID = typeWildCard;
@ -576,7 +576,7 @@ void App::showHyperThreadingWarning() // SLOT
#include <taglib/id3v1tag.h>
#include <taglib/tbytevector.h>
#include <tqtextcodec.h>
#include <textcodec.h>
//this class is only used in this module, so I figured I may as well define it
//here and save creating another header/source file combination
@ -675,7 +675,7 @@ void App::applySettings( bool firstTime )
//Set the caption correctly.
if ( !EngineController::instance()->bundle().prettyTitle().isEmpty() )
m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( EngineController::instance()->bundle().veryNiceTitle() ) );
m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( EngineController::instance()->bundle().veryNiceTitle() ) );
else
m_pPlaylistWindow->setCaption( "Amarok" );
@ -871,7 +871,7 @@ App::applyColorScheme()
else if( AmarokConfig::schemeAmarok() )
{
group = TQApplication::tqpalette().active();
group = TQApplication::palette().active();
const TQColor bg( Amarok::blue );
AltBase.setRgb( 57, 64, 98 );
@ -906,7 +906,7 @@ App::applyColorScheme()
Background = 0x002090;
Foreground = 0x80A0FF;
//all tqchildren() derive their palette from this
//all children() derive their palette from this
playlistWindow()->setPalette( TQPalette( group, group, group ) );
browserBar->unsetPalette();
contextBrowser->setPalette( TQPalette( group, group, group ) );
@ -916,7 +916,7 @@ App::applyColorScheme()
{
// we try to be smart: this code figures out contrasting colors for
// selection and alternate background rows
group = TQApplication::tqpalette().active();
group = TQApplication::palette().active();
const TQColor fg( AmarokConfig::playlistWindowFgColor() );
const TQColor bg( AmarokConfig::playlistWindowBgColor() );
@ -1084,7 +1084,7 @@ void App::engineStateChanged( Engine::State state, Engine::State oldState )
if ( oldState == Engine::Paused )
Amarok::OSD::instance()->OSDWidget::show( i18n( "state, as in playing", "Play" ) );
if ( !bundle.prettyTitle().isEmpty() )
m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( bundle.veryNiceTitle() ) );
m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) );
break;
case Engine::Paused:
@ -1106,7 +1106,7 @@ void App::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ )
{
Amarok::OSD::instance()->show( bundle );
if ( !bundle.prettyTitle().isEmpty() )
m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( bundle.veryNiceTitle() ) );
m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) );
TrackToolTip::instance()->setTrack( bundle );
}
@ -1313,7 +1313,7 @@ namespace Amarok
{
//URL can be in whatever forms KURL::fromPathOrURL understands - ie most.
const TQString cmd = "%1 \"%2\"";
return KRun::runCommand( cmd.tqarg( AmarokConfig::externalBrowser(), KURL::fromPathOrURL( url ).url() ) ) > 0;
return KRun::runCommand( cmd.arg( AmarokConfig::externalBrowser(), KURL::fromPathOrURL( url ).url() ) ) > 0;
}
namespace ColorScheme
@ -1325,7 +1325,7 @@ namespace Amarok
TQColor AltBase;
}
OverrideCursor::OverrideCursor( TQt::tqCursorShape cursor )
OverrideCursor::OverrideCursor( TQt::CursorShape cursor )
{
TQApplication::setOverrideCursor( cursor == TQt::WaitCursor ? KCursor::waitCursor() : KCursor::workingCursor() );
}

2
amarok/src/atomicstring.cpp

@ -82,7 +82,7 @@ TQString AtomicString::string() const
TQString AtomicString::deepCopy() const
{
if (m_string)
return TQString( m_string->tqunicode(), m_string->length() );
return TQString( m_string->unicode(), m_string->length() );
return TQString();
}

20
amarok/src/browserbar.cpp

@ -44,12 +44,12 @@ namespace Amarok
virtual void paintEvent( TQPaintEvent* )
{
TQPainter p( this );
parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), TQStyle::Style_Horizontal );
parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal );
}
virtual void styleChange( TQStyle& )
{
setFixedWidth( tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth, this ) );
setFixedWidth( tqstyle().pixelMetric( TQStyle::PM_SplitterWidth, this ) );
}
virtual void mouseMoveEvent( TQMouseEvent *e )
@ -81,12 +81,12 @@ BrowserBar::BrowserBar( TQWidget *parent )
m_tabBar = new MultiTabBar( MultiTabBar::Vertical, this );
m_tabManagementButton->setFixedWidth(m_tabBar->tqsizeHint().width());
m_tabManagementButton->setFixedHeight(m_tabBar->tqsizeHint().width());
m_tabManagementButton->setFixedWidth(m_tabBar->sizeHint().width());
m_tabManagementButton->setFixedHeight(m_tabBar->sizeHint().width());
s_instance = this;
m_pos = m_tabBar->tqsizeHint().width() + 5; //5 = esthetic spacing
m_pos = m_tabBar->sizeHint().width() + 5; //5 = esthetic spacing
m_tabBar->setStyle( MultiTabBar::AMAROK );
m_tabBar->setPosition( MultiTabBar::Left );
@ -94,9 +94,9 @@ BrowserBar::BrowserBar( TQWidget *parent )
m_tabBar->setFixedWidth( m_pos );
m_tabBar->move( 0, 25 );
TQVBoxLayout *tqlayout = new TQVBoxLayout( m_browserBox );
tqlayout->addSpacing( 3 ); // aesthetics
tqlayout->setAutoAdd( true );
TQVBoxLayout *layout = new TQVBoxLayout( m_browserBox );
layout->addSpacing( 3 ); // aesthetics
layout->setAutoAdd( true );
m_browserBox->move( m_pos, 0 );
m_browserBox->hide();
@ -133,7 +133,7 @@ int
BrowserBar::restoreWidth()
{
const int index = indexForName( Amarok::config( "BrowserBar" )->readEntry( "CurrentPane" ) );
const int width = Amarok::config( "BrowserBar" )->readNumEntry( "Width", browser( index )->tqsizeHint().width() );
const int width = Amarok::config( "BrowserBar" )->readNumEntry( "Width", browser( index )->sizeHint().width() );
m_browserBox->resize( width, height() );
m_pos = m_browserBox->width() + m_tabBar->width();
@ -170,7 +170,7 @@ BrowserBar::polish()
void
BrowserBar::adjustWidgetSizes()
{
//TODO set the tqgeometry of the PlaylistWindow before
//TODO set the geometry of the PlaylistWindow before
// the browsers are loaded so this isn't called twice
const uint w = width();

8
amarok/src/clicklineedit.cpp

@ -40,14 +40,14 @@ ClickLineEdit::ClickLineEdit( const TQString &msg, TQWidget *parent, const char*
void ClickLineEdit::setClickMessage( const TQString &msg )
{
mClickMessage = msg;
tqrepaint();
repaint();
}
void ClickLineEdit::setText( const TQString &txt )
{
mDrawClickMsg = txt.isEmpty();
tqrepaint();
repaint();
KLineEdit::setText( txt );
}
@ -86,7 +86,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev )
{
if ( mDrawClickMsg == true ) {
mDrawClickMsg = false;
tqrepaint();
repaint();
}
TQLineEdit::focusInEvent( ev );
}
@ -96,7 +96,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev )
{
if ( text().isEmpty() ) {
mDrawClickMsg = true;
tqrepaint();
repaint();
}
TQLineEdit::focusOutEvent( ev );
}

74
amarok/src/collectionbrowser.cpp

@ -40,7 +40,7 @@
#include <tqapplication.h>
#include <tqcstring.h>
#include <tqdragobject.h>
#include <tqlayout.h> //infobox
#include <layout.h> //infobox
#include <tqmap.h>
#include <tqpainter.h>
#include <tqpixmap.h>
@ -128,7 +128,7 @@ CollectionBrowser::CollectionBrowser( const char* name )
m_timeFilter = new KComboBox( m_ipodHbox, "timeFilter" );
m_ipodHbox->setStretchFactor( m_timeFilter, 1 );
// Allow the combobox to shrink so the iPod buttons are still visible
m_timeFilter->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
m_timeFilter->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
m_timeFilter->insertItem( i18n( "Entire Collection" ) );
m_timeFilter->insertItem( i18n( "Added Today" ) );
m_timeFilter->insertItem( i18n( "Added Within One Week" ) );
@ -415,7 +415,7 @@ CollectionBrowser::layoutToolbar()
m_configureAction->plug( m_toolbar );
//This would break things if the toolbar is too big, see bug #121915
//setMinimumWidth( m_toolbar->tqsizeHint().width() + 2 ); //set a reasonable minWidth
//setMinimumWidth( m_toolbar->sizeHint().width() + 2 ); //set a reasonable minWidth
}
@ -785,7 +785,7 @@ CollectionView::slotEnsureSelectedItemVisible() //SLOT
ensureItemVisible( lastChild() );
//Create a reverse list of parents, grandparents etc.
//Later we try to make the grandparents in view, then their tqchildren etc.
//Later we try to make the grandparents in view, then their children etc.
//This means that the selected item has the most priority as it is done last.
TQValueStack<TQListViewItem*> parents;
while ( r )
@ -864,7 +864,7 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT
}
if ( translateTimeFilter( timeFilter() ) > 0 )
qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
TQString itemText;
bool isUnknown;
@ -1175,7 +1175,7 @@ CollectionView::slotCollapse( TQListViewItem* item ) //SLOT
TQListViewItem* child = item->firstChild();
TQListViewItem* childTmp;
//delete all tqchildren
//delete all children
while