Browse Source

Rename old tq methods that no longer need a unique name

pull/1/head
Timothy Pearson 10 years ago
parent
commit
ca249ab4c8
  1. 24
      amarok/src/Options1.ui
  2. 10
      amarok/src/Options2.ui
  3. 26
      amarok/src/Options4.ui
  4. 4
      amarok/src/Options5.ui
  5. 2
      amarok/src/Options5.ui.h
  6. 6
      amarok/src/Options8.ui
  7. 2
      amarok/src/actionclasses.cpp
  8. 2
      amarok/src/amarok.h
  9. 8
      amarok/src/amarokcore/amarokdcophandler.cpp
  10. 8
      amarok/src/amarokcore/amarokdcophandler.h
  11. 8
      amarok/src/amarokcore/amarokdcopiface.h
  12. 2
      amarok/src/amarokcore/crashhandler.cpp
  13. 4
      amarok/src/analyzers/analyzerfactory.cpp
  14. 4
      amarok/src/app.cpp
  15. 12
      amarok/src/browserbar.cpp
  16. 42
      amarok/src/collectionbrowser.cpp
  17. 20
      amarok/src/collectiondb.cpp
  18. 10
      amarok/src/configdialog.cpp
  19. 6
      amarok/src/contextbrowser.cpp
  20. 6
      amarok/src/coverfetcher.cpp
  21. 20
      amarok/src/covermanager.cpp
  22. 2
      amarok/src/covermanager.h
  23. 8
      amarok/src/cuefile.cpp
  24. 10
      amarok/src/database_refactor/collectiondb.cpp
  25. 4
      amarok/src/dbsetup.ui
  26. 2
      amarok/src/deletedialogbase.ui
  27. 8
      amarok/src/directorylist.cpp
  28. 4
      amarok/src/directorylist.h
  29. 6
      amarok/src/editfilterdialog.cpp
  30. 12
      amarok/src/engine/helix/helix-configdialog.cpp
  31. 12
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
  32. 4
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h
  33. 4
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h
  34. 2
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h
  35. 6
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h
  36. 2
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
  37. 2
      amarok/src/engine/mas/masengine.cpp
  38. 8
      amarok/src/engine/nmm/HostList.cpp
  39. 22
      amarok/src/engine/nmm/HostListItem.cpp
  40. 6
      amarok/src/engine/nmm/HostListItem.h
  41. 2
      amarok/src/engine/nmm/NmmLocation.h
  42. 6
      amarok/src/engine/nmm/nmm_configdialogbase.ui
  43. 6
      amarok/src/engine/nmm/nmm_engine.cpp
  44. 2
      amarok/src/engine/nmm/nmm_engine.h
  45. 2
      amarok/src/engine/xine/xineconfigbase.ui
  46. 12
      amarok/src/equalizergraph.cpp
  47. 2
      amarok/src/equalizergraph.h
  48. 2
      amarok/src/equalizerpresetmanager.cpp
  49. 12
      amarok/src/equalizersetup.cpp
  50. 8
      amarok/src/filebrowser.cpp
  51. 10
      amarok/src/firstrunwizard.ui
  52. 40
      amarok/src/htmlview.cpp
  53. 6
      amarok/src/konquisidebar/universalamarok.cpp
  54. 2
      amarok/src/konquisidebar/universalamarok.h
  55. 12
      amarok/src/ktrm.cpp
  56. 2
      amarok/src/lastfm.cpp
  57. 8
      amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
  58. 2
      amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
  59. 26
      amarok/src/mediabrowser.cpp
  60. 6
      amarok/src/mediadevice/daap/addhostbase.ui
  61. 4
      amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb
  62. 2
      amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb
  63. 16
      amarok/src/mediadevice/generic/genericmediadevice.cpp
  64. 2
      amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
  65. 10
      amarok/src/mediadevice/ifp/ifpmediadevice.cpp
  66. 10
      amarok/src/mediadevice/ipod/ipodmediadevice.cpp
  67. 20
      amarok/src/mediadevice/mtp/mtpmediadevice.cpp
  68. 12
      amarok/src/mediadevice/njb/njbmediadevice.cpp
  69. 12
      amarok/src/mediumpluginmanager.cpp
  70. 4
      amarok/src/moodbar.cpp
  71. 2
      amarok/src/moodbar.h
  72. 110
      amarok/src/multitabbar.cpp
  73. 2
      amarok/src/multitabbar.h
  74. 18
      amarok/src/mydirlister.h
  75. 2
      amarok/src/mydiroperator.cpp
  76. 12
      amarok/src/newdynamic.ui
  77. 10
      amarok/src/organizecollectiondialog.ui
  78. 6
      amarok/src/osd.cpp
  79. 2
      amarok/src/osd.h
  80. 6
      amarok/src/playerwindow.cpp
  81. 44
      amarok/src/playlist.cpp
  82. 4
      amarok/src/playlist.h
  83. 12
      amarok/src/playlistbrowser.cpp
  84. 2
      amarok/src/playlistbrowseritem.cpp
  85. 12
      amarok/src/playlistitem.cpp
  86. 2
      amarok/src/playlistloader.cpp
  87. 4
      amarok/src/playlistselection.cpp
  88. 4
      amarok/src/playlistselection.h
  89. 14
      amarok/src/playlistwindow.cpp
  90. 2
      amarok/src/playlistwindow.h
  91. 4
      amarok/src/podcastsettingsbase.ui
  92. 8
      amarok/src/prettypopupmenu.cpp
  93. 4
      amarok/src/queuemanager.cpp
  94. 10
      amarok/src/scriptmanager.cpp
  95. 2
      amarok/src/scriptmanagerbase.ui
  96. 2
      amarok/src/scripts/databasescripts/databaseScripts.rb
  97. 8
      amarok/src/scripts/graphequalizer/eqdialog.ui
  98. 22
      amarok/src/scripts/webcontrol/RequestHandler.py
  99. 38
      amarok/src/scripts/webcontrol/WebControl.py
  100. 14
      amarok/src/scrobbler.cpp
  101. 12
      amarok/src/sliderwidget.cpp
  102. 20
      amarok/src/smartplaylisteditor.cpp
  103. 4
      amarok/src/socketserver.cpp
  104. 36
      amarok/src/sqlite/sqlite3.c
  105. 6
      amarok/src/statistics.cpp
  106. 4
      amarok/src/statusbar/overlayWidget.cpp
  107. 2
      amarok/src/statusbar/popupMessage.cpp
  108. 10
      amarok/src/statusbar/progressBar.cpp
  109. 2
      amarok/src/statusbar/progressBar.h
  110. 18
      amarok/src/statusbar/queueLabel.cpp
  111. 16
      amarok/src/statusbar/squeezedtextlabel.cpp
  112. 6
      amarok/src/statusbar/squeezedtextlabel.h
  113. 12
      amarok/src/statusbar/statusBarBase.cpp
  114. 6
      amarok/src/statusbar/statusBarBase.h
  115. 4
      amarok/src/statusbar/statusbar.cpp
  116. 2
      amarok/src/statusbar/timeLabel.h
  117. 4
      amarok/src/tagdialog.cpp
  118. 18
      amarok/src/tagdialogbase.ui
  119. 2
      amarok/src/tagguesserconfigdialog.ui
  120. 4
      amarok/src/threadmanager.cpp
  121. 2
      amarok/src/threadmanager.h
  122. 14
      amarok/src/tooltip.cpp
  123. 2
      amarok/src/tooltip.h

24
amarok/src/Options1.ui

@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>21</height>
@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@ -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>
@ -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>
@ -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>
@ -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>

10
amarok/src/Options2.ui

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

26
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>
@ -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>
@ -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>
@ -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>
@ -483,7 +483,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@ -521,7 +521,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>

4
amarok/src/Options5.ui

@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -183,7 +183,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>

2
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() ) );

6
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>
@ -70,7 +70,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>-1</width>
<height>-1</height>
@ -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();
};

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.

2
amarok/src/amarokcore/crashhandler.cpp

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

4
amarok/src/app.cpp

@ -96,7 +96,7 @@ int App::mainThreadId = 0;
static AEEventHandlerUPP appleEventProcessorUPP = 0;
OStqStatus
OSStatus
appleEventProcessor(const AppleEvent *ae, AppleEvent *, long /*handlerRefCon*/)
{
OSType aeID = typeWildCard;
@ -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() );
}

12
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 );
@ -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();

42
amarok/src/collectionbrowser.cpp

@ -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
}
@ -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;
@ -2335,7 +2335,7 @@ CollectionView::listSelected()
buildIpodQuery( qb, trackDepth(), filters, filterYear, true, true );
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 );
qb.setOptions( QueryBuilder::optOnlyCompilations );
qb.setGoogleFilter( tables | QueryBuilder::tabSong, m_filter );
@ -2350,7 +2350,7 @@ CollectionView::listSelected()
buildIpodQuery( qb, trackDepth(), filters, filterYear, true, false );
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 );
if( sortByTrackFirst )
qb.setOptions( QueryBuilder::optNoCompilations );
@ -2385,7 +2385,7 @@ CollectionView::listSelected()
const bool sampler = static_cast<CollectionItem*>( item )->isSampler();
qb.clear();
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 );
qb.addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL );
@ -2461,7 +2461,7 @@ CollectionView::listSelected()
const bool sampler = static_cast<CollectionItem*>( item )->isSampler();
qb.clear();
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 );
qb.addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL );
@ -2565,7 +2565,7 @@ CollectionView::listSelected()
const bool sampler = static_cast<CollectionItem*>( item )->isSampler();
qb.clear();
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 );
qb.addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL );
@ -3502,7 +3502,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse )
bool
CollectionView::endsInThe( const TQString & text )
{
return text.tqendsWith( ", the", false );
return text.endsWith( ", the", false );
}
// avoid code duplication
@ -3539,9 +3539,9 @@ CollectionView::viewportPaintEvent( TQPaintEvent *e )
const uint w = t.width() + 20;
const uint h = t.height() + 20;
p.setBrush( tqcolorGroup().background() );
p.setBrush( colorGroup().background() );
p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h );
t.draw( &p, 20, 20, TQRect(), tqcolorGroup() );
t.draw( &p, 20, 20, TQRect(), colorGroup() );
}
}
@ -3710,7 +3710,7 @@ CollectionView::renderFlatModeView( bool /*=false*/ )
QueryBuilder qb;
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 );
if ( translateTimeFilter( timeFilter() ) <= 0
&& (m_filter.length() < 3 || (!m_filter.contains( " " ) && m_filter.endsWith( ":" ) ) ) )
@ -3883,7 +3883,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
QueryBuilder qb;
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 );
setSorting( 0 );
int VisYearAlbum = -1;
@ -3985,7 +3985,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
//Dividers for "The Who" should be created as "W", not "T", because
//that's how we sort it
TQString actualStr = *it;
if ( m_cat1 == IdArtist && actualStr.tqstartsWith( "the ", false ) )
if ( m_cat1 == IdArtist && actualStr.startsWith( "the ", false ) )
manipulateThe( actualStr, true );
TQString headerStr = DividerItem::createGroup( actualStr, m_cat1);
@ -4020,7 +4020,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
qb.clear();
if ( translateTimeFilter( timeFilter() ) > 0 )
qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate,
TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() -
TQString().setNum( TQDateTime::currentDateTime().toTime_t() -
translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
qb.addReturnValue( q_cat1, QueryBuilder::valName, true );
@ -4174,7 +4174,7 @@ CollectionView::renderIpodModeView( bool /*=false*/ )
QueryBuilder qb;
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 );
int catArr[3] = {m_cat1, m_cat2, m_cat3};
// stillFiltering is true when we're not viewing tracks
@ -4300,7 +4300,7 @@ CollectionView::renderIpodModeView( bool /*=false*/ )
//because that's how we sort it
TQString actualStr = item->text( 0 );
if ( m_cat == IdArtist &&
actualStr.tqstartsWith( "the ", false ) )
actualStr.startsWith( "the ", false ) )
manipulateThe( actualStr, true );
TQString headerStr = DividerItem::createGroup( actualStr, m_cat );
@ -4510,9 +4510,9 @@ CollectionItem::compare( TQListViewItem* i, int col, bool ascending ) const
return -1;
//For artists, we sort by ignoring "The" eg "The Who" sorts as if it were "Who"
case IdArtist:
if ( a.tqstartsWith( "the ", false ) )
if ( a.startsWith( "the ", false ) )
CollectionView::manipulateThe( a, true );
if ( b.tqstartsWith( "the ", false ) )
if ( b.startsWith( "the ", false ) )
CollectionView::manipulateThe( b, true );
break;
}
@ -4698,7 +4698,7 @@ DividerItem::shareTheSameGroup(const TQString& itemStr, const TQString& divStr,
}
case IdArtist:
//"The Who" should count as being in "W" and not "T"
if ( tmp.tqstartsWith( "the ", false ) )
if ( tmp.startsWith( "the ", false ) )
CollectionView::manipulateThe( tmp, true );
//Fall through
default:
@ -4706,7 +4706,7 @@ DividerItem::shareTheSameGroup(const TQString& itemStr, const TQString& divStr,
if (divStr == "0-9" && TQChar(tmp.at(0)).isDigit()) {
inGroup = true;
}
else if (tmp.tqstartsWith(divStr, 0)) {
else if (tmp.startsWith(divStr, 0)) {
inGroup = true;
}
}

20
amarok/src/collectiondb.cpp

@ -3672,7 +3672,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage,
}
}
uint atime = playtime ? playtime->toTime_t() : TQDateTime::tqcurrentDateTime().toTime_t();
uint atime = playtime ? playtime->toTime_t() : TQDateTime::currentDateTime().toTime_t();
// check boundaries
if ( percentage > 100.f ) percentage = 100.f;
@ -3788,7 +3788,7 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage)
insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, playcounter, rating, uniqueid, deleted ) "
"VALUES ( '%7', %6, %2, %3, %1, 0, 0, %3, %4 );" )
.tqarg( percentage )
.tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
.tqarg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( 0 )
.tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) )
.tqarg( boolF() )
@ -3856,7 +3856,7 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf )
insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, rating, playcounter, uniqueid, deleted ) "
"VALUES ( '%7', %6, %2, %3, 0, %1, 0, %4, %5 );" )
.tqarg( rating )
.tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
.tqarg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( 0 )
.tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) )
.tqarg( boolF() )
@ -4035,7 +4035,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b
}
usleep( 10000 );
kapp->tqprocessEvents( 100 );
kapp->processEvents( 100 );
}
if( m_fileOperationFailed )
@ -4162,7 +4162,7 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit
}
usleep( 10000 );
kapp->tqprocessEvents( 100 );
kapp->processEvents( 100 );
}
if( !m_fileOperationFailed )
@ -4687,7 +4687,7 @@ void CollectionDB::newAmazonReloadDate( const TQString& asin, const TQString& lo
query( TQString("UPDATE amazon SET asin = '%1', locale = '%2', refetchdate = '%3' WHERE filename = '%4'")
.tqarg(asin)
.tqarg(locale)
.tqarg(TQDateTime::tqcurrentDateTime().addDays(80).toTime_t())
.tqarg(TQDateTime::currentDateTime().addDays(80).toTime_t())
.tqarg(md5sum));
}
else
@ -4696,14 +4696,14 @@ void CollectionDB::newAmazonReloadDate( const TQString& asin, const TQString& lo
.tqarg(asin)
.tqarg(locale)
.tqarg(md5sum)
.tqarg(TQDateTime::tqcurrentDateTime().addDays(80).toTime_t()), NULL );
.tqarg(TQDateTime::currentDateTime().addDays(80).toTime_t()), NULL );
}
}
TQStringList CollectionDB::staleImages()
{
return query(TQString("SELECT asin, locale, filename FROM amazon WHERE refetchdate < %1 ;")
.tqarg(TQDateTime::tqcurrentDateTime().toTime_t() ));
.tqarg(TQDateTime::currentDateTime().toTime_t() ));
}
void
@ -6322,8 +6322,8 @@ void SqliteConnection::sqlite_like_new( sqlite3_context *context, int argc, sqli
int result = 0;
if ( begin && end ) result = ( text.find( pattern, 0, 0 ) != -1);
else if ( begin ) result = text.tqendsWith( pattern, 0 );
else if ( end ) result = text.tqstartsWith( pattern, 0 );
else if ( begin ) result = text.endsWith( pattern, 0 );
else if ( end ) result = text.startsWith( pattern, 0 );
else result = ( text.lower() == pattern.lower() );
sqlite3_result_int( context, result );

10
amarok/src/configdialog.cpp

@ -153,23 +153,23 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KCon
TQVBox *topbox = new TQVBox( opt9 );
topbox->setSpacing( KDialog::spacingHint() );
TQGroupBox *mediaBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Media Devices"), topbox );
mediaBox->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
mediaBox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
TQVBox *vbox = new TQVBox( mediaBox );
vbox->setSpacing( KDialog::spacingHint() );
m_deviceManager = new MediumPluginManager( vbox );
TQHBox *hbox = new TQHBox( topbox );
hbox->setSpacing( KDialog::spacingHint() );
hbox->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
hbox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
KPushButton *autodetect = new KPushButton( i18n( "Autodetect Devices" ), hbox );
autodetect->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
autodetect->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
connect( autodetect, TQT_SIGNAL(clicked()), m_deviceManager, TQT_SLOT(redetectDevices()) );
KPushButton *add = new KPushButton( i18n( "Add Device..." ), hbox );
add->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
add->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
connect( add, TQT_SIGNAL(clicked()), m_deviceManager, TQT_SLOT(newDevice()) );
TQFrame *frame = new TQFrame( topbox );
frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
// add pages
addPage( m_opt1, i18n( "General" ), Amarok::icon( "settings_general" ), i18n( "Configure General Options" ) );

6
amarok/src/contextbrowser.cpp

@ -91,7 +91,7 @@ namespace Amarok
TQString verboseTimeSince( const TQDateTime &datetime )
{
const TQDateTime now = TQDateTime::tqcurrentDateTime();
const TQDateTime now = TQDateTime::currentDateTime();
const int datediff = datetime.daysTo( now );
if( datediff >= 6*7 /*six weeks*/ ) { // return absolute month/year
@ -709,7 +709,7 @@ void ContextBrowser::engineNewMetaData( const MetaBundle& bundle, bool trackChan
{
line = stream.readLine().simplifyWhiteSpace();
if( line.tqstartsWith( "file", false ) )
if( line.startsWith( "file", false ) )
{
line = line.mid( 5 ).remove( '"' );
@ -3783,7 +3783,7 @@ ContextBrowser::showLabelsDialog()
m_labelListView = new TQListView( dialog->mainWidget() );
m_labelListView->addColumn( i18n( "Label" ) );
m_labelListView->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
m_labelListView->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
m_labelListView->setColumnWidthMode( 0, TQListView::Maximum );
foreach( allLabels )

6
amarok/src/coverfetcher.cpp

@ -599,13 +599,13 @@ CoverFetcher::getUserQuery( TQString explanation )
KPushButton *nextcover = new KPushButton( i18n( "&Next Cover" ), buttons, "NextCover" );
KPushButton *cancel = new KPushButton( KStdGuiItem::cancel(), buttons );
labelPix ->tqsetAlignment( TQt::AlignHCenter );
labelName->tqsetAlignment( TQt::AlignHCenter );
labelPix ->setAlignment( TQt::AlignHCenter );
labelName->setAlignment( TQt::AlignHCenter );
labelPix ->setPixmap( cover );
labelName->setText( productname );
save->setDefault( true );
this->setFixedSize( tqsizeHint() );
this->setFixedSize( sizeHint() );
this->setCaption( i18n("Cover Found") );
connect( save, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );

20
amarok/src/covermanager.cpp

@ -73,9 +73,9 @@ class ArtistItem : public KListViewItem
TQString a = text(0);
TQString b = i->text(0);
if ( a.tqstartsWith( "the ", false ) )
if ( a.startsWith( "the ", false ) )
CollectionView::manipulateThe( a, true );
if ( b.tqstartsWith( "the ", false ) )
if ( b.startsWith( "the ", false ) )
CollectionView::manipulateThe( b, true );
return TQString::localeAwareCompare( a.lower(), b.lower() );
@ -983,27 +983,27 @@ void CoverViewItem::calcRect( const TQString& )
TQFontMetrics fm = iconView()->fontMetrics();
TQRect itemPixmapRect( 5, 1, thumbWidth, thumbWidth );
TQRect tqitemRect = rect();
tqitemRect.setWidth( thumbWidth + 10 );
tqitemRect.setHeight( thumbWidth + fm.lineSpacing() + 2 );
TQRect itemTextRect( 0, thumbWidth+2, tqitemRect.width(), fm.lineSpacing() );
TQRect itemRect = rect();
itemRect.setWidth( thumbWidth + 10 );
itemRect.setHeight( thumbWidth + fm.lineSpacing() + 2 );
TQRect itemTextRect( 0, thumbWidth+2, itemRect.width(), fm.lineSpacing() );
setPixmapRect( itemPixmapRect );
setTextRect( itemTextRect );
setItemRect( tqitemRect );
setItemRect( itemRect );
}
void CoverViewItem::paintItem(TQPainter* p, const TQColorGroup& cg)
{
TQRect tqitemRect = rect();
TQRect itemRect = rect();
p->save();
p->translate( tqitemRect.x(), tqitemRect.y() );
p->translate( itemRect.x(), itemRect.y() );
// draw the border
p->setPen( cg.mid() );
p->drawRect( 0, 0, tqitemRect.width(), pixmapRect().height()+2 );
p->drawRect( 0, 0, itemRect.width(), pixmapRect().height()+2 );
// draw the cover image
if( !m_coverPixmap.isNull() )

2
amarok/src/covermanager.h

@ -136,7 +136,7 @@ class CoverViewItem : public KIconViewItem
TQPixmap coverPixmap() const { return m_coverPixmap; }
protected:
void paintItem(TQPainter* painter, const TQColorGroup& tqcolorGroup);
void paintItem(TQPainter* painter, const TQColorGroup& colorGroup);
void paintFocus(TQPainter *, const TQColorGroup &) { }
void dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & );
void dragEntered();

8
amarok/src/cuefile.cpp

@ -87,7 +87,7 @@ bool CueFile::load(int mediaLength)
{
line = stream.readLine().simplifyWhiteSpace();
if( line.tqstartsWith( "title", false ) )
if( line.startsWith( "title", false ) )
{
title = line.mid( 6 ).remove( '"' );
if( mode == BEGIN )
@ -100,7 +100,7 @@ bool CueFile::load(int mediaLength)
debug() << "Title: " << title << endl;
}
else if( line.tqstartsWith( "performer", false ))
else if( line.startsWith( "performer", false ))
{
artist = line.mid( 10 ).remove( '"' );
if( mode == BEGIN )
@ -113,7 +113,7 @@ bool CueFile::load(int mediaLength)
debug() << "Artist: " << artist << endl;
}
else if( line.tqstartsWith( "track", false ) )
else if( line.startsWith( "track", false ) )
{
if( mode == TRACK_FOUND )
{
@ -139,7 +139,7 @@ bool CueFile::load(int mediaLength)
debug() << "Track: " << track << endl;
mode = TRACK_FOUND;
}
else if( line.tqstartsWith( "index", false ) )
else if( line.startsWith( "index", false ) )
{
if( mode == TRACK_FOUND)
{

10
amarok/src/database_refactor/collectiondb.cpp

@ -1298,7 +1298,7 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage )
"VALUES ( '%1', %2, %3, %4, %5 );" )
.tqarg( escapeString( url ) )
.tqarg( values[1] )
.tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
.tqarg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( score )
.tqarg( values[0] + " + 1" ) );
}
@ -1311,8 +1311,8 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage )
insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) "
"VALUES ( '%1', %2, %3, %4, 1 );" )
.tqarg( escapeString( url ) )
.tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
.tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
.tqarg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( score ), NULL );
}
@ -1371,8 +1371,8 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage )
insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) "
"VALUES ( '%1', %2, %3, %4, 0 );" )
.tqarg( escapeString( url ) )
.tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
.tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
.tqarg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( percentage ), NULL );
}

4
amarok/src/dbsetup.ui

@ -102,7 +102,7 @@
<property name="name">
<cstring>kcfg_MySqlPort</cstring>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>100</width>
<height>32767</height>
@ -281,7 +281,7 @@
<property name="name">
<cstring>kcfg_PostgresqlPort</cstring>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>100</width>
<height>32767</height>

2
amarok/src/deletedialogbase.ui

@ -12,7 +12,7 @@
<height>374</height>
</rect>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>420</width>
<height>320</height>

8
amarok/src/directorylist.cpp

@ -39,7 +39,7 @@ CollectionSetup::CollectionSetup( TQWidget *parent )
(new TQLabel( i18n(
"These folders will be scanned for "
"media to make up your collection:"), this ))->tqsetAlignment( TQt::WordBreak );
"media to make up your collection:"), this ))->setAlignment( TQt::WordBreak );
m_view = new TQFixedListView( this );
m_recursive = new TQCheckBox( i18n("&Scan folders recursively"), this );
@ -61,7 +61,7 @@ CollectionSetup::CollectionSetup( TQWidget *parent )
m_view->addColumn( TQString() );
m_view->setRootIsDecorated( true );
m_view->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
m_view->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
m_view->setResizeMode( TQListView::LastColumn );
reinterpret_cast<TQWidget*>(m_view->header())->hide();
@ -294,7 +294,7 @@ Item::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width,
// Figure out if a child folder is activated
for ( TQStringList::const_iterator iter = cs_m_dirs.begin(); iter != cs_m_dirs.end();
++iter )
if ( ( *iter ).tqstartsWith( m_url.path(1) ) )
if ( ( *iter ).startsWith( m_url.path(1) ) )
if ( *iter != "/" ) // "/" should not match as a child of "/"
dirty = true;
@ -303,7 +303,7 @@ Item::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width,
TQColorGroup _cg = cg;
if ( dirty )
{
_cg.setColor( TQColorGroup::Text, listView()->tqcolorGroup().link() );
_cg.setColor( TQColorGroup::Text, listView()->colorGroup().link() );
TQFont font = p->font();
font.setBold( !font.bold() );
p->setFont( font );

4
amarok/src/directorylist.h

@ -30,12 +30,12 @@
namespace Collection { class Item; }
class TQFixedListView : public TQListView
// Reimplement tqsizeHint to have directorylist not being too big for "low" (1024x768 is not exactly low) resolutions
// Reimplement sizeHint to have directorylist not being too big for "low" (1024x768 is not exactly low) resolutions
{
public:
TQFixedListView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 )
:TQListView(parent, name, f) {};
TQSize tqsizeHint() const
TQSize sizeHint() const
{
return TQSize(400, 100);
}

6
amarok/src/editfilterdialog.cpp

@ -223,7 +223,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
connect(m_spinMax1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxSpinChanged(int)));
TQHBoxLayout *filesizeLayout = new TQHBoxLayout( vertLayout );
filesizeLayout->tqsetAlignment( AlignLeft );
filesizeLayout->setAlignment( AlignLeft );
m_filesizeLabel = new TQLabel( i18n("Unit:"), m_groupBox, "filesizeLabel");
filesizeLayout->addWidget( m_filesizeLabel );
filesizeLayout->addItem( new TQSpacerItem( 5, 10, TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
@ -243,7 +243,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
connect( m_comboCondition, TQT_SIGNAL(activated(int)), TQT_SLOT(chooseCondition(int)) );
TQHBoxLayout *otherOptionsLayout = new TQHBoxLayout( plainPage() );
otherOptionsLayout->tqsetAlignment( AlignHCenter );
otherOptionsLayout->setAlignment( AlignHCenter );
m_mainLay->addLayout( otherOptionsLayout );
// the groupbox to select the action filter
@ -532,7 +532,7 @@ void EditFilterDialog::selectedKeyword(int index) // SLOT
{
// year: set useful values for the spinboxes
m_spinMin1->setValue( 1900 );
m_spinMax1->setValue( TQDate::tqcurrentDate().year() );
m_spinMax1->setValue( TQDate::currentDate().year() );
valueWanted();
}
else if( key=="track" || key=="disc" || key=="discnumber" )