diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:29:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:29:16 -0600 |
| commit | 2d3d921590b44ae1e8864104f3e36d022bec0308 (patch) | |
| tree | a3c17b3a19ac6a26cddd8c0705bf55ff8f46665a | |
| parent | 6fd8dcd450a39343afe010a50dd0956eb4184540 (diff) | |
| download | amarok-2d3d921590b44ae1e8864104f3e36d022bec0308.tar.gz amarok-2d3d921590b44ae1e8864104f3e36d022bec0308.zip | |
Rename a number of old tq methods that are no longer tq specific
191 files changed, 2108 insertions, 2108 deletions
diff --git a/amarok/src/Options1.ui b/amarok/src/Options1.ui index 29a95d5d..dbee4891 100644 --- a/amarok/src/Options1.ui +++ b/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> diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui index ec244783..bbca4945 100644 --- a/amarok/src/Options2.ui +++ b/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> diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h index 5aedc187..16b4d6a7 100644 --- a/amarok/src/Options2.ui.h +++ b/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; } diff --git a/amarok/src/Options4.ui b/amarok/src/Options4.ui index 6baab8ed..fe777f1f 100644 --- a/amarok/src/Options4.ui +++ b/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> diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui index d0c7b32a..9f3f556d 100644 --- a/amarok/src/Options5.ui +++ b/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> diff --git a/amarok/src/Options5.ui.h b/amarok/src/Options5.ui.h index a9d5c050..deb86fe6 100644 --- a/amarok/src/Options5.ui.h +++ b/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 diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui index 66524775..82e4fb70 100644 --- a/amarok/src/Options8.ui +++ b/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> diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp index cdaa3ff6..9bea26d4 100644 --- a/amarok/src/actionclasses.cpp +++ b/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" ) ); diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h index 94d41449..40cbe766 100644 --- a/amarok/src/amarok.h +++ b/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(); }; diff --git a/amarok/src/amarokcore/amarok.kcfg b/amarok/src/amarokcore/amarok.kcfg index 94d026e0..4a4d6327 100644 --- a/amarok/src/amarokcore/amarok.kcfg +++ b/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> diff --git a/amarok/src/amarokcore/amarokdcophandler.cpp b/amarok/src/amarokcore/amarokdcophandler.cpp index ab3ec320..b8e4f496 100644 --- a/amarok/src/amarokcore/amarokdcophandler.cpp +++ b/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(); } diff --git a/amarok/src/amarokcore/amarokdcophandler.h b/amarok/src/amarokcore/amarokdcophandler.h index 028bb4c9..c86edda0 100644 --- a/amarok/src/amarokcore/amarokdcophandler.h +++ b/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 (); diff --git a/amarok/src/amarokcore/amarokdcopiface.h b/amarok/src/amarokcore/amarokdcopiface.h index 1ce3849b..32b330a7 100644 --- a/amarok/src/amarokcore/amarokdcopiface.h +++ b/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. diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp index 79dbf00e..5d5b655e 100644 --- a/amarok/src/amarokcore/crashhandler.cpp +++ b/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 diff --git a/amarok/src/analyzers/analyzerfactory.cpp b/amarok/src/analyzers/analyzerfactory.cpp index 2016656b..28d5f7b3 100644 --- a/amarok/src/analyzers/analyzerfactory.cpp +++ b/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: diff --git a/amarok/src/analyzers/baranalyzer.h b/amarok/src/analyzers/baranalyzer.h index 4bb4e3f3..6eb470c8 100644 --- a/amarok/src/analyzers/baranalyzer.h +++ b/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); diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp index 1ebfdf0f..e6d75dea 100644 --- a/amarok/src/analyzers/blockanalyzer.cpp +++ b/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() ); } diff --git a/amarok/src/analyzers/boomanalyzer.cpp b/amarok/src/analyzers/boomanalyzer.cpp index 3505c82c..02f77351 100644 --- a/amarok/src/analyzers/boomanalyzer.cpp +++ b/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> diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index ee726662..b798fdbe 100644 --- a/amarok/src/app.cpp +++ b/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() ); } diff --git a/amarok/src/atomicstring.cpp b/amarok/src/atomicstring.cpp index ced1b89a..297f5b3c 100644 --- a/amarok/src/atomicstring.cpp +++ b/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(); } diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp index e2c6365b..af3aab2f 100644 --- a/amarok/src/browserbar.cpp +++ b/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(); diff --git a/amarok/src/clicklineedit.cpp b/amarok/src/clicklineedit.cpp index 934b7fb9..6e74e6db 100644 --- a/amarok/src/clicklineedit.cpp +++ b/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 ); } diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index 5ff26a78..6d7ab8ec 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/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 ( child ) { childTmp = child; @@ -1471,7 +1471,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // if( (cat == IdAlbum || cat == IdVisYearAlbum) && siblingSelection.count() == 1 ) // cover fetch isn't multiselection capable { - menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch Cover From amazon.%1" ).tqarg( CoverManager::amazonTld() ), this, TQT_SLOT( fetchCover() ), 0, FETCH ); + menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch Cover From amazon.%1" ).arg( CoverManager::amazonTld() ), this, TQT_SLOT( fetchCover() ), 0, FETCH ); #ifndef AMAZON_SUPPORT menu.setItemEnabled( FETCH, false ); #endif @@ -1698,7 +1698,7 @@ CollectionView::fetchCover() //SLOT "SELECT DISTINCT artist.name FROM artist, album, tags " "WHERE artist.id = tags.artist AND tags.album = album.id " "AND album.name = '%1';" ) - .tqarg( CollectionDB::instance()->escapeString( album ) ) ); + .arg( CollectionDB::instance()->escapeString( album ) ) ); if ( !values.isEmpty() ) CollectionDB::instance()->fetchCover( this, values[0], album, false, static_cast<TQListViewItem*>(item) ); @@ -2220,7 +2220,7 @@ KURL::List CollectionView::listSelected() { //Here we determine the URLs of all selected items. We use two passes, one for the parent items, - //and another one for the tqchildren. + //and another one for the children. KURL::List list; TQListViewItem* item; @@ -2266,7 +2266,7 @@ CollectionView::listSelected() // The iPod selection code is written to resemble the tree mode // selection logic, as well as what happens on an actual iPod. If // we're in track mode, just return the list of tracks selected. - // Otherwise select all tqchildren of all currently selected items, + // Otherwise select all children of all currently selected items, // sorting first by m_cat1, then m_cat2, then m_cat3. Sort by // track first if one of the categories is Id(VisYear)Album. // There is a difficulty with compilation albums -- if we're @@ -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 ); @@ -2693,7 +2693,7 @@ CollectionView::playlistFromURLs( const KURL::List &urls ) KURL rpath; MountPointManager::instance()->getRelativePath( deviceid, *it, rpath ); const TQString query = TQString("SELECT title, length FROM tags WHERE url = '%1' AND deviceid = %2;") - .tqarg( db->escapeString( rpath.path() ) ).tqarg( deviceid ); + .arg( db->escapeString( rpath.path() ) ).arg( deviceid ); debug() << "media id: " << deviceid << " rpath: " << rpath.path() << endl; TQStringList result = db->query( query ); titles << result[0]; @@ -3483,7 +3483,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse ) if( reverse ) { TQString begin = str.left( 3 ); - str = TQString(str.append( ", %1" )).tqarg( begin ); + str = TQString(str.append( ", %1" )).arg( begin ); str = str.mid( 4 ); return; } @@ -3492,7 +3492,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse ) return; TQString end = str.right( 3 ); - str = TQString(str.prepend( "%1 " )).tqarg( end ); + str = TQString(str.prepend( "%1 " )).arg( end ); uint newLen = str.length() - end.length() - 2; @@ -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 ); @@ -4061,7 +4061,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ ) continue; couldOpen.push_back( top ); } - //Expand suggested items and expand or enqueue their tqchildren until we run out of + //Expand suggested items and expand or enqueue their children until we run out of //rows or have expanded everything for ( TQValueList<TQListViewItem*>::iterator it = couldOpen.begin(); it != couldOpen.end() && totalCount < maxRows; ++it ) { @@ -4080,7 +4080,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ ) } else { - //Prioritize expanding its tqchildren - add it immediately next + //Prioritize expanding its children - add it immediately next TQValueList<TQListViewItem*>::iterator next = it; ++next; couldOpen.insert( next, j ); @@ -4131,9 +4131,9 @@ CollectionView::removeDuplicatedHeaders() { if ( empty ) { - if ( !current->text(0).tqat(0).isLetterOrNumber() - || ( last->text(0).tqat(0).isLetterOrNumber() - && current->text(0).tqat(0).tqunicode() > last->text(0).tqat(0).tqunicode() ) ) + if ( !current->text(0).at(0).isLetterOrNumber() + || ( last->text(0).at(0).isLetterOrNumber() + && current->text(0).at(0).unicode() > last->text(0).at(0).unicode() ) ) toDelete += current; else { @@ -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 ); @@ -4366,7 +4366,7 @@ CollectionItem::paintCell ( TQPainter * painter, const TQColorGroup & cg, TQPixmap buf( width, height() ); TQPainter p( &buf, true ); - const TQColorGroup _cg = listView()->tqpalette().active(); + const TQColorGroup _cg = listView()->palette().active(); TQColor bg = isSelected() ? _cg.highlight() : isAlternate() ? listView()->alternateBackground() @@ -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; } } diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp index e95df956..7d88ef8b 100644 --- a/amarok/src/collectiondb.cpp +++ b/amarok/src/collectiondb.cpp @@ -47,7 +47,7 @@ #include <tqregexp.h> //setHTMLLyrics() #include <tqtimer.h> #include <tqpainter.h> //createDragPixmap() -#include <tqpalette.h> +#include <palette.h> #include <pthread.h> //debugging, can be removed later #include <kcharsets.h> //setHTMLLyrics() @@ -145,7 +145,7 @@ INotify::doJob() deviceIds += TQString::number(*it); } const TQStringList values = m_parent->query( TQString( "SELECT dir, deviceid FROM directories WHERE deviceid IN (%1);" ) - .tqarg( deviceIds ) ); + .arg( deviceIds ) ); foreach( values ) { TQString rpath = *it; @@ -509,7 +509,7 @@ TQString CollectionDB::adminValue( TQString noption ) { TQStringList values; values = query ( - TQString( "SELECT value FROM admin WHERE noption = '%1';").tqarg(noption) + TQString( "SELECT value FROM admin WHERE noption = '%1';").arg(noption) ); return values.isEmpty() ? "" : values.first(); } @@ -518,14 +518,14 @@ CollectionDB::adminValue( TQString noption ) { void CollectionDB::setAdminValue( TQString noption, TQString value ) { - TQStringList values = query( TQString( "SELECT value FROM admin WHERE noption = '%1';").tqarg( noption )); + TQStringList values = query( TQString( "SELECT value FROM admin WHERE noption = '%1';").arg( noption )); if(values.count() > 0) { - query( TQString( "UPDATE admin SET value = '%1' WHERE noption = '%2';" ).tqarg( value, noption ) ); + query( TQString( "UPDATE admin SET value = '%1' WHERE noption = '%2';" ).arg( value, noption ) ); } else { - insert( TQString( "INSERT INTO admin (value, noption) values ( '%1', '%2' );" ).tqarg( value, noption ), + insert( TQString( "INSERT INTO admin (value, noption) values ( '%1', '%2' );" ).arg( value, noption ), NULL ); } } @@ -560,8 +560,8 @@ CollectionDB::createTables( const bool temporary ) "sampler BOOL," "bpm FLOAT," "deviceid INTEGER);" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) ); TQString albumAutoIncrement = ""; TQString artistAutoIncrement = ""; @@ -598,41 +598,41 @@ CollectionDB::createTables( const bool temporary ) query( TQString( "CREATE %1 TABLE album%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( albumAutoIncrement ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) + .arg( albumAutoIncrement ) ); //create artist table query( TQString( "CREATE %1 TABLE artist%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( artistAutoIncrement ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) + .arg( artistAutoIncrement ) ); //create composer table query( TQString( "CREATE %1 TABLE composer%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( composerAutoIncrement ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) + .arg( composerAutoIncrement ) ); //create genre table query( TQString( "CREATE %1 TABLE genre%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() +");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( genreAutoIncrement ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) + .arg( genreAutoIncrement ) ); //create year table query( TQString( "CREATE %1 TABLE year%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( yearAutoIncrement ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) + .arg( yearAutoIncrement ) ); //create images table query( TQString( "CREATE %1 TABLE images%2 (" @@ -640,8 +640,8 @@ CollectionDB::createTables( const bool temporary ) "deviceid INTEGER," "artist " + textColumnType() + "," "album " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) ); //create embed table query( TQString( "CREATE %1 TABLE embed%2 (" @@ -649,16 +649,16 @@ CollectionDB::createTables( const bool temporary ) "deviceid INTEGER," "hash " + exactTextColumnType() + "," "description " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) ); // create directory statistics table query( TQString( "CREATE %1 TABLE directories%2 (" "dir " + exactTextColumnType() + "," "deviceid INTEGER," "changedate INTEGER);" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) ); //create uniqueid table query( TQString( "CREATE %1 TABLE uniqueid%2 (" @@ -666,20 +666,20 @@ CollectionDB::createTables( const bool temporary ) "deviceid INTEGER," "uniqueid " + exactTextColumnType(32) + " UNITQUE," "dir " + exactTextColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) ); //create indexes query( TQString( "CREATE INDEX album_idx%1 ON album%2( name );" ) - .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX artist_idx%1 ON artist%2( name );" ) - .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX composer_idx%1 ON composer%2( name );" ) - .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX genre_idx%1 ON genre%2( name );" ) - .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX year_idx%1 ON year%2( name );" ) - .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); if ( !temporary ) { @@ -791,16 +791,16 @@ CollectionDB::createPermanentIndices() void CollectionDB::dropTables( const bool temporary ) { - query( TQString( "DROP TABLE tags%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE album%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE artist%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE composer%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE genre%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE year%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE images%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE embed%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE directories%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE uniqueid%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE tags%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE album%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE artist%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE composer%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE genre%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE year%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE images%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE embed%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE directories%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE uniqueid%1;" ).arg( temporary ? "_temp" : "" ) ); if ( !temporary ) { query( TQString( "DROP TABLE related_artists;" ) ); @@ -830,21 +830,21 @@ CollectionDB::clearTables( const bool temporary ) clearCommand = "TRUNCATE TABLE"; } - query( TQString( "%1 tags%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 album%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 artist%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 composer%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 genre%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 year%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 images%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 embed%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 directories%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 uniqueid%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 tags%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 album%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 artist%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 composer%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 genre%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 year%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 images%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 embed%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 directories%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 uniqueid%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); if ( !temporary ) { - query( TQString( "%1 related_artists;" ).tqarg( clearCommand ) ); + query( TQString( "%1 related_artists;" ).arg( clearCommand ) ); //debug() << "Clearing media table" << endl; - //query( TQString( "%1 media;" ).tqarg( clearCommand ) ); + //query( TQString( "%1 media;" ).arg( clearCommand ) ); } } @@ -866,7 +866,7 @@ CollectionDB::copyTempTables( ) albumIds += ','; albumIds += *it; } - insert( TQString ( "INSERT INTO album SELECT * FROM album_temp WHERE album_temp.id NOT IN ( %1 );" ).tqarg( albumIds ), NULL ); + insert( TQString ( "INSERT INTO album SELECT * FROM album_temp WHERE album_temp.id NOT IN ( %1 );" ).arg( albumIds ), NULL ); TQStringList artistIdList = query( "SELECT artist.id FROM artist;" ); TQString artistIds = "-1"; @@ -875,7 +875,7 @@ CollectionDB::copyTempTables( ) artistIds += ','; artistIds += *it; } - insert( TQString ( "INSERT INTO artist SELECT * FROM artist_temp WHERE artist_temp.id NOT IN ( %1 );" ).tqarg( artistIds ), NULL ); + insert( TQString ( "INSERT INTO artist SELECT * FROM artist_temp WHERE artist_temp.id NOT IN ( %1 );" ).arg( artistIds ), NULL ); TQStringList composerIdList = query( "SELECT composer.id FROM composer;" ); TQString composerIds = "-1"; @@ -884,7 +884,7 @@ CollectionDB::copyTempTables( ) composerIds += ','; composerIds += *it; } - insert( TQString ( "INSERT INTO composer SELECT * FROM composer_temp WHERE composer_temp.id NOT IN ( %1 );" ).tqarg( composerIds ), NULL ); + insert( TQString ( "INSERT INTO composer SELECT * FROM composer_temp WHERE composer_temp.id NOT IN ( %1 );" ).arg( composerIds ), NULL ); TQStringList genreIdList = query( "SELECT genre.id FROM genre;" ); TQString genreIds = "-1"; @@ -893,7 +893,7 @@ CollectionDB::copyTempTables( ) genreIds += ','; genreIds += *it; } - insert( TQString ( "INSERT INTO genre SELECT * FROM genre_temp WHERE genre_temp.id NOT IN ( %1 );" ).tqarg( genreIds ), NULL ); + insert( TQString ( "INSERT INTO genre SELECT * FROM genre_temp WHERE genre_temp.id NOT IN ( %1 );" ).arg( genreIds ), NULL ); TQStringList yearIdList = query( "SELECT year.id FROM year;" ); TQString yearIds = "-1"; @@ -902,7 +902,7 @@ CollectionDB::copyTempTables( ) yearIds += ','; yearIds += *it; } - insert( TQString ( "INSERT INTO year SELECT * FROM year_temp WHERE year_temp.id NOT IN ( %1 );" ).tqarg( yearIds ), NULL ); + insert( TQString ( "INSERT INTO year SELECT * FROM year_temp WHERE year_temp.id NOT IN ( %1 );" ).arg( yearIds ), NULL ); insert( "INSERT INTO images SELECT * FROM images_temp;", NULL ); insert( "INSERT INTO embed SELECT * FROM embed_temp;", NULL ); @@ -943,7 +943,7 @@ CollectionDB::createDevicesTable() "uuid " + textColumnType() + "," "servername " + textColumnType() + "," "sharename " + textColumnType() + ");" ) - .tqarg( deviceAutoIncrement ) ); + .arg( deviceAutoIncrement ) ); query( "CREATE INDEX devices_type ON devices( type );" ); query( "CREATE INDEX devices_uuid ON devices( uuid );" ); query( "CREATE INDEX devices_rshare ON devices( servername, sharename );" ); @@ -1005,8 +1005,8 @@ CollectionDB::createStatsTableV10( bool temp ) "uniqueid " + exactTextColumnType(32) + " UNITQUE," "deleted BOOL DEFAULT " + boolF() + "," "PRIMARY KEY(url, deviceid) );" - ).tqarg( temp ? "TEMPORARY" : "" ) - .tqarg( temp ? "_fix_ten" : "" ) ); + ).arg( temp ? "TEMPORARY" : "" ) + .arg( temp ? "_fix_ten" : "" ) ); if ( !temp ) { @@ -1120,18 +1120,18 @@ CollectionDB::createPersistentTablesV14( bool temp ) "asin " + textColumnType(20) + ", " "locale " + textColumnType(2) + ", " "filename " + exactTextColumnType(33) + ", " - "refetchdate INTEGER );" ).tqarg( a,b ) ); + "refetchdate INTEGER );" ).arg( a,b ) ); // create lyrics table query( TQString( "CREATE %1 TABLE lyrics%2 (" "url " + exactTextColumnType() + ", " "deviceid INTEGER," - "lyrics " + longTextColumnType() + ");" ).tqarg( a,b ) ); + "lyrics " + longTextColumnType() + ");" ).arg( a,b ) ); query( TQString( "CREATE %1 TABLE playlists%2 (" "playlist " + textColumnType() + ", " "url " + exactTextColumnType() + ", " - "tracknum INTEGER );" ).tqarg( a,b ) ); + "tracknum INTEGER );" ).arg( a,b ) ); if ( !temp ) { @@ -1190,14 +1190,14 @@ CollectionDB::createPodcastTables() "length INTEGER," "size INTEGER," "isNew BOOL );" ) - .tqarg( podcastAutoIncrement ) ); + .arg( podcastAutoIncrement ) ); // create podcast folders table query( TQString( "CREATE TABLE podcastfolders (" "id INTEGER PRIMARY KEY %1, " "name " + textColumnType() + "," "parent INTEGER, isOpen BOOL );" ) - .tqarg( podcastFolderAutoInc ) ); + .arg( podcastFolderAutoInc ) ); query( "CREATE INDEX url_podchannel ON podcastchannels( url );" ); query( "CREATE INDEX url_podepisode ON podcastepisodes( url );" ); @@ -1239,7 +1239,7 @@ CollectionDB::createPodcastTablesV2( bool temp ) "parent INTEGER," "directory " + textColumnType() + "," "autoscan BOOL, fetchtype INTEGER, " - "autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ).tqarg( a,b ) ); + "autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ).arg( a,b ) ); // create podcast episodes table query( TQString( "CREATE %2 TABLE podcastepisodes%3 (" @@ -1257,14 +1257,14 @@ CollectionDB::createPodcastTablesV2( bool temp ) "length INTEGER," "size INTEGER," "isNew BOOL );" ) - .tqarg( podcastAutoIncrement, a, b ) ); + .arg( podcastAutoIncrement, a, b ) ); // create podcast folders table query( TQString( "CREATE %2 TABLE podcastfolders%3 (" "id INTEGER PRIMARY KEY %1, " "name " + textColumnType() + "," "parent INTEGER, isOpen BOOL );" ) - .tqarg( podcastFolderAutoInc, a, b ) ); + .arg( podcastFolderAutoInc, a, b ) ); if ( !temp ) { @@ -1475,16 +1475,16 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const TQStringList values = query( TQString( "SELECT id, name FROM %1 WHERE name %2;" ) - .tqarg( name ) - .tqarg( CollectionDB::likeCondition( value ) ) ); + .arg( name ) + .arg( CollectionDB::likeCondition( value ) ) ); //check if item exists. if not, should we autocreate it? uint id; if ( values.isEmpty() && autocreate ) { id = insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" ) - .tqarg( name ) - .tqarg( CollectionDB::instance()->escapeString( value ) ), name ); + .arg( name ) + .arg( CollectionDB::instance()->escapeString( value ) ), name ); return id; } @@ -1499,8 +1499,8 @@ CollectionDB::valueFromID( TQString table, uint id ) TQStringList values = query( TQString( "SELECT name FROM %1 WHERE id=%2;" ) - .tqarg( table ) - .tqarg( id ) ); + .arg( table ) + .arg( id ) ); return values.isEmpty() ? 0 : values.first(); @@ -1513,8 +1513,8 @@ CollectionDB::albumSongCount( const TQString &artist_id, const TQString &album_i TQStringList values = query( TQString( "SELECT COUNT( url ) FROM tags WHERE album = %1 AND artist = %2;" ) - .tqarg( album_id ) - .tqarg( artist_id ) ); + .arg( album_id ) + .arg( artist_id ) ); return values.first(); } @@ -1524,8 +1524,8 @@ CollectionDB::albumIsCompilation( const TQString &album_id ) TQStringList values = query( TQString( "SELECT sampler FROM tags WHERE sampler=%1 AND album=%2" ) - .tqarg( CollectionDB::instance()->boolT() ) - .tqarg( album_id ) ); + .arg( CollectionDB::instance()->boolT() ) + .arg( album_id ) ); return (values.count() != 0); } @@ -1562,9 +1562,9 @@ CollectionDB::albumDiscTracks( const TQString &artist_id, const TQString &album_ rs = query( TQString( "SELECT tags.deviceid, tags.url FROM tags, year WHERE tags.album = %1 AND " "tags.artist = %2 AND year.id = tags.year AND tags.discnumber = %3 " + deviceidSelection() + " ORDER BY tags.track;" ) - .tqarg( album_id ) - .tqarg( artist_id ) - .tqarg( discNumber ) ); + .arg( album_id ) + .arg( artist_id ) + .arg( discNumber ) ); TQStringList result; foreach( rs ) { @@ -1580,7 +1580,7 @@ CollectionDB::artistTracks( const TQString &artist_id ) TQStringList rs = query( TQString( "SELECT tags.deviceid, tags.url FROM tags, album " "WHERE tags.artist = '%1' AND album.id = tags.album " + deviceidSelection() + "ORDER BY album.name, tags.discnumber, tags.track;" ) - .tqarg( artist_id ) ); + .arg( artist_id ) ); TQStringList result = TQStringList(); foreach( rs ) { @@ -1602,11 +1602,11 @@ CollectionDB::addImageToAlbum( const TQString& image, TQValueList< TQPair<TQStri continue; TQString sql = TQString( "INSERT INTO images%1 ( path, deviceid, artist, album ) VALUES ( '%3', %2" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ); - sql += TQString( ", '%1'" ).tqarg( escapeString( (*it).first ) ); - sql += TQString( ", '%1' );" ).tqarg( escapeString( (*it).second ) ); + .arg( temporary ? "_temp" : "" ) + .arg( deviceid ) + .arg( escapeString( rpath ) ); + sql += TQString( ", '%1'" ).arg( escapeString( (*it).first ) ); + sql += TQString( ", '%1' );" ).arg( escapeString( (*it).second ) ); // debug() << "Added image for album: " << (*it).first << " - " << (*it).second << ": " << image << endl; insert( sql, NULL ); @@ -1622,8 +1622,8 @@ CollectionDB::addEmbeddedImage( const TQString& path, const TQString& hash, cons int deviceid = MountPointManager::instance()->getIdForUrl( path ); TQString rpath = MountPointManager::instance()->getRelativePath(deviceid, path ); insert( TQString( "INSERT INTO embed_temp ( url, deviceid, hash, description ) VALUES ( '%2', %1, '%3', '%4' );" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ), escapeString( hash ), escapeString( description ) ), NULL ); + .arg( deviceid ) + .arg( escapeString( rpath ), escapeString( hash ), escapeString( description ) ), NULL ); } void @@ -1636,7 +1636,7 @@ CollectionDB::removeOrphanedEmbeddedImages() TQString deviceid = *it; TQString rpath = *(++it); query( TQString( "DELETE FROM embed WHERE embed.deviceid = %1 AND embed.url = '%2';" ) - .tqarg( deviceid, escapeString( rpath ) ) ); + .arg( deviceid, escapeString( rpath ) ) ); } } @@ -1752,11 +1752,11 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) { if( correctAlbumCount ) { text = i18n( "X songs from X albums", "%2 from %1" ); - text = text.tqarg( albums == 1 && !album.isEmpty() ? album : i18n( "one album", "%n albums",albums ) ); + text = text.arg( albums == 1 && !album.isEmpty() ? album : i18n( "one album", "%n albums",albums ) ); } else text = "%1"; - text = text.tqarg( songs == 1 && !song.isEmpty() ? song : i18n( "One song", "%n songs", songs ) ); + text = text.arg( songs == 1 && !song.isEmpty() ? song : i18n( "One song", "%n songs", songs ) ); } else if( playlists > 0 ) text = i18n( "One playlist", "%n playlists", playlists ); @@ -2082,7 +2082,7 @@ CollectionDB::makeShadowedImage( const TQString& albumImage, bool cache ) TQImage shadow; const TQString folder = Amarok::saveLocation( "covershadow-cache/" ); - const TQString file = TQString( "shadow_albumcover%1x%2.png" ).tqarg( original.width() + shadowSize ).tqarg( original.height() + shadowSize ); + const TQString file = TQString( "shadow_albumcover%1x%2.png" ).arg( original.width() + shadowSize ).arg( original.height() + shadowSize ); if ( TQFile::exists( folder + file ) ) { tqApp->lock(); shadow.load( folder + file, "PNG" ); @@ -2168,17 +2168,17 @@ CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album, "AND tags.sampler = %1 " "AND images.album %2 " "AND images.deviceid IN (%3) " ) - .tqarg( boolT() ) - .tqarg( CollectionDB::likeCondition( album ) ) - .tqarg( deviceIds ) ); + .arg( boolT() ) + .arg( CollectionDB::likeCondition( album ) ) + .arg( deviceIds ) ); } else { rs = query( TQString( "SELECT distinct images.deviceid,images.path FROM images WHERE artist %1 AND album %2 AND deviceid IN (%3) ORDER BY path;" ) - .tqarg( CollectionDB::likeCondition( artist ) ) - .tqarg( CollectionDB::likeCondition( album ) ) - .tqarg( deviceIds ) ); + .arg( CollectionDB::likeCondition( artist ) ) + .arg( CollectionDB::likeCondition( album ) ) + .arg( deviceIds ) ); } TQStringList values = URLsFromQuery( rs ); if ( !values.isEmpty() ) @@ -2234,8 +2234,8 @@ CollectionDB::findEmbeddedImage( const TQString& artist, const TQString& album, "album.name = '%1' " "AND tags.sampler = %2 " "ORDER BY modifydate DESC LIMIT 1;" ) - .tqarg( escapeString( album ) ) - .tqarg( boolT() ) ); + .arg( escapeString( album ) ) + .arg( boolT() ) ); } else { rs = query( TQString( "SELECT embed.hash, embed.deviceid, embed.url FROM " @@ -2246,8 +2246,8 @@ CollectionDB::findEmbeddedImage( const TQString& artist, const TQString& album, "artist.name = '%1' " "AND album.name = '%2' " "ORDER BY modifydate DESC LIMIT 1;" ) - .tqarg( escapeString( artist ) ) - .tqarg( escapeString( album ) ) ); + .arg( escapeString( artist ) ) + .arg( escapeString( album ) ) ); } TQStringList values = TQStringList(); @@ -2282,7 +2282,7 @@ CollectionDB::findMetaBundleImage( const MetaBundle& trackInformation, uint widt query( TQString( "SELECT embed.hash FROM tags LEFT JOIN embed ON tags.url = embed.url " " AND tags.deviceid = embed.deviceid WHERE tags.url = '%2' AND tags.deviceid = %1 ORDER BY hash DESC LIMIT 1;" ) - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( deviceid ).arg( escapeString( rpath ) ) ); if ( values.empty() || !values.first().isEmpty() ) { TQCString hash; @@ -2638,7 +2638,7 @@ CollectionDB::addPodcastEpisode( const PodcastEpisodeBundle &episode, const int //This is a bit of a hack. We have just inserted an item, so it is going to be the one with the //highest id. Change this if threaded insertions are used in the future. TQStringList values = query( TQString("SELECT id FROM podcastepisodes WHERE url='%1' ORDER BY id DESC;") - .tqarg( escapeString( episode.url().url() ) ) ); + .arg( escapeString( episode.url().url() ) ) ); if( values.isEmpty() ) return -1; return values[0].toInt(); @@ -2679,12 +2679,12 @@ CollectionDB::getPodcastChannels() TQValueList<PodcastEpisodeBundle> CollectionDB::getPodcastEpisodes( const KURL &parent, bool onlyNew, int limit ) { - TQString command = TQString( "SELECT id, url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE ( parent='%1'" ).tqarg( parent.url() ); + TQString command = TQString( "SELECT id, url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE ( parent='%1'" ).arg( parent.url() ); if( onlyNew ) - command += TQString( " AND isNew='%1'" ).tqarg( boolT() ); + command += TQString( " AND isNew='%1'" ).arg( boolT() ); command += " ) ORDER BY id"; if( limit != -1 ) - command += TQString( " DESC LIMIT %1 OFFSET 0" ).tqarg( limit ); + command += TQString( " DESC LIMIT %1 OFFSET 0" ).arg( limit ); command += ';'; TQStringList values = query( command ); @@ -2722,7 +2722,7 @@ CollectionDB::getPodcastEpisodes( const KURL &parent, bool onlyNew, int limit ) PodcastEpisodeBundle CollectionDB::getPodcastEpisodeById( int id ) { - TQString command = TQString( "SELECT url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE id=%1;").tqarg( id ); + TQString command = TQString( "SELECT url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE id=%1;").arg( id ); TQStringList values = query( command ); PodcastEpisodeBundle peb; @@ -2759,7 +2759,7 @@ CollectionDB::getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *pe { TQStringList values = query( TQString( "SELECT id FROM podcastepisodes WHERE localurl = '%1';" ) - .tqarg( escapeString( url.url() ) ) ); + .arg( escapeString( url.url() ) ) ); if( !values.isEmpty() ) id = values[0].toInt(); } @@ -2767,7 +2767,7 @@ CollectionDB::getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *pe { TQStringList values = query( TQString( "SELECT id FROM podcastepisodes WHERE url = '%1';" ) - .tqarg( escapeString( url.url() ) ) ); + .arg( escapeString( url.url() ) ) ); if( !values.isEmpty() ) id = values[0].toInt(); } @@ -2787,7 +2787,7 @@ CollectionDB::getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *pc TQStringList values = query( TQString( "SELECT url, title, weblink, image, comment, copyright, parent, directory " ", autoscan, fetchtype, autotransfer, haspurge, purgecount FROM podcastchannels WHERE url = '%1';" - ).tqarg( escapeString( url.url() ) ) ); + ).arg( escapeString( url.url() ) ) ); foreach( values ) { @@ -2822,7 +2822,7 @@ CollectionDB::addPodcastFolder( const TQString &name, const int parent_id, const insert( command, NULL ); command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND parent = '%2';" ) - .tqarg( name, TQString::number(parent_id) ); + .arg( name, TQString::number(parent_id) ); TQStringList values = query( command ); return values[0].toInt(); @@ -2918,10 +2918,10 @@ CollectionDB::removePodcastChannel( const KURL &url ) { //remove channel query( TQString( "DELETE FROM podcastchannels WHERE url = '%1';" ) - .tqarg( escapeString( url.url() ) ) ); - //remove all tqchildren + .arg( escapeString( url.url() ) ) ); + //remove all children query( TQString( "DELETE FROM podcastepisodes WHERE parent = '%1';" ) - .tqarg( escapeString( url.url() ) ) ); + .arg( escapeString( url.url() ) ) ); } @@ -2931,7 +2931,7 @@ CollectionDB::removePodcastEpisode( const int id ) { if( id < 0 ) return; query( TQString( "DELETE FROM podcastepisodes WHERE id = '%1';" ) - .tqarg( TQString::number(id) ) ); + .arg( TQString::number(id) ) ); } void @@ -2939,7 +2939,7 @@ CollectionDB::removePodcastFolder( const int id ) { if( id < 0 ) return; query( TQString("DELETE FROM podcastfolders WHERE id=%1;") - .tqarg( TQString::number(id) ) ); + .arg( TQString::number(id) ) ); } bool @@ -3047,7 +3047,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) "SELECT url, uniqueid " "FROM uniqueid%1 " "WHERE deviceid = %2 AND url = '%3';" ) - .tqarg( tempTables ? "_temp" : "" + .arg( tempTables ? "_temp" : "" , currdeviceid , currurl ) ); @@ -3055,20 +3055,20 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) "SELECT url, uniqueid, deviceid " "FROM uniqueid%1 " "WHERE uniqueid = '%2';" ) - .tqarg( tempTables ? "_temp" : "" + .arg( tempTables ? "_temp" : "" , currid ) ); TQStringList nonTempIDs = query( TQString( "SELECT url, uniqueid, deviceid " "FROM uniqueid " "WHERE uniqueid = '%1';" ) - .tqarg( currid ) ); + .arg( currid ) ); TQStringList nonTempURLs = query( TQString( "SELECT url, uniqueid " "FROM uniqueid " "WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( currdeviceid + .arg( currdeviceid , currurl ) ); bool tempTablesAndInPermanent = false; @@ -3122,7 +3122,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) else //it's a move, not a copy, or a copy and then both files were moved...can't detect that { //debug() << "stat was NOT successful, updating tables with: " << endl; - //debug() << TQString( "UPDATE uniqueid%1 SET url='%2', dir='%3' WHERE uniqueid='%4';" ).tqarg( ( tempTables ? "_temp" : "" ), currurl, currdir, currid ) << endl; + //debug() << TQString( "UPDATE uniqueid%1 SET url='%2', dir='%3' WHERE uniqueid='%4';" ).arg( ( tempTables ? "_temp" : "" ), currurl, currdir, currid ) << endl; query( QStringx( "UPDATE uniqueid%1 SET deviceid = %2, url='%3', dir='%4' WHERE uniqueid='%5';" ) .args( TQStringList() << ( tempTables ? "_temp" : "" ) @@ -3142,7 +3142,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { //debug() << "file exists in same place as before, new uniqueid" << endl; query( TQString( "UPDATE uniqueid%1 SET uniqueid='%2' WHERE deviceid = %3 AND url='%4';" ) - .tqarg( tempTables ? "_temp" : "" + .arg( tempTables ? "_temp" : "" , currid , currdeviceid , currurl ) ); @@ -3161,9 +3161,9 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { TQString insertline = TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) " "VALUES ( %1, '%2'" ) - .tqarg( currdeviceid + .arg( currdeviceid , currurl ); - insertline += TQString( ", '%1', '%2');" ).tqarg( currid ).tqarg( currdir ); + insertline += TQString( ", '%1', '%2');" ).arg( currid ).arg( currdir ); //debug() << "running command: " << insertline << endl; insert( insertline, NULL ); //debug() << "aftCheckPermanentTables #2" << endl; @@ -3187,10 +3187,10 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { //debug() << "stat part 2 was NOT successful, updating tables with: " << endl; query( TQString( "DELETE FROM uniqueid WHERE uniqueid='%1';" ) - .tqarg( currid ) ); + .arg( currid ) ); query( TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) " "VALUES ( %1, '%2', '%3', '%4')" ) - .tqarg( currdeviceid + .arg( currdeviceid , currurl , currid , currdir ) ); @@ -3202,10 +3202,10 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { //debug() << "file exists in same place as before, part 2, new uniqueid" << endl; query( TQString( "DELETE FROM uniqueid WHERE deviceid = %1 AND url='%2';" ) - .tqarg( currdeviceid ) - .tqarg( currurl ) ); + .arg( currdeviceid ) + .arg( currurl ) ); query( TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) VALUES ( %1, '%2', '%3', '%4')" ) - .tqarg( currdeviceid + .arg( currdeviceid , currurl , currid , currdir ) ); @@ -3242,15 +3242,15 @@ CollectionDB::urlFromUniqueId( const TQString &id ) "SELECT deviceid, url " "FROM uniqueid%1 " "WHERE uniqueid = '%2';" ) - .tqarg( scanning ? "_temp" : TQString() ) - .tqarg( id ), true ); + .arg( scanning ? "_temp" : TQString() ) + .arg( id ), true ); if( urls.empty() && scanning ) urls = query( TQString( "SELECT deviceid, url " "FROM uniqueid " "WHERE uniqueid = '%1';" ) - .tqarg( id ) ); + .arg( id ) ); if( urls.empty() ) return TQString(); @@ -3270,17 +3270,17 @@ CollectionDB::uniqueIdFromUrl( const KURL &url ) "SELECT uniqueid " "FROM uniqueid%1 " "WHERE deviceid = %2 AND url = '%3';" ) - .tqarg( scanning ? "_temp" : TQString() ) - .tqarg( currdeviceid ) - .tqarg( currurl ), true ); + .arg( scanning ? "_temp" : TQString() ) + .arg( currdeviceid ) + .arg( currurl ), true ); if( uid.empty() && scanning ) uid = query( TQString( "SELECT uniqueid " "FROM uniqueid " "WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( currdeviceid ) - .tqarg( currurl ) ); + .arg( currdeviceid ) + .arg( currurl ) ); if( uid.empty() ) return TQString(); @@ -3303,10 +3303,10 @@ CollectionDB::getURL( const MetaBundle &bundle ) "FROM tags " "WHERE tags.album = '%1' AND tags.artist = '%2' AND tags.track = '%3' AND tags.title = '%4'" + deviceidSelection() + ';' ) - .tqarg( albID ) - .tqarg( artID ) - .tqarg( bundle.track() ) - .tqarg( escapeString( bundle.title() ) ); + .arg( albID ) + .arg( artID ) + .arg( bundle.track() ) + .arg( escapeString( bundle.title() ) ); TQStringList urls = URLsFromQuery( query( q ) ); @@ -3443,8 +3443,8 @@ CollectionDB::bundleForUrl( MetaBundle* bundle ) "album, artist, composer, genre, year " "WHERE album.id = tags.album AND artist.id = tags.artist AND composer.id = tags.composer AND " "genre.id = tags.genre AND year.id = tags.year AND tags.url = '%2' AND tags.deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath.path( ) ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath.path( ) ) ) ); bool valid = false; @@ -3577,7 +3577,7 @@ CollectionDB::bundlesByUrls( const KURL::List& urls ) b.setUrl( url ); // FIXME: more context for i18n after string freeze b.setTitle( TQString( "%1 %2 %3%4" ) - .tqarg( url.filename(), + .arg( url.filename(), i18n( "from" ), url.hasHost() ? url.host() : TQString(), url.directory( false ) ) ); @@ -3633,11 +3633,11 @@ CollectionDB::addAudioproperties( const MetaBundle& bundle ) KURL rpath; MountPointManager::instance()->getRelativePath( deviceid, bundle.url(), rpath ); query( TQString( "UPDATE tags SET bitrate='%1', length='%2', samplerate='%3' WHERE url='%5' AND deviceid = %4;" ) - .tqarg( bundle.bitrate() ) - .tqarg( bundle.length() ) - .tqarg( bundle.sampleRate() ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath.path() ) ) ); + .arg( bundle.bitrate() ) + .arg( bundle.length() ) + .arg( bundle.sampleRate() ) + .arg( deviceid ) + .arg( escapeString( rpath.path() ) ) ); } @@ -3655,7 +3655,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, query( TQString( "SELECT playcounter, createdate, percentage, rating FROM statistics " "WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( statDevId ).tqarg( escapeString( statRPath ) ) ); + .arg( statDevId ).arg( escapeString( statRPath ) ) ); //handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1 if ( values.isEmpty() ) @@ -3664,7 +3664,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, values = query( TQString( "SELECT playcounter, createdate, percentage, rating FROM statistics " "WHERE url = '%1' AND deviceid = -1;" ) - .tqarg( escapeString( rpath2 ) ) ); + .arg( escapeString( rpath2 ) ) ); if ( !values.isEmpty() ) { statRPath = rpath2; @@ -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; @@ -3683,21 +3683,21 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, // increment playcounter and update accesstime query( TQString( "UPDATE statistics SET playcounter=%1, accessdate=%2 WHERE url='%4' AND deviceid= %3;" ) - .tqarg( values[0] + " + 1" ) - .tqarg( atime ) - .tqarg( statDevId ) - .tqarg( escapeString( statRPath ) ) ); + .arg( values[0] + " + 1" ) + .arg( atime ) + .arg( statDevId ) + .arg( escapeString( statRPath ) ) ); } else { insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, playcounter, rating, uniqueid, deleted ) " "VALUES ( '%6', %5, %1, %2, 0, 1, 0, %3, %4 );" ) - .tqarg( atime ) - .tqarg( atime ) - .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) - .tqarg( boolF() ) - .tqarg( statDevId ) - .tqarg( escapeString( statRPath ) ), 0 ); + .arg( atime ) + .arg( atime ) + .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) + .arg( boolF() ) + .arg( statDevId ) + .arg( escapeString( statRPath ) ), 0 ); } double prevscore = 50; @@ -3711,7 +3711,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, prevscore = values[ 2 ].toDouble(); } const TQStringList v = query( TQString( "SELECT length FROM tags WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( deviceid ).arg( escapeString( rpath ) ) ); const int length = v.isEmpty() ? 0 : v.first().toInt(); ScriptManager::instance()->requestNewScore( url, prevscore, playcount, length, percentage, reason ); @@ -3756,7 +3756,7 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage) TQStringList values = query( TQString( "SELECT playcounter, createdate, accessdate, rating FROM statistics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( deviceid ).arg( escapeString( rpath ) ) ); //handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1 if ( values.isEmpty() ) @@ -3765,7 +3765,7 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage) values = query( TQString( "SELECT playcounter, createdate, accessdate, rating FROM statistics " "WHERE url = '%1' AND deviceid = -1;" ) - .tqarg( escapeString( rpath2 ) ) ); + .arg( escapeString( rpath2 ) ) ); if ( !values.isEmpty() ) { rpath = rpath2; @@ -3780,20 +3780,20 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage) if ( !values.isEmpty() ) { query( TQString( "UPDATE statistics SET percentage=%1 WHERE url='%3' AND deviceid = %2;" ) - .tqarg( percentage ) - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( percentage ) + .arg( deviceid ).arg( escapeString( rpath ) ) ); } else { 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( 0 ) - .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) - .tqarg( boolF() ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ),0 ); + .arg( percentage ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( 0 ) + .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) + .arg( boolF() ) + .arg( deviceid ) + .arg( escapeString( rpath ) ),0 ); } emit scoreChanged( url, percentage ); @@ -3807,8 +3807,8 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf ) TQStringList values = query( TQString( "SELECT playcounter, createdate, accessdate, percentage, rating FROM statistics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); //handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1 if( values.isEmpty() ) @@ -3817,7 +3817,7 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf ) values = query( TQString( "SELECT playcounter, createdate, accessdate, percentage, rating FROM statistics " "WHERE url = '%1' AND deviceid = -1;" ) - .tqarg( escapeString( rpath2 ) ) ); + .arg( escapeString( rpath2 ) ) ); if ( !values.isEmpty() ) { rpath = rpath2; @@ -3847,21 +3847,21 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf ) if ( !values.isEmpty() ) { query( TQString( "UPDATE statistics SET rating=%1 WHERE url='%3' AND deviceid = %2;" ) - .tqarg( rating ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( rating ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } else { 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( 0 ) - .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) - .tqarg( boolF() ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ), NULL ); + .arg( rating ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( 0 ) + .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) + .arg( boolF() ) + .arg( deviceid ) + .arg( escapeString( rpath ) ), NULL ); } emit ratingChanged( url, rating ); @@ -3923,43 +3923,43 @@ CollectionDB::migrateFile( const TQString &oldURL, const TQString &newURL ) // Ensure destination is clear. query( TQString( "DELETE FROM tags WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) ); + .arg( newMediaid ).arg( escapeString( newRpath ) ) ); query( TQString( "DELETE FROM statistics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) ); + .arg( newMediaid ).arg( escapeString( newRpath ) ) ); query( TQString( "DELETE FROM tags_labels WHERE url = '%2' and deviceid = %1;" ) - .tqarg( newMediaid).tqarg( escapeString( newRpath ) ) ); + .arg( newMediaid).arg( escapeString( newRpath ) ) ); if ( !getLyrics( oldURL ).isEmpty() ) query( TQString( "DELETE FROM lyrics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) ); + .arg( newMediaid ).arg( escapeString( newRpath ) ) ); // Migrate //code looks ugly but prevents problems when the URL contains HTTP escaped characters query( TQString( "UPDATE tags SET url = '%3', deviceid = %1" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) + .arg( newMediaid ).arg( escapeString( newRpath ) ) + TQString( " WHERE deviceid=%1 AND url = '%2';" ) - .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) ); + .arg( oldMediaid ).arg( escapeString( oldRpath ) ) ); query( TQString( "UPDATE statistics SET url = '%2', deviceid = %1" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) + .arg( newMediaid ).arg( escapeString( newRpath ) ) + TQString( " WHERE deviceid=%1 AND url = '%2';" ) - .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) ); + .arg( oldMediaid ).arg( escapeString( oldRpath ) ) ); query( TQString( "UPDATE lyrics SET url = '%2', deviceid = %1" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) + .arg( newMediaid ).arg( escapeString( newRpath ) ) + TQString( " WHERE deviceid=%1 AND url = '%2';" ) - .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) ); + .arg( oldMediaid ).arg( escapeString( oldRpath ) ) ); query( TQString( "UPDATE tags_labels SET url = '%2', deviceid = %1 WHERE deviceid = %3 AND url = '%4';" ) - .tqarg( TQString::number( newMediaid ), escapeString( newRpath ), TQString::number( oldMediaid ), escapeString( oldRpath ) ) ); + .arg( TQString::number( newMediaid ), escapeString( newRpath ), TQString::number( oldMediaid ), escapeString( oldRpath ) ) ); query( TQString( "UPDATE uniqueid SET url = '%1', deviceid = %2 WHERE url = '%3' AND deviceid = %4;" ) - .tqarg( escapeString( newRpath ), TQString::number( newMediaid ), + .arg( escapeString( newRpath ), TQString::number( newMediaid ), escapeString( oldRpath ), TQString::number( oldMediaid ) ) ); query( TQString( "UPDATE playlists SET url = '%1' WHERE url = '%2';" ) - .tqarg( escapeString( newURL ), + .arg( escapeString( newURL ), escapeString( oldURL ) ) ); } @@ -4002,7 +4002,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b int count = 0; do { - tmp = TQString( dialog.folderCombo->currentText() + "/amarok-tmp-%1." + extension ).tqarg( count ); + tmp = TQString( dialog.folderCombo->currentText() + "/amarok-tmp-%1." + extension ).arg( count ); count++; } while( TQFile::exists( tmp ) ); tmpSrc = KURL::fromPathOrURL( tmp ); @@ -4024,7 +4024,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b { disconnect( job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(fileOperationResult( KIO::Job * )) ); - TQString partFile = TQString( "%1.part" ).tqarg( (job->destURL()).path() ); + TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() ); job->kill(); TQFile file( partFile ); if( file.exists() ) file.remove(); @@ -4035,7 +4035,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b } usleep( 10000 ); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); } if( m_fileOperationFailed ) @@ -4151,7 +4151,7 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit { disconnect( job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(fileOperationResult( KIO::Job * )) ); - TQString partFile = TQString( "%1.part" ).tqarg( (job->destURL()).path() ); + TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() ); job->kill(); TQFile file( partFile ); if( file.exists() ) file.remove(); @@ -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 ) @@ -4215,35 +4215,35 @@ CollectionDB::updateDirStats( TQString path, const long datetime, const bool tem // REPLACE INTO is not valid SQL for postgres, so we need to check whether we // should UPDATE() or INSERT() TQStringList values = query( TQString("SELECT * FROM directories%1 WHERE dir='%3' AND deviceid=%2;") - .tqarg( temporary ? "_temp" : "") - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( temporary ? "_temp" : "") + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); if(values.count() > 0 ) { query( TQString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%4'AND deviceid=%3;") - .tqarg( temporary ? "_temp" : "" ) - .tqarg( datetime ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( temporary ? "_temp" : "" ) + .arg( datetime ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } else { query( TQString( "INSERT INTO directories%1 (dir, deviceid,changedate) VALUES ('%4', %3, '%2');") - .tqarg( temporary ? "_temp" : "") - .tqarg( datetime ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( temporary ? "_temp" : "") + .arg( datetime ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } } else { query( TQString( "REPLACE INTO directories%1 ( dir, deviceid, changedate ) VALUES ( '%4', %3, %2 );" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( datetime ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( temporary ? "_temp" : "" ) + .arg( datetime ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } INotify::instance()->watchDir( path ); @@ -4266,8 +4266,8 @@ CollectionDB::removeSongsInDir( TQString path, TQMap<TQString,TQString> *tagsRem "LEFT JOIN uniqueid ON uniqueid.url = tags.url " "AND uniqueid.deviceid = tags.deviceid " "WHERE tags.dir = '%2' AND tags.deviceid = %1" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); TQStringList::ConstIterator it = result.begin(), end = result.end(); while( it != end ) { @@ -4280,12 +4280,12 @@ CollectionDB::removeSongsInDir( TQString path, TQMap<TQString,TQString> *tagsRem } query( TQString( "DELETE FROM tags WHERE dir = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); query( TQString( "DELETE FROM uniqueid WHERE dir = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } @@ -4299,8 +4299,8 @@ CollectionDB::isDirInCollection( TQString path ) TQStringList values = query( TQString( "SELECT changedate FROM directories WHERE dir = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); return !values.isEmpty(); } @@ -4313,8 +4313,8 @@ CollectionDB::isFileInCollection( const TQString &url ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQString sql = TQString( "SELECT url FROM tags WHERE url = '%2' AND deviceid = %1" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ); if ( deviceid == -1 ) { sql += ';'; @@ -4323,7 +4323,7 @@ CollectionDB::isFileInCollection( const TQString &url ) { TQString rpath2 = '.' + url; sql += TQString( " OR url = '%1' AND deviceid = -1;" ) - .tqarg( escapeString( rpath2 ) ); + .arg( escapeString( rpath2 ) ); } TQStringList values = query( sql ); @@ -4340,15 +4340,15 @@ CollectionDB::removeSongs( const KURL::List& urls ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, (*it).path() ); query( TQString( "DELETE FROM tags WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); query( TQString( "DELETE FROM uniqueid WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); query( TQString( "UPDATE statistics SET deleted = %1 WHERE url = '%3' AND deviceid = %2;" ) - .tqarg( boolT() ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( boolT() ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } } @@ -4359,7 +4359,7 @@ CollectionDB::similarArtists( const TQString &artist, uint count ) TQStringList values; values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' ORDER BY %2 LIMIT %3 OFFSET 0;" ) - .tqarg( escapeString( artist ), randomFunc(), TQString::number( count ) ) ); + .arg( escapeString( artist ), randomFunc(), TQString::number( count ) ) ); if ( values.isEmpty() ) Scrobbler::instance()->similarArtists( artist ); @@ -4371,7 +4371,7 @@ CollectionDB::similarArtists( const TQString &artist, uint count ) void CollectionDB::sanitizeCompilations() { - query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE sampler IS NULL;").tqarg( boolF() ) ); + query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE sampler IS NULL;").arg( boolF() ) ); } void @@ -4385,9 +4385,9 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, path ); albums = query( TQString( "SELECT DISTINCT album.name FROM tags_temp, album%1 AS album WHERE tags_temp.dir = '%3' AND tags_temp.deviceid = %2 AND album.id = tags_temp.album AND tags_temp.sampler IS NULL;" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( temporary ? "_temp" : "" ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); for ( uint i = 0; i < albums.count(); i++ ) { @@ -4395,17 +4395,17 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary ) const uint album_id = albumID( albums[ i ], false, temporary, true ); artists = query( TQString( "SELECT DISTINCT artist.name FROM tags_temp, artist%1 AS artist WHERE tags_temp.album = '%2' AND tags_temp.artist = artist.id;" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( album_id ) ); + .arg( temporary ? "_temp" : "" ) + .arg( album_id ) ); dirs = query( TQString( "SELECT DISTINCT dir FROM tags_temp WHERE album = '%1';" ) - .tqarg( album_id ) ); + .arg( album_id ) ); if ( artists.count() > dirs.count() ) { debug() << "Detected compilation: " << albums[ i ] << " - " << artists.count() << ':' << dirs.count() << endl; } query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE album = '%2' AND sampler IS NULL;" ) - .tqarg(artists.count() > dirs.count() ? boolT() : boolF()).tqarg( album_id ) ); + .arg(artists.count() > dirs.count() ? boolT() : boolF()).arg( album_id ) ); } } @@ -4420,7 +4420,7 @@ CollectionDB::setCompilation( const KURL::List &urls, bool enabled, bool updateV TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); query( TQString( "UPDATE tags SET sampler = %1 WHERE tags.url = '%2' AND tags.deviceid = %3;" ) - .tqarg( ( enabled ? boolT() : boolF() ), escapeString( rpath ), TQString::number( deviceid ) ) ); + .arg( ( enabled ? boolT() : boolF() ), escapeString( rpath ), TQString::number( deviceid ) ) ); } // Update the Collection-Browser view, @@ -4439,8 +4439,8 @@ CollectionDB::removeDirFromCollection( TQString path ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, path ); query( TQString( "DELETE FROM directories WHERE dir = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } @@ -4452,14 +4452,14 @@ CollectionDB::IDFromExactValue( TQString table, TQString value, bool autocreate, table.append( "_temp" ); } - TQString querystr( TQString( "SELECT id FROM %1 WHERE name " ).tqarg( table ) ); + TQString querystr( TQString( "SELECT id FROM %1 WHERE name " ).arg( table ) ); querystr += exactCondition( value ) + ';'; TQStringList result = query( querystr ); if ( result.isEmpty() ) { if ( autocreate ) return TQString::number( insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" ) - .tqarg( table, escapeString( value ) ), + .arg( table, escapeString( value ) ), table ) ); else return 0; @@ -4475,17 +4475,17 @@ CollectionDB::IDFromExactValue( TQString table, TQString value, bool autocreate, void CollectionDB::deleteRedundantName( const TQString &table, const TQString &id ) { - TQString querystr( TQString( "SELECT %1 FROM tags WHERE tags.%1 = %2 LIMIT 1;" ).tqarg( table, id ) ); + TQString querystr( TQString( "SELECT %1 FROM tags WHERE tags.%1 = %2 LIMIT 1;" ).arg( table, id ) ); TQStringList result = query( querystr ); if ( result.isEmpty() ) - query( TQString( "DELETE FROM %1 WHERE id = %2;" ).tqarg( table,id ) ); + query( TQString( "DELETE FROM %1 WHERE id = %2;" ).arg( table,id ) ); } void CollectionDB::deleteAllRedundant( const TQString &table ) { //This works with MySQL4. I thought it might not do, due to the comment in copyTempTables - query( TQString( "DELETE FROM %1 WHERE id NOT IN ( SELECT %2 FROM tags )" ).tqarg( table, table ) ); + query( TQString( "DELETE FROM %1 WHERE id NOT IN ( SELECT %2 FROM tags )" ).arg( table, table ) ); } @@ -4630,8 +4630,8 @@ CollectionDB::getUniqueId( const TQString &url ) int deviceid = MountPointManager::instance()->getIdForUrl( url ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQStringList values = query( TQString( "SELECT uniqueid FROM uniqueid WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) )); + .arg( deviceid ) + .arg( escapeString( rpath ) )); if( !values.empty() ) return values[0]; else @@ -4645,20 +4645,20 @@ CollectionDB::setLyrics( const TQString &url, const TQString &lyrics, const TQSt TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQStringList values = query(TQString("SELECT lyrics FROM lyrics WHERE url = '%2' AND deviceid = %1;") - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( deviceid ).arg( escapeString( rpath ) ) ); if(values.count() > 0) { if ( !lyrics.isEmpty() ) query( TQString( "UPDATE lyrics SET lyrics = '%1' WHERE url = '%3' AND deviceid = %2;" ) - .tqarg( escapeString( lyrics), TQString::number(deviceid), escapeString( rpath ) ) ); + .arg( escapeString( lyrics), TQString::number(deviceid), escapeString( rpath ) ) ); else query( TQString( "DELETE FROM lyrics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid).tqarg( escapeString( rpath ) ) ); + .arg( deviceid).arg( escapeString( rpath ) ) ); } else { insert( TQString( "INSERT INTO lyrics (deviceid, url, lyrics, uniqueid) values ( %1, '%2', '%3', '%4' );" ) - .tqarg( TQString::number(deviceid), escapeString( rpath ), escapeString( lyrics ), escapeString( uniqueid ) ), NULL); + .arg( TQString::number(deviceid), escapeString( rpath ), escapeString( lyrics ), escapeString( uniqueid ) ), NULL); } } @@ -4669,41 +4669,41 @@ CollectionDB::getLyrics( const TQString &url ) int deviceid = MountPointManager::instance()->getIdForUrl( url ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQStringList values = query( TQString( "SELECT lyrics FROM lyrics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( deviceid ).arg( escapeString( rpath ) ) ); return values[0]; } void CollectionDB::removeInvalidAmazonInfo( const TQString& md5sum ) { - query( TQString( "DELETE FROM amazon WHERE filename='%1'" ).tqarg( md5sum ) ); + query( TQString( "DELETE FROM amazon WHERE filename='%1'" ).arg( md5sum ) ); } void CollectionDB::newAmazonReloadDate( const TQString& asin, const TQString& locale, const TQString& md5sum) { TQStringList values = query(TQString("SELECT filename FROM amazon WHERE filename = '%1'") - .tqarg(md5sum)); + .arg(md5sum)); if(values.count() > 0) { 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(md5sum)); + .arg(asin) + .arg(locale) + .arg(TQDateTime::currentDateTime().addDays(80).toTime_t()) + .arg(md5sum)); } else { insert( TQString( "INSERT INTO amazon ( asin, locale, filename, refetchdate ) VALUES ( '%1', '%2', '%3', '%4');" ) - .tqarg(asin) - .tqarg(locale) - .tqarg(md5sum) - .tqarg(TQDateTime::tqcurrentDateTime().addDays(80).toTime_t()), NULL ); + .arg(asin) + .arg(locale) + .arg(md5sum) + .arg(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() )); + .arg(TQDateTime::currentDateTime().toTime_t() )); } void @@ -5022,12 +5022,12 @@ class SimilarArtistsInsertionJob : public ThreadManager::DependentJob { virtual bool doJob() { - CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).tqarg( escapedArtist ) ); + CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).arg( escapedArtist ) ); const TQString sql = "INSERT INTO related_artists ( artist, suggestion, changedate ) VALUES ( '%1', '%2', 0 );"; foreach( suggestions ) CollectionDB::instance()->insert( sql - .tqarg( escapedArtist, + .arg( escapedArtist, CollectionDB::instance()->escapeString( *it ) ), NULL); return true; @@ -5071,23 +5071,23 @@ CollectionDB::aftCheckPermanentTables( const TQString &currdeviceid, const TQStr "SELECT url, deviceid " "FROM %1 " "WHERE uniqueid = '%2';" ) - .tqarg( escapeString( *it ) ) - .tqarg( currid ) ); + .arg( escapeString( *it ) ) + .arg( currid ) ); check2 = query( TQString( "SELECT url, uniqueid " "FROM %1 " "WHERE deviceid = %2 AND url = '%3';" ) - .tqarg( escapeString( *it ) ) - .tqarg( currdeviceid + .arg( escapeString( *it ) ) + .arg( currdeviceid , currurl ) ); if( !check1.empty() ) { //debug() << "uniqueid found, updating url" << endl; query( TQString( "UPDATE %1 SET deviceid = %2, url = '%4' WHERE uniqueid = '%3';" ) - .tqarg( escapeString( *it ) ) - .tqarg( currdeviceid + .arg( escapeString( *it ) ) + .arg( currdeviceid , currid , currurl ) ); } @@ -5095,8 +5095,8 @@ CollectionDB::aftCheckPermanentTables( const TQString &currdeviceid, const TQStr { //debug() << "url found, updating uniqueid" << endl; query( TQString( "UPDATE %1 SET uniqueid = '%2' WHERE deviceid = %3 AND url = '%4';" ) - .tqarg( escapeString( *it ) ) - .tqarg( currid + .arg( escapeString( *it ) ) + .arg( currid , currdeviceid , currurl ) ); } @@ -5115,14 +5115,14 @@ CollectionDB::aftMigratePermanentTablesUrl( const TQString& /*oldUrl*/, const TQ foreach( m_aftEnabledPersistentTables ) { query( TQString( "DELETE FROM %1 WHERE deviceid = %2 AND url = '%3';" ) - .tqarg( escapeString( *it ) ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( escapeString( *it ) ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); query( TQString( "UPDATE %1 SET deviceid = %2, url = '%4' WHERE uniqueid = '%3';" ) - .tqarg( escapeString( *it ) ) - .tqarg( deviceid ) - .tqarg( escapeString( uniqueid ) ) - .tqarg( escapeString( rpath ) ) ); + .arg( escapeString( *it ) ) + .arg( deviceid ) + .arg( escapeString( uniqueid ) ) + .arg( escapeString( rpath ) ) ); } } @@ -5136,12 +5136,12 @@ CollectionDB::aftMigratePermanentTablesUniqueId( const TQString& /*url*/, const foreach( m_aftEnabledPersistentTables ) { query( TQString( "DELETE FROM %1 WHERE uniqueid = '%2';" ) - .tqarg( escapeString( *it ) ) - .tqarg( escapeString( newid ) ) ); + .arg( escapeString( *it ) ) + .arg( escapeString( newid ) ) ); query( TQString( "UPDATE %1 SET uniqueid = '%1' WHERE uniqueid = '%2';" ) - .tqarg( escapeString( *it ) ) - .tqarg( escapeString( newid ) ) - .tqarg( escapeString( oldid ) ) ); + .arg( escapeString( *it ) ) + .arg( escapeString( newid ) ) + .arg( escapeString( oldid ) ) ); } } @@ -5462,11 +5462,11 @@ CollectionDB::updateStatsTables() //pre somewhere in the 1.3-1.4 timeframe, the version wasn't stored in the DB, so try to guess it const TQString q = "SELECT COUNT( %1 ) FROM statistics;"; - if( !prev && query( q.tqarg( "url" ) ).first().toInt() - && query( q.tqarg( "createdate" ) ).first().toInt() - && query( q.tqarg( "accessdate" ) ).first().toInt() - && query( q.tqarg( "percentage" ) ).first().toInt() - && query( q.tqarg( "playcounter" ) ).first().toInt() ) + if( !prev && query( q.arg( "url" ) ).first().toInt() + && query( q.arg( "createdate" ) ).first().toInt() + && query( q.arg( "accessdate" ) ).first().toInt() + && query( q.arg( "percentage" ) ).first().toInt() + && query( q.arg( "playcounter" ) ).first().toInt() ) { prev = 3; } @@ -5533,9 +5533,9 @@ CollectionDB::updateStatsTables() int deviceid = exists ? MountPointManager::instance()->getIdForUrl( *it ) : -2; TQString rpath = exists ? MountPointManager::instance()->getRelativePath( deviceid, *it ) : *it; TQString update = TQString( "UPDATE statistics SET deviceid = %1, url = '%2' WHERE " ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ); - update += TQString( "url = '%1';" ).tqarg( escapeString( *it ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ); + update += TQString( "url = '%1';" ).arg( escapeString( *it ) ); query ( update ); } } @@ -5642,9 +5642,9 @@ CollectionDB::updatePersistentTables() int deviceid = MountPointManager::instance()->getIdForUrl( *it ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, *it ); TQString update = TQString( "UPDATE lyrics SET deviceid = %1, url = '%2' WHERE " ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ); - update += TQString( "url = '%1';" ).tqarg( escapeString( *it ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ); + update += TQString( "url = '%1';" ).arg( escapeString( *it ) ); query ( update ); } } @@ -5890,7 +5890,7 @@ CollectionDB::getLabels( const TQString &url, const uint type ) return query( TQString( "SELECT labels.name FROM labels " "LEFT JOIN tags_labels ON labels.id = tags_labels.labelid " "WHERE labels.type = %1 AND tags_labels.deviceid = %2 AND tags_labels.url = '%3';" ) - .tqarg( type ).tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( type ).arg( deviceid ).arg( escapeString( rpath ) ) ); } void @@ -5911,7 +5911,7 @@ CollectionDB::cleanLabels() } query( TQString( "DELETE FROM labels " "WHERE labels.id IN ( %1 );" ) - .tqarg( ids ) ); + .arg( ids ) ); } } @@ -5921,7 +5921,7 @@ CollectionDB::setLabels( const TQString &url, const TQStringList &labels, const DEBUG_BLOCK int deviceid = MountPointManager::instance()->getIdForUrl( url ); TQString rpath = escapeString( MountPointManager::instance()->getRelativePath( deviceid, url ) ); - TQStringList labelIds = query( TQString( "SELECT id FROM labels WHERE type = %1;" ).tqarg( type ) ); + TQStringList labelIds = query( TQString( "SELECT id FROM labels WHERE type = %1;" ).arg( type ) ); TQString ids; if ( !labelIds.isEmpty() ) { @@ -5934,20 +5934,20 @@ CollectionDB::setLabels( const TQString &url, const TQStringList &labels, const //TODO: max: add uniqueid handling query( TQString( "DELETE FROM tags_labels " "WHERE tags_labels.labelid IN (%1) AND tags_labels.deviceid = %2 AND tags_labels.url = '%3';" ) - .tqarg( ids, TQString::number(deviceid), rpath ) ); + .arg( ids, TQString::number(deviceid), rpath ) ); } foreach( labels ) { int id = query( TQString( "SELECT id FROM labels WHERE type = %1 AND name = '%2';" ) - .tqarg( type ).tqarg( escapeString( *it ) ) ).first().toInt(); + .arg( type ).arg( escapeString( *it ) ) ).first().toInt(); if ( !id ) { id = insert( TQString( "INSERT INTO labels( name, type ) VALUES ( '%2', %1 );" ) - .tqarg( type ).tqarg( escapeString( *it ) ), "labels" ); + .arg( type ).arg( escapeString( *it ) ), "labels" ); } insert( TQString( "INSERT INTO tags_labels( labelid, deviceid, url, uniqueid ) VALUES ( %1, %2, '%3', '%4' );" ) - .tqarg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), 0 ); + .arg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), 0 ); } emit labelsChanged( url ); @@ -5962,10 +5962,10 @@ CollectionDB::removeLabels( const TQString &url, const TQStringList &labels, con TQString sql = TQString( "DELETE FROM tags_labels " "FROM tags_labels AS t LEFT JOIN labels AS l ON t.labelid = l.id " "WHERE l.type = %1 AND t.deviceid = %2 AND t.url = '%3' AND ( 0" ) - .tqarg( type ).tqarg( deviceid ).tqarg( rpath ); + .arg( type ).arg( deviceid ).arg( rpath ); foreach( labels ) { - sql += TQString( " OR l.name = '%1'" ).tqarg( escapeString( *it ) ); + sql += TQString( " OR l.name = '%1'" ).arg( escapeString( *it ) ); } sql += ");"; query( sql ); @@ -5981,23 +5981,23 @@ CollectionDB::addLabel( const TQString &url, const TQString &label, const TQStri TQString rpath = escapeString( MountPointManager::instance()->getRelativePath( deviceid, url ) ); int id = query( TQString( "SELECT id FROM labels WHERE type = %1 AND name = '%2';" ) - .tqarg( type ).tqarg( escapeString( label ) ) ).first().toInt(); + .arg( type ).arg( escapeString( label ) ) ).first().toInt(); bool labelAlreadyExists = id > 0; if ( !id ) { id = insert( TQString( "INSERT INTO labels( name, type ) VALUES ( '%2', %1 );" ) - .tqarg( type ).tqarg( escapeString( label ) ), "labels" ); + .arg( type ).arg( escapeString( label ) ), "labels" ); } if ( labelAlreadyExists ) { //we can return if the link between the tags row and the labels row already exists int count = query( TQString( "SELECT COUNT(*) FROM tags_labels WHERE labelid = %1 AND deviceid = %2 AND url = '%3';" ) - .tqarg( id ).tqarg( deviceid ).tqarg( rpath ) ).first().toInt(); + .arg( id ).arg( deviceid ).arg( rpath ) ).first().toInt(); if ( count ) return false; } insert( TQString( "INSERT INTO tags_labels( labelid, deviceid, url, uniqueid ) VALUES ( %1, %2, '%3', '%4' );" ) - .tqarg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), "tags_labels" ); + .arg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), "tags_labels" ); emit labelsChanged( url ); return true; @@ -6010,7 +6010,7 @@ CollectionDB::favoriteLabels( int type, int count ) "FROM labels LEFT JOIN tags_labels ON labels.id = tags_labels.labelid " "WHERE labels.type = %1 GROUP BY labels.name " "ORDER BY count(tags_labels.labelid) DESC LIMIT %2;" ) - .tqarg( TQString::number( type ), TQString::number( count ) ) ); + .arg( TQString::number( type ), TQString::number( count ) ) ); } TQDir @@ -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 ); @@ -6593,7 +6593,7 @@ int PostgresqlConnection::insert( const TQString& statement, const TQString& tab TQString _table = table; if (table.find("_temp") > 0) _table = table.left(table.find("_temp")); - curvalSql = TQString("SELECT currval('%1_seq');").tqarg(_table); + curvalSql = TQString("SELECT currval('%1_seq');").arg(_table); result = PQexec(m_db, curvalSql.utf8()); if (result == NULL) { @@ -6733,7 +6733,7 @@ QueryBuilder::linkTables( int tables ) //if ( !m_url.isEmpty() ) { // TQString url = TQString( '.' ) + m_url; // m_tables += TQString( " OR statistics.deviceid = -1 AND statistics.url = '%1'" ) - // .tqarg( CollectionDB::instance()->escapeString( url ) ); + // .arg( CollectionDB::instance()->escapeString( url ) ); //} } if ( tables & tabLyrics ) @@ -6827,7 +6827,7 @@ QueryBuilder::addURLFilters( const TQStringList& filter ) int deviceid = MountPointManager::instance()->getIdForUrl( filter[i] ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid , filter[i] ); m_where += "OR (tags.url = '" + CollectionDB::instance()->escapeString( rpath ) + "' "; - m_where += TQString( "AND tags.deviceid = %1 ) " ).tqarg( TQString::number( deviceid ) ); + m_where += TQString( "AND tags.deviceid = %1 ) " ).arg( TQString::number( deviceid ) ); //TODO MountPointManager fix this } @@ -7044,7 +7044,7 @@ QueryBuilder::addFilter( int tables, const TQString& filter ) m_where += "OR tags.title = '' "; } if ( ( tables & tabArtist ) && i18n( "Various Artists" ).contains( filter, false ) ) - m_where += TQString( "OR tags.sampler = %1 " ).tqarg( CollectionDB::instance()->boolT() ); + m_where += TQString( "OR tags.sampler = %1 " ).arg( CollectionDB::instance()->boolT() ); m_where += " ) "; } @@ -7080,12 +7080,12 @@ QueryBuilder::addFilter( int tables, TQ_INT64 value, const TQString& filter, int } if( coalesceField( tables, value ) ) - m_where += TQString( "COALESCE(%1.%2,0) " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; + m_where += TQString( "COALESCE(%1.%2,0) " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; else - m_where += TQString( "%1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; + m_where += TQString( "%1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; if ( !exact && (value & valName) && mode == modeNormal && i18n( "Unknown").contains( filter, false ) ) - m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += " ) "; @@ -7217,12 +7217,12 @@ QueryBuilder::excludeFilter( int tables, TQ_INT64 value, const TQString& filter, } if( coalesceField( tables, value ) ) - m_where += TQString( "COALESCE(%1.%2,0) " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; + m_where += TQString( "COALESCE(%1.%2,0) " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; else - m_where += TQString( "%1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; + m_where += TQString( "%1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; if ( !exact && (value & valName) && mode == modeNormal && i18n( "Unknown").contains( filter, false ) ) - m_where += TQString( "AND %1.%2 <> '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( "AND %1.%2 <> '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += " ) "; @@ -7283,27 +7283,27 @@ QueryBuilder::addMatch( int tables, TQ_INT64 value, const TQString& match, bool //which is automatially appended if m_showAll = false m_showAll = true; m_where += TQString( "OR %1.%2 " ) - .tqarg( tableName( tables ) ) - .tqarg( valueName( value ) ); + .arg( tableName( tables ) ) + .arg( valueName( value ) ); m_where += caseSensitive ? CollectionDB::exactCondition( rpath ) : CollectionDB::likeCondition( rpath ); - m_where += TQString( " AND %1.deviceid = %2 " ).tqarg( tableName( tables ) ).tqarg( deviceid ); + m_where += TQString( " AND %1.deviceid = %2 " ).arg( tableName( tables ) ).arg( deviceid ); if ( deviceid != -1 ) { //handle corner case TQString rpath2( '.' + match ); - m_where += TQString( " OR %1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( " OR %1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += caseSensitive ? CollectionDB::exactCondition( rpath2 ) : CollectionDB::likeCondition( rpath2 ); - m_where += TQString( " AND %1.deviceid = -1 " ).tqarg( tableName( tables ) ); + m_where += TQString( " AND %1.deviceid = -1 " ).arg( tableName( tables ) ); } } else { - m_where += TQString( "OR %1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( "OR %1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += caseSensitive ? CollectionDB::exactCondition( match ) : CollectionDB::likeCondition( match ); } if ( ( value & valName ) && interpretUnknown && match == i18n( "Unknown" ) ) - m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += " ) "; @@ -7442,8 +7442,8 @@ QueryBuilder::setOptions( int options ) if ( options & optNoCompilations || options & optOnlyCompilations ) m_linkTables |= tabSong; - if ( options & optNoCompilations ) m_where += TQString("AND tags.sampler = %1 ").tqarg(CollectionDB::instance()->boolF()); - if ( options & optOnlyCompilations ) m_where += TQString("AND tags.sampler = %1 ").tqarg(CollectionDB::instance()->boolT()); + if ( options & optNoCompilations ) m_where += TQString("AND tags.sampler = %1 ").arg(CollectionDB::instance()->boolF()); + if ( options & optOnlyCompilations ) m_where += TQString("AND tags.sampler = %1 ").arg(CollectionDB::instance()->boolT()); if (CollectionDB::instance()->getType() == DbConnection::postgresql && options & optRemoveDuplicates && options & optRandomize) { @@ -7617,7 +7617,7 @@ QueryBuilder::having( int table, TQ_INT64 value, int function, int mode, const T void QueryBuilder::setLimit( int startPos, int length ) { - m_limit = TQString( " LIMIT %2 OFFSET %1 " ).tqarg( startPos ).tqarg( length ); + m_limit = TQString( " LIMIT %2 OFFSET %1 " ).arg( startPos ).arg( length ); } void @@ -7645,9 +7645,9 @@ QueryBuilder::shuffle( int table, TQ_INT64 value ) // non-zero), and finally POWER(...) is used instead of 1-POWER(...) because it // only changes the order type. m_sort += TQString("POWER( %1, 1.0 / (%2.%3 + 1) ) DESC") - .tqarg( CollectionDB::instance()->randomFunc() ) - .tqarg( tableName( table ) ) - .tqarg( valueName( value ) ); + .arg( CollectionDB::instance()->randomFunc() ) + .arg( tableName( table ) ) + .arg( valueName( value ) ); m_linkTables |= table; } @@ -7829,9 +7829,9 @@ QueryBuilder::sortByFavoriteAvg() { m_having += " ("; if (AmarokConfig::useRatings() ) m_having += TQString("%1(%2.%3) > 0 OR ") - .tqarg( functionName( funcAvg ), tableName(tabStats), valueName(valRating) ); + .arg( functionName( funcAvg ), tableName(tabStats), valueName(valRating) ); m_having += TQString("%1(%2.%3) > 0") - .tqarg( functionName( funcAvg ), tableName(tabStats), valueName(valPlayCounter) ); + .arg( functionName( funcAvg ), tableName(tabStats), valueName(valPlayCounter) ); m_having += ")"; } diff --git a/amarok/src/collectiondb.h b/amarok/src/collectiondb.h index 9b94ad00..a581db88 100644 --- a/amarok/src/collectiondb.h +++ b/amarok/src/collectiondb.h @@ -257,13 +257,13 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver inline bool boolFromSql( const TQString &b ) { return ( b == boolT() || b == "t" ); } //textColumnType should be used for normal strings, which need to be compared //either case-sensitively or -insensitively - TQString textColumnType( int length=255 ) const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return TQString("VARCHAR(%1)").tqarg(length); } + TQString textColumnType( int length=255 ) const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return TQString("VARCHAR(%1)").arg(length); } //exactTextColumnType should be used for strings that must be stored exactly, such //as URLs (necessary for holding control chars etc. if present in URL), except for //trailing spaces. Comparisions should always be done case-sensitively. //As we create indices on these columns, we have to restrict them to //<= 255 chars for mysql < 5.0.3 - TQString exactTextColumnType( int length=1024 ) const { if ( getDbConnectionType() == DbConnection::mysql ) return TQString( "VARBINARY(%1)" ).tqarg( length>255 ? 255 : length ); else return textColumnType( length ); } + TQString exactTextColumnType( int length=1024 ) const { if ( getDbConnectionType() == DbConnection::mysql ) return TQString( "VARBINARY(%1)" ).arg( length>255 ? 255 : length ); else return textColumnType( length ); } // We might consider using LONGTEXT type, as some lyrics could be VERY long..??? TQString longTextColumnType() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return "TEXT"; } TQString randomFunc() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "random()"; else return "RAND()"; } diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp index 68c8db60..6472c4b0 100644 --- a/amarok/src/configdialog.cpp +++ b/amarok/src/configdialog.cpp @@ -40,14 +40,14 @@ email : markey@web.de #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqmessagebox.h> #include <tqobjectlist.h> #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqspinbox.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqtooltip.h> #include <tqvbox.h> @@ -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" ) ); @@ -264,7 +264,7 @@ void AmarokConfigDialog::updateSettings() { #ifdef TQ_WS_X11 OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( TQT_TQWIDGET(child( "osdpreview" )) ); - AmarokConfig::setOsdAlignment( osd->tqalignment() ); + AmarokConfig::setOsdAlignment( osd->alignment() ); AmarokConfig::setOsdYOffset( osd->y() ); Amarok::OSD::instance()->applySettings(); #endif @@ -357,8 +357,8 @@ bool AmarokConfigDialog::hasChanged() return m_soundSystem->currentText() != m_pluginAmarokName[AmarokConfig::soundSystem()] || #ifdef TQ_WS_X11 - osd->tqalignment() != AmarokConfig::osdAlignment() || - osd->tqalignment() != OSDWidget::Center && osd->y() != AmarokConfig::osdYOffset() || + osd->alignment() != AmarokConfig::osdAlignment() || + osd->alignment() != OSDWidget::Center && osd->y() != AmarokConfig::osdYOffset() || #endif m_opt2->styleComboBox->currentText() != AmarokConfig::contextBrowserStyleSheet() || Amarok::databaseTypeCode( m_opt7->dbSetupFrame->databaseEngine->currentText() ) != AmarokConfig::databaseEngine().toInt() || @@ -385,7 +385,7 @@ bool AmarokConfigDialog::isDefault() void AmarokConfigDialog::aboutEngine() //SLOT { - PluginManager::showAbout( TQString( "Name == '%1'" ).tqarg( m_soundSystem->currentText() ) ); + PluginManager::showAbout( TQString( "Name == '%1'" ).arg( m_soundSystem->currentText() ) ); } @@ -407,7 +407,7 @@ void AmarokConfigDialog::soundSystemChanged() m_engineConfig = EngineController::engine()->configure(); m_engineConfig->view()->reparent( m_engineConfigFrame, TQPoint() ); m_engineConfig->view()->show(); - m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).tqarg( m_soundSystem->currentText() ) ); + m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).arg( m_soundSystem->currentText() ) ); m_engineConfigFrame->show(); connect( m_engineConfig, TQT_SIGNAL(viewChanged()), TQT_SLOT(updateButtons()) ); diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp index 6e4e9109..c35f8eaa 100644 --- a/amarok/src/contextbrowser.cpp +++ b/amarok/src/contextbrowser.cpp @@ -43,10 +43,10 @@ #include <tqdom.h> #include <tqimage.h> #include <tqregexp.h> -#include <tqtextstream.h> // External CSS reading +#include <textstream.h> // External CSS reading #include <tqvbox.h> //wiki tab #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlistview.h> #include <tqtimer.h> @@ -91,13 +91,13 @@ 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 const KCalendarSystem *cal = KGlobal::locale()->calendar(); const TQDate date = datetime.date(); - return i18n( "monthname year", "%1 %2" ).tqarg( cal->monthName(date), cal->yearString(date, false) ); + return i18n( "monthname year", "%1 %2" ).arg( cal->monthName(date), cal->yearString(date, false) ); } //TODO "last week" = maybe within 7 days, but prolly before last sunday @@ -175,7 +175,7 @@ static TQString albumImageTooltip( const TQString &albumImage, int size ) { if ( albumImage == CollectionDB::instance()->notAvailCover( false, size ) ) - return escapeHTMLAttr( i18n( "Click to fetch cover from amazon.%1, right-click for menu." ).tqarg( CoverManager::amazonTld() ) ); + return escapeHTMLAttr( i18n( "Click to fetch cover from amazon.%1, right-click for menu." ).arg( CoverManager::amazonTld() ) ); return escapeHTMLAttr( i18n( "Click for information from Amazon, right-click for menu." ) ); } @@ -497,7 +497,7 @@ void ContextBrowser::openURLRequest( const KURL &url ) else if ( url.protocol() == "musicbrainz" ) { const TQString url = "http://www.musicbrainz.org/taglookup.html?artist=%1&album=%2&track=%3"; - Amarok::invokeBrowser( url.tqarg( KURL::encode_string_no_slash( artist, 106 /*utf-8*/ ), + Amarok::invokeBrowser( url.arg( KURL::encode_string_no_slash( artist, 106 /*utf-8*/ ), KURL::encode_string_no_slash( album, 106 /*utf-8*/ ), KURL::encode_string_no_slash( track, 106 /*utf-8*/ ) ) ); } @@ -547,7 +547,7 @@ void ContextBrowser::openURLRequest( const KURL &url ) else if( url.protocol() == "ggartist" ) { const TQString url2 = TQString( "http://www.google.com/musicsearch?q=%1&res=artist" ) - .tqarg( KURL::encode_string_no_slash( unescapeHTMLAttr( url.path() ).replace( " ", "+" ), 106 /*utf-8*/ ) ); + .arg( KURL::encode_string_no_slash( unescapeHTMLAttr( url.path() ).replace( " ", "+" ), 106 /*utf-8*/ ) ); Amarok::invokeBrowser( url2 ); } @@ -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( '"' ); @@ -802,7 +802,7 @@ void ContextBrowser::saveHtmlData() .replace( "<html>", TQString( "<html><head><style type=\"text/css\">" "%1</style></head>" ) - .tqarg( HTMLView::loadStyleSheet() ) ); // and the + .arg( HTMLView::loadStyleSheet() ) ); // and the // stylesheet // code exportedDocument.close(); @@ -1243,7 +1243,7 @@ void ContextBrowser::showCurrentTrack() //SLOT debug() << "current browser is not context, aborting showCurrentTrack()" << endl; m_dirtyCurrentTrackPage = true; m_currentTrackPage->set( TQString( "<html><body><div class='box-body'>%1</div></body></html>" ) - .tqarg( i18n( "Updating..." ) ) ); + .arg( i18n( "Updating..." ) ) ); return; } #endif @@ -1492,7 +1492,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h << albumValues[6] << reqResult[ i + 1 ] //album.id << escapeHTMLAttr( discNumber ) - << i18n( "Disc %1" ).tqarg( discNumber ) ) ); + << i18n( "Disc %1" ).arg( discNumber ) ) ); } TQString track = albumValues[j + 2].stripWhiteSpace(); if( track.length() > 0 ) @@ -1576,7 +1576,7 @@ CurrentTrackJob::showHomeByAlbums() date = ep.dateTime().toString(); TQString image = CollectionDB::instance()->podcastImage( pcb.imageURL().url(), true, 50 ); - TQString imageAttr = escapeHTMLAttr( i18n( "Click to go to podcast website: %1." ).tqarg( pcb.link().prettyURL() ) ); + TQString imageAttr = escapeHTMLAttr( i18n( "Click to go to podcast website: %1." ).arg( pcb.link().prettyURL() ) ); m_HTMLSource.append( QStringx ( "<tr class='" + TQString( (i % 2) ? "box-row-alt" : "box-row" ) + "'>\n" @@ -1615,7 +1615,7 @@ CurrentTrackJob::showHomeByAlbums() ) ); - m_HTMLSource.append( QStringx ( "<p>%1</p>\n" ).tqarg( ep.description() ) ); + m_HTMLSource.append( QStringx ( "<p>%1</p>\n" ).arg( ep.description() ) ); m_HTMLSource.append( "</div>\n" @@ -1929,7 +1929,7 @@ void CurrentTrackJob::addMetaHistory() for ( uint i = 0; i < m_metadataHistory.count(); ++i ) { const TQString &str = m_metadataHistory[i]; - m_HTMLSource.append( QStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).tqarg( str ) ); + m_HTMLSource.append( QStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).arg( str ) ); } m_HTMLSource.append( @@ -1959,7 +1959,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) image = CollectionDB::instance()->notAvailCover( true ); TQString imageAttr = escapeHTMLAttr( pcb.link().isValid() - ? i18n( "Click to go to podcast website: %1." ).tqarg( pcb.link().prettyURL() ) + ? i18n( "Click to go to podcast website: %1." ).arg( pcb.link().prettyURL() ) : i18n( "No podcast website." ) ); @@ -1994,7 +1994,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) << imageAttr << escapeHTML( peb.author().isEmpty() ? i18n( "Podcast" ) - : i18n( "Podcast by %1" ).tqarg( peb.author() ) ) + : i18n( "Podcast by %1" ).arg( peb.author() ) ) << ( peb.localUrl().isValid() ? "<br />\n" + escapeHTML( i18n( "(Cached)" ) ) : "" ) @@ -2011,7 +2011,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) for ( uint i = 0; i < m_metadataHistory.count(); ++i ) { const TQString &str = m_metadataHistory[i]; - m_HTMLSource.append( QStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).tqarg( str ) ); + m_HTMLSource.append( QStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).arg( str ) ); } m_HTMLSource.append( @@ -2024,7 +2024,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) "<div id='albums_box-header' class='box-header'>\n" "<span id='albums_box-header-title' class='box-header-title'>\n" + ( channelInDB - ? i18n( "Episodes from %1" ).tqarg( escapeHTML( pcb.title() ) ) + ? i18n( "Episodes from %1" ).arg( escapeHTML( pcb.title() ) ) : i18n( "Episodes from this Channel" ) ) + "</span>\n" @@ -2072,7 +2072,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) ) ); - m_HTMLSource.append( QStringx ( "<p>%1</p>\n" ).tqarg( ep.description() ) ); + m_HTMLSource.append( QStringx ( "<p>%1</p>\n" ).arg( ep.description() ) ); m_HTMLSource.append( "</div>\n" @@ -2106,9 +2106,9 @@ void CurrentTrackJob::showBrowseArtistHeader( const TQString &artist ) "<td><div id='current_box-header-nav' class='box-header-nav'>%3</div></td>\n" "</tr></table>\n" "</div>\n" ) - .tqarg( escapeHTML( artist ) ) - .tqarg( escapeHTML( i18n( "Browse Artist" ) ) ) - .tqarg( back ) ); + .arg( escapeHTML( artist ) ) + .arg( escapeHTML( i18n( "Browse Artist" ) ) ) + .arg( back ) ); m_HTMLSource.append( "<table id='current_box-table' class='box-body' width='100%' cellpadding='0' cellspacing='0'>\n" ); @@ -2126,16 +2126,16 @@ void CurrentTrackJob::showBrowseArtistHeader( const TQString &artist ) m_HTMLSource.append( "<tr>\n" "<td id='artist-wikipedia'>\n" - + TQString( "<a id='artist-wikipedia-a' href='wikipedia:%1'>\n" ).tqarg( escapeHTMLAttr( artist + b->wikiArtistPostfix() ) ) - + i18n( "Wikipedia Information for %1" ).tqarg( escapeHTML( artist ) ) + + + TQString( "<a id='artist-wikipedia-a' href='wikipedia:%1'>\n" ).arg( escapeHTMLAttr( artist + b->wikiArtistPostfix() ) ) + + i18n( "Wikipedia Information for %1" ).arg( escapeHTML( artist ) ) + "</a>\n" "</td>\n" "</tr>\n"); m_HTMLSource.append( "<tr>\n" "<td id='artist-google'>\n" - + TQString( "<a id='artist-google-a' href='ggartist:%1'>\n" ).tqarg( escapeHTMLAttr( artist ) ) - + i18n( "Google Musicsearch for %1" ).tqarg( escapeHTML( artist ) ) + + + TQString( "<a id='artist-google-a' href='ggartist:%1'>\n" ).arg( escapeHTMLAttr( artist ) ) + + i18n( "Google Musicsearch for %1" ).arg( escapeHTML( artist ) ) + "</a>\n" "</td>\n" "</tr>\n" @@ -2170,9 +2170,9 @@ CurrentTrackJob::showBrowseLabelHeader( const TQString &label ) "<td><div id='current_box-header-nav' class='box-header-nav'>%3</div></td>\n" "</tr></table>\n" "</div>\n" ) - .tqarg( escapeHTML( label ) ) - .tqarg( escapeHTML( i18n( "Browse Label" ) ) ) - .tqarg( back ) ); + .arg( escapeHTML( label ) ) + .arg( escapeHTML( i18n( "Browse Label" ) ) ) + .arg( back ) ); m_HTMLSource.append( "<table id='current_box-table' class='box-body' width='100%' cellpadding='0' cellspacing='0'>\n" ); @@ -2190,8 +2190,8 @@ CurrentTrackJob::showBrowseLabelHeader( const TQString &label ) m_HTMLSource.append( "<tr>\n" "<td id='label-lastfm'>\n" - + TQString( "<a id='label-lastfm-a' href='externalurl://www.last.fm/tag/%1'>\n" ).tqarg( escapeHTMLAttr( label ) ) - + i18n( "Last.fm Information for %1" ).tqarg( escapeHTML( label ) ) + + + TQString( "<a id='label-lastfm-a' href='externalurl://www.last.fm/tag/%1'>\n" ).arg( escapeHTMLAttr( label ) ) + + i18n( "Last.fm Information for %1" ).arg( escapeHTML( label ) ) + "</a>\n" "</td>\n" "</tr>\n"); @@ -2281,11 +2281,11 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle ¤tTrack ) "</td>\n" "<td id='current_box-information-td' align='right'>\n" ) - .tqarg( escapeHTML( currentTrack.prettyTitle() ) ) - .tqarg( escapeHTMLAttr( currentTrack.artist() ) ) - .tqarg( escapeHTMLAttr( currentTrack.album() ) ) - .tqarg( escapeHTMLAttr( albumImage ) ) - .tqarg( albumImageTitleAttr ) + .arg( escapeHTML( currentTrack.prettyTitle() ) ) + .arg( escapeHTMLAttr( currentTrack.artist() ) ) + .arg( escapeHTMLAttr( currentTrack.album() ) ) + .arg( escapeHTMLAttr( albumImage ) ) + .arg( albumImageTitleAttr ) ) ); if ( !values.isEmpty() && values[2].toInt() ) @@ -2299,18 +2299,18 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle ¤tTrack ) const uint score = static_cast<uint>( values[3].toFloat() ); const uint rating = values[4].toInt(); - //SAFE = .tqarg( x, y ) - //UNSAFE = .tqarg( x ).tqarg( y ) + //SAFE = .arg( x, y ) + //UNSAFE = .arg( x ).arg( y ) m_HTMLSource.append( TQString( "<span>%1</span><br />\n" "<div>%2</div>\n" "<span>%3</span><br />\n" "<span>%4</span>\n" ) - .tqarg( i18n( "Track played once", "Track played %n times", playtimes ), + .arg( i18n( "Track played once", "Track played %n times", playtimes ), statsHTML( score, rating, false ), - i18n( "Last played: %1" ).tqarg( Amarok::verboseTimeSince( lastPlay ) ), - i18n( "First played: %1" ).tqarg( Amarok::verboseTimeSince( firstPlay ) ) ) ); + i18n( "Last played: %1" ).arg( Amarok::verboseTimeSince( lastPlay ) ), + i18n( "First played: %1" ).arg( Amarok::verboseTimeSince( firstPlay ) ) ) ); } else m_HTMLSource.append( i18n( "Never played before" ) ); @@ -2391,7 +2391,7 @@ void CurrentTrackJob::showRelatedArtists( const TQString &artist, const TQString "<span id='related_box-header-title' class='box-header-title'>%1</span>\n" "</div>\n" "<table class='box-body' id='T_RA' width='100%' border='0' cellspacing='0' cellpadding='1'>\n" ) - .tqarg( i18n( "Artists Related to %1" ).tqarg( escapeHTML( artist ) ) ) ); + .arg( i18n( "Artists Related to %1" ).arg( escapeHTML( artist ) ) ) ); m_HTMLSource.append( "<tr><td>\n" ); for ( uint i = 0; i < relArtists.count(); i += 1 ) { @@ -2492,7 +2492,7 @@ CurrentTrackJob::showSongsWithLabel( const TQString &label ) "<div id='suggested_box' class='box'>\n" "<div id='suggested_box-header' class='box-header' onClick=\"toggleBlock('T_SS'); window.location.href='togglebox:ss';\" style='cursor: pointer;'>\n" "<span id='suggested_box-header-title' class='box-header-title'>\n" - + i18n( "Songs with label %1" ).tqarg( label ) + + + i18n( "Songs with label %1" ).arg( label ) + "</span>\n" "</div>\n" "<table class='box-body' id='T_' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); @@ -2540,7 +2540,7 @@ CurrentTrackJob::showUserLabels( const MetaBundle ¤tTrack ) "<div id='songlabels_box' class='box'>\n" "<div id='songlabels-header' class='box-header' onCLick=\"toggleBlock('T_SL');window.location.href='togglebox:sl';\" style='cursor: pointer;'>\n" "<span id='songlabels_box-header-title' class='box-header-title'>\n" - + i18n( " Labels for %1 " ).tqarg( escapeHTML( title ) ) + + + i18n( " Labels for %1 " ).arg( escapeHTML( title ) ) + "</span>\n" "</div>\n" "<table class='box-body' id='T_SL' width='100%' border='0' cellspacing='0' cellpadding='1'>\n" ); @@ -2555,7 +2555,7 @@ CurrentTrackJob::showUserLabels( const MetaBundle ¤tTrack ) } } m_HTMLSource.append( "</td></tr>\n" ); - m_HTMLSource.append( "<tr><td><a id='songlabels_box_addlabel' href='show:editLabels'>" + i18n( "Add labels to %1" ).tqarg( escapeHTML( title ) ) + "</a></td></tr>\n" ); + m_HTMLSource.append( "<tr><td><a id='songlabels_box_addlabel' href='show:editLabels'>" + i18n( "Add labels to %1" ).arg( escapeHTML( title ) ) + "</a></td></tr>\n" ); m_HTMLSource.append( "</table>\n" "</div>\n" ); @@ -2588,7 +2588,7 @@ void CurrentTrackJob::showArtistsFaves( const TQString &artist, uint artist_id ) "<div id='favoritesby_box' class='box'>\n" "<div id='favoritesby-header' class='box-header' onClick=\"toggleBlock('T_FT'); window.location.href='togglebox:ft';\" style='cursor: pointer;'>\n" "<span id='favoritesby_box-header-title' class='box-header-title'>\n" - + i18n( "Favorite Tracks by %1" ).tqarg( artistName ) + + + i18n( "Favorite Tracks by %1" ).arg( artistName ) + "</span>\n" "</div>\n" "<table class='box-body' id='T_FT' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); @@ -2642,7 +2642,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id, "<div id='albums_box' class='box'>\n" "<div id='albums_box-header' class='box-header'>\n" "<span id='albums_box-header-title' class='box-header-title'>\n" - + i18n( "Albums by %1" ).tqarg( artistName ) + + + i18n( "Albums by %1" ).arg( artistName ) + "</span>\n" "</div>\n" "<table id='albums_box-body' class='box-body' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); @@ -2744,7 +2744,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id, << TQString::number( artist_id ) << values[ i + 1 ] //album.id << escapeHTMLAttr( discNumber ) - << i18n( "Disc %1" ).tqarg( discNumber ) ) ); + << i18n( "Disc %1" ).arg( discNumber ) ) ); } TQString track = albumValues[j + 2].stripWhiteSpace(); if( track.length() > 0 ) { @@ -2806,7 +2806,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti "<div id='albums_box' class='box'>\n" "<div id='albums_box-header' class='box-header'>\n" "<span id='albums_box-header-title' class='box-header-title'>\n" - + i18n( "Compilations with %1" ).tqarg( artistName ) + + + i18n( "Compilations with %1" ).arg( artistName ) + "</span>\n" "</div>\n" "<table id='albums_box-body' class='box-body' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); @@ -2904,7 +2904,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti .args( TQStringList() << values[ i + 1 ] //album.id << escapeHTMLAttr( discNumber ) - << i18n( "Disc %1" ).tqarg( discNumber ) ) ); + << i18n( "Disc %1" ).arg( discNumber ) ) ); } TQString track = albumValues[j + 2].stripWhiteSpace(); @@ -2921,7 +2921,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti TQString tracktitle_formated; TQString tracktitle; - tracktitle = escapeHTML( i18n("%1 - %2").tqarg( albumValues[j + 5], albumValues[j] ) ); + tracktitle = escapeHTML( i18n("%1 - %2").arg( albumValues[j + 5], albumValues[j] ) ); tracktitle_formated = "<span class='album-song-title'>\n"; if( i==vectorPlace && albumValues[j + 2].toInt() == m_currentTrack.track() && discNumber.toInt() == m_currentTrack.discNumber() ) tracktitle_formated += "<i>\n"; @@ -2966,11 +2966,11 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st rating = 10; TQString table = TQString( "<table %1 align='right' border='0' cellspacing='0' cellpadding='0' width='100%'>%2</table>\n" ) - .tqarg( statsbox ? "class='statsBox'" : "" ); + .arg( statsbox ? "class='statsBox'" : "" ); TQString contents; if( AmarokConfig::useScores() ) - contents += TQString( "<tr title='%1'>\n" ).tqarg( i18n( "Score: %1" ).tqarg( score ) ) + + contents += TQString( "<tr title='%1'>\n" ).arg( i18n( "Score: %1" ).arg( score ) ) + "<td class='sbtext' width='100%' align='right'>\n" + TQString::number( score ) + "</td>\n" "<td align='left' width='1'>\n" "<div class='sbouter'>\n" @@ -2982,8 +2982,8 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st if( AmarokConfig::useRatings() ) { - contents += TQString( "<tr title='%1'>\n" ).tqarg( i18n( "Rating: %1" ) - .tqarg( MetaBundle::ratingDescription( rating ) ) ) + + contents += TQString( "<tr title='%1'>\n" ).arg( i18n( "Rating: %1" ) + .arg( MetaBundle::ratingDescription( rating ) ) ) + "<td class='ratingBox' align='right' colspan='2'>\n"; if( rating ) { @@ -3002,7 +3002,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st const TQString img = "<img src='%1' height='13px' class='ratingStar'></img>\n"; for( int i = 0, n = rating / 2; i < n; ++i ) - contents += img.tqarg( TQString("data:image/png;base64," + fullStar) ); + contents += img.arg( TQString("data:image/png;base64," + fullStar) ); if( rating % 2 ) { TQImageIO halfStarIO; @@ -3014,7 +3014,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st halfStarIO.write(); halfStarBuf.close(); TQCString halfStar = KCodecs::base64Encode( halfStarBuf.buffer(), true ); - contents += img.tqarg( TQString("data:image/png;base64," + halfStar) ); + contents += img.arg( TQString("data:image/png;base64," + halfStar) ); } contents += "</nobr>\n"; } @@ -3024,7 +3024,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st "</tr>\n"; } - return table.tqarg( contents ); + return table.arg( contents ); } bool CurrentTrackJob::doJob() @@ -3220,7 +3220,7 @@ ContextBrowser::getEncodedImage( const TQString &imageUrl ) tqApp->lock(); img.save( &buffer, "PNG" ); // writes image into ba in PNG format tqApp->unlock(); - const TQString coverImage = TQString( "data:image/png;base64,%1" ).tqarg( KCodecs::base64Encode( ba ).data() ); + const TQString coverImage = TQString( "data:image/png;base64,%1" ).arg( KCodecs::base64Encode( ba ).data() ); //debug() << "Encoded imageUrl: " << coverImage << endl; return coverImage; } @@ -3282,7 +3282,7 @@ void ContextBrowser::showLyrics( const TQString &url ) } m_lyricSearchUrl = TQString( "http://www.google.com/search?ie=UTF-8&q=lyrics+%1+%2" ) - .tqarg( KURL::encode_string_no_slash( '"' + artist + '"', 106 /*utf-8*/ ), + .arg( KURL::encode_string_no_slash( '"' + artist + '"', 106 /*utf-8*/ ), KURL::encode_string_no_slash( '"' + title + '"', 106 /*utf-8*/ ) ); m_lyricsToolBar->getButton( LYRICS_BROWSER )->setEnabled(false); @@ -3294,7 +3294,7 @@ void ContextBrowser::showLyrics( const TQString &url ) "<br /><div class='info'>\n"+ i18n( "Available Lyrics Scripts:" ) + "<br />\n"; foreach ( scripts ) { - lyrics += TQString( "<a href=\"runscript:%1\">%2</a><br />\n" ).tqarg( *it, *it ); + lyrics += TQString( "<a href=\"runscript:%1\">%2</a><br />\n" ).arg( *it, *it ); } lyrics += "<br />\n" + i18n( "Click on one of the scripts to run it, or use the Script Manager, to be able" " to see all the scripts, and download new ones from the Web." ); @@ -3425,12 +3425,12 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT const TQString artist = l.item( i ).toElement().attribute( "artist" ); const TQString title = l.item( i ).toElement().attribute( "title" ); - lyrics += "<a href='show:suggestLyric-" + url + "'>\n" + i18n("%1 - %2").tqarg( artist, title ); + lyrics += "<a href='show:suggestLyric-" + url + "'>\n" + i18n("%1 - %2").arg( artist, title ); lyrics += "</a><br/>\n"; } } lyrics += i18n( "<p>You can <a href=\"%1\">search for the lyrics</a> on the Web.</p>" ) - .tqarg( TQString( m_lyricSearchUrl ).replace( TQRegExp( "^http:" ), "externalurl:" ) ); + .arg( TQString( m_lyricSearchUrl ).replace( TQRegExp( "^http:" ), "externalurl:" ) ); } else { lyrics = el.text(); @@ -3444,7 +3444,7 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT lyrics.prepend( "<font size='2'><b>\n" + title + "</b><br/><u>\n" + artist+ "</font></u></font><br/>\n" ); if( !cached ) { - lyrics.append( "<br/><br/><i>\n" + i18n( "Powered by %1 (%2)" ).tqarg( site, site_url ) + "</i>\n" ); + lyrics.append( "<br/><br/><i>\n" + i18n( "Powered by %1 (%2)" ).arg( site, site_url ) + "</i>\n" ); CollectionDB::instance()->setLyrics( EngineController::instance()->bundle().url().path(), xmldoc, EngineController::instance()->bundle().uniqueId() ); } } @@ -3742,7 +3742,7 @@ ContextBrowser::wikiURL( const TQString &item ) // add any special characters to be replaced here TQString wStr = TQString(item).replace( "/", " " ); - return TQString( "http://%1.wikipedia.org/wiki/" ).tqarg( wikiLocale() ) + return TQString( "http://%1.wikipedia.org/wiki/" ).arg( wikiLocale() ) + KURL::encode_string_no_slash( wStr, 106 /*utf-8*/ ); } @@ -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 ) @@ -3815,7 +3815,7 @@ ContextBrowser::showLabelsDialog() showCurrentTrack(); } } - delete dialog; //deletes tqchildren + delete dialog; //deletes children m_addLabelEdit = 0; m_labelListView = 0; } diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp index 6212e418..13d11812 100644 --- a/amarok/src/coverfetcher.cpp +++ b/amarok/src/coverfetcher.cpp @@ -15,7 +15,7 @@ #include <tqdom.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqregexp.h> #include <kapplication.h> @@ -43,7 +43,7 @@ Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artis menu.insertTitle( i18n( "Cover Image" ) ); menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW ); - menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).tqarg( CoverManager::amazonTld() ), FETCH ); + menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).arg( CoverManager::amazonTld() ), FETCH ); menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM ); bool disable = !album.isEmpty(); // disable setting covers for unknown albums menu.setItemEnabled( FETCH, disable ); @@ -143,7 +143,7 @@ CoverFetcher::CoverFetcher( TQWidget *parent, const TQString &artist, TQString a //the others have the above strings removed with the following regex, as this can increase hit-rate const TQString template1 = " ?-? ?[(^{]* ?%1 ?\\d*[)^}\\]]* *$"; //eg album - [disk 1] -> album foreach( extensions ) { - TQRegExp regexp( template1.tqarg( *it ) ); + TQRegExp regexp( template1.arg( *it ) ); regexp.setCaseSensitive( false ); album.remove( regexp ); } @@ -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()) ); diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp index 1ea6a28d..76530133 100644 --- a/amarok/src/covermanager.cpp +++ b/amarok/src/covermanager.cpp @@ -20,10 +20,10 @@ #include <tqfontmetrics.h> //paintItem() #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> //used to delete all cover fetchers #include <tqpainter.h> //paintItem() -#include <tqpalette.h> //paintItem() +#include <palette.h> //paintItem() #include <tqpixmap.h> #include <tqpoint.h> #include <tqprogressdialog.h> @@ -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() ); @@ -276,10 +276,10 @@ CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album, { KWin::setType( winId(), NET::Utility ); kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n("%1 - %2").tqarg( artist, album ) ) ); + setCaption( kapp->makeStdCaption( i18n("%1 - %2").arg( artist, album ) ) ); - m_tqlayout = new TQHBoxLayout( this ); - m_tqlayout->setAutoAdd( true ); + m_layout = new TQHBoxLayout( this ); + m_layout->setAutoAdd( true ); m_pixmapViewer = new PixmapViewer( this, m_pixmap ); setFixedSize( m_pixmapViewer->maximalSize() ); @@ -396,7 +396,7 @@ void CoverManager::slotArtistSelected( TQListViewItem *item ) //SLOT //NOTE we MUST show the dialog, otherwise the closeEvents get processed // in the processEvents() calls below, GRUMBLE! TQt sux0rs progress.show(); - progress.tqrepaint( false ); //ensures the dialog isn't blank + progress.repaint( false ); //ensures the dialog isn't blank //this is an extra processEvent call for the sake of init() and aesthetics //it isn't necessary @@ -499,7 +499,7 @@ void CoverManager::showCoverMenu( TQIconViewItem *item, const TQPoint &p ) //SLO } else { menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW ); - menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).tqarg( CoverManager::amazonTld() ), FETCH ); + menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).arg( CoverManager::amazonTld() ), FETCH ); menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); menu.insertSeparator(); @@ -817,9 +817,9 @@ void CoverManager::updateStatusBar() if ( values.count() >= 2 ) { if( values[0].isEmpty() ) - text = i18n( "Fetching cover for %1..." ).tqarg( values[1] ); + text = i18n( "Fetching cover for %1..." ).arg( values[1] ); else - text = i18n( "Fetching cover for %1 - %2..." ).tqarg( values[0], values[1] ); + text = i18n( "Fetching cover for %1 - %2..." ).arg( values[0], values[1] ); } } else if( m_fetchingCovers ) { @@ -851,7 +851,7 @@ void CoverManager::updateStatusBar() } if( !m_filter.isEmpty() ) - text = i18n( "1 result for \"%1\"", "%n results for \"%1\"", totalCounter ).tqarg( m_filter ); + text = i18n( "1 result for \"%1\"", "%n results for \"%1\"", totalCounter ).arg( m_filter ); else if( m_artistView->selectedItem() ) { text = i18n( "1 album", "%n albums", totalCounter ); if( m_artistView->selectedItem() != m_artistView->firstChild() ) //showing albums by an artist @@ -864,7 +864,7 @@ void CoverManager::updateStatusBar() } if( missingCounter ) - text += i18n(" - ( <b>%1</b> without cover )" ).tqarg( missingCounter ); + text += i18n(" - ( <b>%1</b> without cover )" ).arg( missingCounter ); #ifdef AMAZON_SUPPORT m_fetchButton->setEnabled( missingCounter ); @@ -912,7 +912,7 @@ TQDragObject *CoverView::dragObject() return 0; const TQString sql = "SELECT tags.url FROM tags, album WHERE album.name %1 AND tags.album = album.id ORDER BY tags.track;"; - const TQStringList values = CollectionDB::instance()->query( sql.tqarg( CollectionDB::likeCondition( item->album() ) ) ); + const TQStringList values = CollectionDB::instance()->query( sql.arg( CollectionDB::likeCondition( item->album() ) ) ); KURL::List urls; for( TQStringList::ConstIterator it = values.begin(), end = values.end(); it != end; ++it ) @@ -939,8 +939,8 @@ void CoverView::setStatusText( TQIconViewItem *item ) //FIXME: Don't rely on other independent code, use an sql query if( item->artist().isEmpty() ) sampler = true; - TQString tipContent = i18n( "%1 - %2" ).tqarg( sampler ? i18n("Various Artists") : item->artist() ) - .tqarg( item->album() ); + TQString tipContent = i18n( "%1 - %2" ).arg( sampler ? i18n("Various Artists") : item->artist() ) + .arg( item->album() ); CoverManager::instance()->setStatusText( tipContent ); @@ -973,7 +973,7 @@ void CoverViewItem::loadCover() m_coverImagePath = CollectionDB::instance()->albumImage( m_artist, m_album, false, 1, &m_embedded ); m_coverPixmap = TQPixmap( m_coverImagePath ); //create the scaled cover - tqrepaint(); + repaint(); } @@ -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() ) diff --git a/amarok/src/covermanager.h b/amarok/src/covermanager.h index fc271c65..1c7680eb 100644 --- a/amarok/src/covermanager.h +++ b/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(); @@ -160,7 +160,7 @@ class CoverViewDialog : public TQDialog { CoverViewDialog(const TQString& artist, const TQString& album, TQWidget *parent); private: - TQHBoxLayout *m_tqlayout; + TQHBoxLayout *m_layout; TQPixmap m_pixmap; PixmapViewer *m_pixmapViewer; TQLabel *m_label; diff --git a/amarok/src/cuefile.cpp b/amarok/src/cuefile.cpp index f28788dc..cf109848 100644 --- a/amarok/src/cuefile.cpp +++ b/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) { diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp index f6fd7979..980a3dda 100644 --- a/amarok/src/database_refactor/collectiondb.cpp +++ b/amarok/src/database_refactor/collectiondb.cpp @@ -81,7 +81,7 @@ CollectionDB::CollectionDB() // Load DBEngine plugin TQString query = "[X-KDE-Amarok-plugintype] == 'dbengine' and [X-KDE-Amarok-name] != '%1'"; - KTrader::OfferList offers = PluginManager::query( query.tqarg( "sqlite-dbengine" ) ); + KTrader::OfferList offers = PluginManager::query( query.arg( "sqlite-dbengine" ) ); m_dbEngine = (DBEngine*) PluginManager::createFromService( offers.first() ); //<OPEN DATABASE> @@ -272,8 +272,8 @@ CollectionDB::createTables( DbConnection *conn ) "length INTEGER," "samplerate INTEGER," "sampler BOOL );" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ), conn ); TQString albumAutoIncrement = ""; TQString artistAutoIncrement = ""; @@ -302,59 +302,59 @@ CollectionDB::createTables( DbConnection *conn ) query( TQString( "CREATE %1 TABLE album%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( albumAutoIncrement ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ) + .arg( albumAutoIncrement ), conn ); //create artist table query( TQString( "CREATE %1 TABLE artist%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( artistAutoIncrement ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ) + .arg( artistAutoIncrement ), conn ); //create genre table query( TQString( "CREATE %1 TABLE genre%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() +");" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( genreAutoIncrement ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ) + .arg( genreAutoIncrement ), conn ); //create year table query( TQString( "CREATE %1 TABLE year%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( yearAutoIncrement ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ) + .arg( yearAutoIncrement ), conn ); //create images table query( TQString( "CREATE %1 TABLE images%2 (" "path " + textColumnType() + "," "artist " + textColumnType() + "," "album " + textColumnType() + ");" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ), conn ); // create directory statistics table query( TQString( "CREATE %1 TABLE directories%2 (" "dir " + textColumnType() + " UNITQUE," "changedate INTEGER );" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ), conn ); //create indexes query( TQString( "CREATE INDEX album_idx%1 ON album%2( name );" ) - .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); query( TQString( "CREATE INDEX artist_idx%1 ON artist%2( name );" ) - .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); query( TQString( "CREATE INDEX genre_idx%1 ON genre%2( name );" ) - .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); query( TQString( "CREATE INDEX year_idx%1 ON year%2( name );" ) - .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); if ( !conn ) { @@ -385,13 +385,13 @@ CollectionDB::dropTables( DbConnection *conn ) { DEBUG_FUNC_INFO - query( TQString( "DROP TABLE tags%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE album%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE artist%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE genre%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE year%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE images%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE directories%1;" ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE tags%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE album%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE artist%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE genre%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE year%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE images%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE directories%1;" ).arg( conn ? "_temp" : "" ), conn ); if ( !conn ) { query( TQString( "DROP TABLE related_artists;" ) ); @@ -421,16 +421,16 @@ CollectionDB::clearTables( DbConnection *conn ) clearCommand = "TRUNCATE TABLE"; } - query( TQString( "%1 tags%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 album%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 artist%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 genre%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 year%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 images%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 directories%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 tags%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 album%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 artist%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 genre%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 year%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 images%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 directories%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); if ( !conn ) { - query( TQString( "%1 related_artists;" ).tqarg( clearCommand ) ); + query( TQString( "%1 related_artists;" ).arg( clearCommand ) ); } } @@ -584,16 +584,16 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const TQStringList values = query( TQString( "SELECT id, name FROM %1 WHERE name LIKE '%2';" ) - .tqarg( name ) - .tqarg( CollectionDB::instance()->escapeString( value ) ), conn ); + .arg( name ) + .arg( CollectionDB::instance()->escapeString( value ) ), conn ); if ( updateSpelling && !values.isEmpty() && ( values[1] != value ) ) { query( TQString( "UPDATE %1 SET id = %2, name = '%3' WHERE id = %4;" ) - .tqarg( name ) - .tqarg( values.first() ) - .tqarg( CollectionDB::instance()->escapeString( value ) ) - .tqarg( values.first() ), conn ); + .arg( name ) + .arg( values.first() ) + .arg( CollectionDB::instance()->escapeString( value ) ) + .arg( values.first() ), conn ); } //check if item exists. if not, should we autocreate it? @@ -601,8 +601,8 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const if ( values.isEmpty() && autocreate ) { id = insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" ) - .tqarg( name ) - .tqarg( CollectionDB::instance()->escapeString( value ) ), name, conn ); + .arg( name ) + .arg( CollectionDB::instance()->escapeString( value ) ), name, conn ); return id; } @@ -617,8 +617,8 @@ CollectionDB::valueFromID( TQString table, uint id ) TQStringList values = query( TQString( "SELECT name FROM %1 WHERE id=%2;" ) - .tqarg( table ) - .tqarg( id ) ); + .arg( table ) + .arg( id ) ); return values.isEmpty() ? 0 : values.first(); @@ -631,8 +631,8 @@ CollectionDB::albumSongCount( const TQString &artist_id, const TQString &album_i TQStringList values = query( TQString( "SELECT COUNT( url ) FROM tags WHERE album = %1 AND artist = %2;" ) - .tqarg( album_id ) - .tqarg( artist_id ) ); + .arg( album_id ) + .arg( artist_id ) ); return values.first(); } @@ -642,8 +642,8 @@ CollectionDB::albumIsCompilation( const TQString &album_id ) TQStringList values = query( TQString( "SELECT sampler FROM tags WHERE sampler=%1 AND album=%2" ) - .tqarg( CollectionDB::instance()->boolT() ) - .tqarg( album_id ) ); + .arg( CollectionDB::instance()->boolT() ) + .arg( album_id ) ); return (values.count() != 0); } @@ -655,17 +655,17 @@ CollectionDB::albumTracks( const TQString &artist_id, const TQString &album_id ) return query( TQString( "SELECT tags.url, tags.track AS __discard FROM tags, year WHERE tags.album = %1 AND " "( tags.sampler = %2 OR tags.artist = %3 ) AND year.id = tags.year " "ORDER BY tags.track;" ) - .tqarg( album_id ) - .tqarg( boolT() ) - .tqarg( artist_id ) ); + .arg( album_id ) + .arg( boolT() ) + .arg( artist_id ) ); } else { return query( TQString( "SELECT tags.url FROM tags, year WHERE tags.album = %1 AND " "( tags.sampler = 1 OR tags.artist = %2 ) AND year.id = tags.year " "ORDER BY tags.track;" ) - .tqarg( album_id ) - .tqarg( artist_id ) ); + .arg( album_id ) + .arg( artist_id ) ); } } @@ -680,10 +680,10 @@ CollectionDB::addImageToAlbum( const TQString& image, TQValueList< TQPair<TQStri debug() << "Added image for album: " << (*it).first << " - " << (*it).second << ": " << image << endl; insert( TQString( "INSERT INTO images%1 ( path, artist, album ) VALUES ( '%1', '%2', '%3' );" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( escapeString( image ) ) - .tqarg( escapeString( (*it).first ) ) - .tqarg( escapeString( (*it).second ) ), NULL, conn ); + .arg( conn ? "_temp" : "" ) + .arg( escapeString( image ) ) + .arg( escapeString( (*it).first ) ) + .arg( escapeString( (*it).second ) ), NULL, conn ); } } @@ -879,8 +879,8 @@ CollectionDB::getImageForAlbum( const TQString& artist, const TQString& album, u TQStringList values = query( TQString( "SELECT path FROM images WHERE artist LIKE '%1' AND album LIKE '%2' ORDER BY path;" ) - .tqarg( escapeString( artist ) ) - .tqarg( escapeString( album ) ) ); + .arg( escapeString( artist ) ) + .arg( escapeString( album ) ) ); if ( !values.isEmpty() ) { @@ -1165,7 +1165,7 @@ CollectionDB::bundleForUrl( MetaBundle* bundle ) "FROM tags, album, artist, genre, year " "WHERE album.id = tags.album AND artist.id = tags.artist AND " "genre.id = tags.genre AND year.id = tags.year AND tags.url = '%1';" ) - .tqarg( escapeString( bundle->url().path() ) ) ); + .arg( escapeString( bundle->url().path() ) ) ); if ( !values.empty() ) fillInBundle( values, *bundle ); @@ -1260,10 +1260,10 @@ void CollectionDB::addAudioproperties( const MetaBundle& bundle ) { query( TQString( "UPDATE tags SET bitrate='%1', length='%2', samplerate='%3' WHERE url='%4';" ) - .tqarg( bundle.bitrate() ) - .tqarg( bundle.length() ) - .tqarg( bundle.sampleRate() ) - .tqarg( escapeString( bundle.url().path() ) ) ); + .arg( bundle.bitrate() ) + .arg( bundle.length() ) + .arg( bundle.sampleRate() ) + .arg( escapeString( bundle.url().path() ) ) ); } @@ -1275,7 +1275,7 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage ) query( TQString( "SELECT playcounter, createdate, percentage FROM statistics " "WHERE url = '%1';" ) - .tqarg( escapeString( url ) ) ); + .arg( escapeString( url ) ) ); // check boundaries if ( percentage > 100 ) percentage = 100; @@ -1288,19 +1288,19 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage ) if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { query( TQString( "UPDATE statistics SET percentage=%1, playcounter=%2+1 WHERE url='%3';" ) - .tqarg( score ) - .tqarg( values[0] + " + 1" ) - .tqarg( escapeString( url ) ) ); + .arg( score ) + .arg( values[0] + " + 1" ) + .arg( escapeString( url ) ) ); } else { query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " "VALUES ( '%1', %2, %3, %4, %5 );" ) - .tqarg( escapeString( url ) ) - .tqarg( values[1] ) - .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() ) - .tqarg( score ) - .tqarg( values[0] + " + 1" ) ); + .arg( escapeString( url ) ) + .arg( values[1] ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( score ) + .arg( values[0] + " + 1" ) ); } } else @@ -1310,10 +1310,10 @@ 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( score ), NULL ); + .arg( escapeString( url ) ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( score ), NULL ); } int iscore = getSongPercentage( url ); @@ -1326,7 +1326,7 @@ int CollectionDB::getSongPercentage( const TQString &url ) { TQStringList values = query( TQString( "SELECT round( percentage + 0.4 ) FROM statistics WHERE url = '%1';" ) - .tqarg( escapeString( url ) ) ); + .arg( escapeString( url ) ) ); if( values.count() ) return values.first().toInt(); @@ -1341,7 +1341,7 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage ) TQStringList values = query( TQString( "SELECT playcounter, createdate, accessdate FROM statistics WHERE url = '%1';" ) - .tqarg( escapeString( url ) ) ); + .arg( escapeString( url ) ) ); // check boundaries if ( percentage > 100 ) percentage = 100; @@ -1351,29 +1351,29 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage ) { if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { query( TQString( "UPDATE statistics SET percentage=%1 WHERE url='%2';" ) - .tqarg( percentage ) - .tqarg( escapeString( url ) ) ); + .arg( percentage ) + .arg( escapeString( url ) ) ); } else { // entry exists query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " "VALUES ( '%1', '%2', '%3', %4, %5 );" ) - .tqarg( escapeString( url ) ) - .tqarg( values[1] ) - .tqarg( values[2] ) - .tqarg( percentage ) - .tqarg( values[0] ) ); + .arg( escapeString( url ) ) + .arg( values[1] ) + .arg( values[2] ) + .arg( percentage ) + .arg( values[0] ) ); } } else { 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( percentage ), NULL ); + .arg( escapeString( url ) ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( percentage ), NULL ); } emit scoreChanged( url, percentage ); @@ -1388,16 +1388,16 @@ CollectionDB::updateDirStats( TQString path, const long datetime, DbConnection * if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { query( TQString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%3';") - .tqarg( conn ? "_temp" : "" ) - .tqarg( datetime ) - .tqarg( escapeString( path ) ), conn ); + .arg( conn ? "_temp" : "" ) + .arg( datetime ) + .arg( escapeString( path ) ), conn ); } else { query( TQString( "REPLACE INTO directories%1 ( dir, changedate ) VALUES ( '%3', %2 );" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( datetime ) - .tqarg( escapeString( path ) ), + .arg( conn ? "_temp" : "" ) + .arg( datetime ) + .arg( escapeString( path ) ), conn ); } } @@ -1410,7 +1410,7 @@ CollectionDB::removeSongsInDir( TQString path ) path = path.left( path.length() - 1 ); query( TQString( "DELETE FROM tags WHERE dir = '%1';" ) - .tqarg( escapeString( path ) ) ); + .arg( escapeString( path ) ) ); } @@ -1422,7 +1422,7 @@ CollectionDB::isDirInCollection( TQString path ) TQStringList values = query( TQString( "SELECT changedate FROM directories WHERE dir = '%1';" ) - .tqarg( escapeString( path ) ) ); + .arg( escapeString( path ) ) ); return !values.isEmpty(); } @@ -1433,7 +1433,7 @@ CollectionDB::isFileInCollection( const TQString &url ) { TQStringList values = query( TQString( "SELECT url FROM tags WHERE url = '%1';" ) - .tqarg( escapeString( url ) ) ); + .arg( escapeString( url ) ) ); return !values.isEmpty(); } @@ -1445,7 +1445,7 @@ CollectionDB::removeSongs( const KURL::List& urls ) for( KURL::List::ConstIterator it = urls.begin(), end = urls.end(); it != end; ++it ) { query( TQString( "DELETE FROM tags WHERE url = '%1';" ) - .tqarg( escapeString( (*it).path() ) ) ); + .arg( escapeString( (*it).path() ) ) ); } } @@ -1457,12 +1457,12 @@ CollectionDB::similarArtists( const TQString &artist, uint count ) if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' OFFSET 0 LIMIT %2;" ) - .tqarg( escapeString( artist ) ).tqarg( count ) ); + .arg( escapeString( artist ) ).arg( count ) ); } else { values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' LIMIT 0, %2;" ) - .tqarg( escapeString( artist ) ).tqarg( count ) ); + .arg( escapeString( artist ) ).arg( count ) ); } if ( values.isEmpty() ) @@ -1480,8 +1480,8 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary, DbC TQStringList dirs; albums = query( TQString( "SELECT DISTINCT album.name FROM tags_temp, album%1 AS album WHERE tags_temp.dir = '%2' AND album.id = tags_temp.album;" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( escapeString( path ) ), conn ); + .arg( temporary ? "_temp" : "" ) + .arg( escapeString( path ) ), conn ); for ( uint i = 0; i < albums.count(); i++ ) { @@ -1489,16 +1489,16 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary, DbC const uint album_id = albumID( albums[ i ], false, temporary, false, conn ); artists = query( TQString( "SELECT DISTINCT artist.name FROM tags_temp, artist%1 AS artist WHERE tags_temp.album = '%2' AND tags_temp.artist = artist.id;" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( album_id ), conn ); + .arg( temporary ? "_temp" : "" ) + .arg( album_id ), conn ); dirs = query( TQString( "SELECT DISTINCT dir FROM tags_temp WHERE album = '%1';" ) - .tqarg( album_id ), conn ); + .arg( album_id ), conn ); if ( artists.count() > dirs.count() ) { debug() << "Detected compilation: " << albums[ i ] << " - " << artists.count() << ":" << dirs.count() << endl; query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE album = '%2';" ) - .tqarg(boolT()).tqarg( album_id ), conn ); + .arg(boolT()).arg( album_id ), conn ); } } } @@ -1508,8 +1508,8 @@ void CollectionDB::setCompilation( const TQString &album, const bool enabled, const bool updateView ) { query( TQString( "UPDATE tags, album SET tags.sampler = %1 WHERE tags.album = album.id AND album.name = '%2';" ) - .tqarg( enabled ? "1" : "0" ) - .tqarg( escapeString( album ) ) ); + .arg( enabled ? "1" : "0" ) + .arg( escapeString( album ) ) ); // Update the Collection-Browser view, // using TQTimer to make sure we don't manipulate the GUI from a thread @@ -1525,7 +1525,7 @@ CollectionDB::removeDirFromCollection( TQString path ) path = path.left( path.length() - 1 ); query( TQString( "DELETE FROM directories WHERE dir = '%1';" ) - .tqarg( escapeString( path ) ) ); + .arg( escapeString( path ) ) ); } @@ -1755,13 +1755,13 @@ class SimilarArtistsInsertionJob : public ThreadWeaver::DependentJob { virtual bool doJob() { - CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).tqarg( escapedArtist ) ); + CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).arg( escapedArtist ) ); const TQString sql = "INSERT INTO related_artists ( artist, suggestion, changedate ) VALUES ( '%1', '%2', 0 );"; foreach( suggestions ) CollectionDB::instance()->insert( sql - .tqarg( escapedArtist ) - .tqarg( CollectionDB::instance()->escapeString( *it ) ), NULL ); + .arg( escapedArtist ) + .arg( CollectionDB::instance()->escapeString( *it ) ), NULL ); return true; } diff --git a/amarok/src/database_refactor/dbenginebase.cpp b/amarok/src/database_refactor/dbenginebase.cpp index 12900a26..ec3a34b5 100644 --- a/amarok/src/database_refactor/dbenginebase.cpp +++ b/amarok/src/database_refactor/dbenginebase.cpp @@ -216,10 +216,10 @@ QueryBuilder::addMatch( int tables, int value, const TQString& match ) if ( !match.isEmpty() ) { m_where += "AND ( true "; - m_where += TQString( "OR %1.%2 LIKE '" ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + escapeString( match ) + "' "; + m_where += TQString( "OR %1.%2 LIKE '" ).arg( tableName( tables ) ).arg( valueName( value ) ) + escapeString( match ) + "' "; if ( ( value & valName ) && match == i18n( "Unknown" ) ) - m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += " ) "; } @@ -410,7 +410,7 @@ QueryBuilder::groupBy( int table, int value ) void QueryBuilder::setLimit( int startPos, int length ) { - m_limit = TQString( " LIMIT %1, %2 " ).tqarg( startPos ).tqarg( length ); + m_limit = TQString( " LIMIT %1, %2 " ).arg( startPos ).arg( length ); } diff --git a/amarok/src/dbsetup.ui b/amarok/src/dbsetup.ui index 6625649b..f8186c08 100644 --- a/amarok/src/dbsetup.ui +++ b/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> @@ -164,7 +164,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -343,7 +343,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp index b57ba895..49e1d4b0 100644 --- a/amarok/src/deletedialog.cpp +++ b/amarok/src/deletedialog.cpp @@ -25,7 +25,7 @@ #include <tqstringlist.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqtimer.h> #include <tqvbox.h> diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui index 7ca52143..bd4e2a5c 100644 --- a/amarok/src/deletedialogbase.ui +++ b/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> @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -51,7 +51,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -64,7 +64,7 @@ <property name="text"> <string>Deletion method placeholder, never shown to user.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -93,7 +93,7 @@ <property name="text"> <string>Placeholder for number of files, not in GUI</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/amarok/src/device/massstorage/massstoragedevicehandler.cpp b/amarok/src/device/massstorage/massstoragedevicehandler.cpp index a8475796..57b0c3d4 100644 --- a/amarok/src/device/massstorage/massstoragedevicehandler.cpp +++ b/amarok/src/device/massstorage/massstoragedevicehandler.cpp @@ -126,20 +126,20 @@ DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const Medium * m { TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " "FROM devices WHERE type = 'uuid' " - "AND uuid = '%1';" ).tqarg( m->id() ) ); + "AND uuid = '%1';" ).arg( m->id() ) ); if ( ids.size() == 3 ) { debug() << "Found existing UUID config for ID " << ids[0] << " , uuid " << m->id() << endl; CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " - "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) ); + "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) ); return new MassStorageDeviceHandler( ids[0].toInt(), m->mountPoint(), m->id() ); } else { int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices( type, uuid, lastmountpoint ) " "VALUES ( 'uuid', '%1', '%2' );" ) - .tqarg( m->id() ) - .tqarg( m->mountPoint() ), "devices" ); + .arg( m->id() ) + .arg( m->mountPoint() ), "devices" ); if ( id == 0 ) { warning() << "Inserting into devices failed for type=uuid, uuid=" << m->id() << endl; diff --git a/amarok/src/device/nfs/nfsdevicehandler.cpp b/amarok/src/device/nfs/nfsdevicehandler.cpp index ac7a3de3..ac831d7d 100644 --- a/amarok/src/device/nfs/nfsdevicehandler.cpp +++ b/amarok/src/device/nfs/nfsdevicehandler.cpp @@ -135,13 +135,13 @@ NfsDeviceHandlerFactory::createHandler( const Medium * m ) const TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " "FROM devices WHERE type = 'nfs' " "AND servername = '%1' AND sharename = '%2';" ) - .tqarg( server ) - .tqarg( share ) ); + .arg( server ) + .arg( share ) ); if ( ids.size() == 3 ) { debug() << "Found existing NFS config for ID " << ids[0] << " , server " << server << " ,share " << share << endl; CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " - "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) ); + "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) ); return new NfsDeviceHandler( ids[0].toInt(), server, share, m->mountPoint() ); } else @@ -149,9 +149,9 @@ NfsDeviceHandlerFactory::createHandler( const Medium * m ) const int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices" "( type, servername, sharename, lastmountpoint ) " "VALUES ( 'nfs', '%1', '%2', '%3' );" ) - .tqarg( server ) - .tqarg( share ) - .tqarg( m->mountPoint() ), "devices" ); + .arg( server ) + .arg( share ) + .arg( m->mountPoint() ), "devices" ); if ( id == 0 ) { warning() << "Inserting into devices failed for type=nfs, server=" << server << ", share=" << share << endl; diff --git a/amarok/src/device/smb/smbdevicehandler.cpp b/amarok/src/device/smb/smbdevicehandler.cpp index 072c36a8..de5e7cbb 100644 --- a/amarok/src/device/smb/smbdevicehandler.cpp +++ b/amarok/src/device/smb/smbdevicehandler.cpp @@ -137,13 +137,13 @@ SmbDeviceHandlerFactory::createHandler( const Medium * m ) const TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " "FROM devices WHERE type = 'smb' " "AND servername = '%1' AND sharename = '%2';" ) - .tqarg( server ) - .tqarg( share ) ); + .arg( server ) + .arg( share ) ); if ( ids.size() == 3 ) { debug() << "Found existing SMB config for ID " << ids[0] << " , server " << server << " ,share " << share << endl; CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " - "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) ); + "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) ); return new SmbDeviceHandler( ids[0].toInt(), server, share, m->mountPoint() ); } else @@ -151,9 +151,9 @@ SmbDeviceHandlerFactory::createHandler( const Medium * m ) const int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices" "( type, servername, sharename, lastmountpoint ) " "VALUES ( 'smb', '%1', '%2', '%3' );" ) - .tqarg( server ) - .tqarg( share ) - .tqarg( m->mountPoint() ), "devices" ); + .arg( server ) + .arg( share ) + .arg( m->mountPoint() ), "devices" ); if ( id == 0 ) { warning() << "Inserting into devices failed for type=smb, server=" << server << ", share=" << share << endl; diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp index 91c4641c..78cf15d3 100644 --- a/amarok/src/directorylist.cpp +++ b/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(); @@ -212,8 +212,8 @@ Item::stateChange( bool b ) } } else { - //Deselect item and recurse through tqchildren but only deselect tqchildren if they - //do not exist unless we are in recursive mode (where no tqchildren should be + //Deselect item and recurse through children but only deselect children if they + //do not exist unless we are in recursive mode (where no children should be //selected if the parent is being unselected) //Note this does not do anything to the checkboxes, but they should be doing //the same thing as we are (hopefully) @@ -258,7 +258,7 @@ Item::newItems( const KFileItemList &list ) //SLOT for( KFileItemListIterator it( list ); *it; ++it ) { //Fully disable (always appears off and grayed-out) if it is "/proc", "/sys" or - //"/dev" or one of their tqchildren. This is because we will never scan them, so we + //"/dev" or one of their children. This is because we will never scan them, so we //might as well show that. //These match up with the skipped dirs in CollectionScanner::readDir. bool fully_disable=false; @@ -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,13 +303,13 @@ 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 ); } - TQCheckListItem::paintCell( p, isDisabled() ? listView()->tqpalette().disabled() : _cg, column, width, align ); + TQCheckListItem::paintCell( p, isDisabled() ? listView()->palette().disabled() : _cg, column, width, align ); p->setFont( f ); } diff --git a/amarok/src/directorylist.h b/amarok/src/directorylist.h index 0065f04f..8125557a 100644 --- a/amarok/src/directorylist.h +++ b/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); } @@ -88,7 +88,7 @@ public: public slots: void newItems( const KFileItemList& ); - void completed() { if( childCount() == 0 ) { setExpandable( false ); tqrepaint(); } } + void completed() { if( childCount() == 0 ) { setExpandable( false ); repaint(); } } private: KDirLister m_lister; diff --git a/amarok/src/dynamicmode.cpp b/amarok/src/dynamicmode.cpp index 6695a273..1bc8aa7b 100644 --- a/amarok/src/dynamicmode.cpp +++ b/amarok/src/dynamicmode.cpp @@ -274,8 +274,8 @@ DEBUG_BLOCK { TQRegExp limit( "(LIMIT.*)?;$" ); sql.replace( limit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;") - .tqarg( CollectionDB::instance()->randomFunc() ) - .tqarg( songCount ) ); + .arg( CollectionDB::instance()->randomFunc() ) + .arg( songCount ) ); } else { @@ -309,8 +309,8 @@ DEBUG_BLOCK TQRegExp orderLimit( "(ORDER BY.*)?;$" ); sql.replace( orderLimit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;") - .tqarg( CollectionDB::instance()->randomFunc() ) - .tqarg( songCount ) ); + .arg( CollectionDB::instance()->randomFunc() ) + .arg( songCount ) ); } else // time ordered criteria, only mess with the limits { @@ -324,11 +324,11 @@ DEBUG_BLOCK if( findLocation == -1 ) // there is no limit { TQRegExp queryEnd( ";$" ); // find the end of the query an add a limit - sql.replace( queryEnd, TQString(" LIMIT %1 OFFSET %2;" ).tqarg( songCount*5 ).tqarg( offset ) ); + sql.replace( queryEnd, TQString(" LIMIT %1 OFFSET %2;" ).arg( songCount*5 ).arg( offset ) ); useDirect = false; } else // there is a limit, so find it and replace it - sql.replace( limitSearch, TQString(" LIMIT %1 OFFSET %2;" ).tqarg( songCount ).tqarg( offset ) ); + sql.replace( limitSearch, TQString(" LIMIT %1 OFFSET %2;" ).arg( songCount ).arg( offset ) ); } } diff --git a/amarok/src/editfilterdialog.cpp b/amarok/src/editfilterdialog.cpp index f9dd1739..cf172e63 100644 --- a/amarok/src/editfilterdialog.cpp +++ b/amarok/src/editfilterdialog.cpp @@ -1,7 +1,7 @@ // (c) 2006 Giovanni Venturi <giovanni@kde-it.org> // See COPYING file for licensing information. -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> #include <tqlabel.h> #include <tqgroupbox.h> @@ -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" ) diff --git a/amarok/src/engine/akode/akode-engine.cpp b/amarok/src/engine/akode/akode-engine.cpp index f2404012..26840589 100644 --- a/amarok/src/engine/akode/akode-engine.cpp +++ b/amarok/src/engine/akode/akode-engine.cpp @@ -180,7 +180,7 @@ AkodeEngine::event( TQEvent *e ) case 3002: m_player->stop(); emit trackEnded(); - emit infoMessage( i18n("Unable to decode <i>%1</i>").tqarg( m_url.prettyURL()) ); + emit infoMessage( i18n("Unable to decode <i>%1</i>").arg( m_url.prettyURL()) ); break; default: diff --git a/amarok/src/engine/helix/helix-configdialog.cpp b/amarok/src/engine/helix/helix-configdialog.cpp index 73080389..7a88820e 100644 --- a/amarok/src/engine/helix/helix-configdialog.cpp +++ b/amarok/src/engine/helix/helix-configdialog.cpp @@ -12,12 +12,12 @@ #include <sys/stat.h> #include <unistd.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqscrollview.h> #include <tqspinbox.h> #include <tqtooltip.h> -#include <tqtextedit.h> -#include <tqtextview.h> +#include <textedit.h> +#include <textview.h> #include <tqfileinfo.h> #include <tqcheckbox.h> @@ -53,7 +53,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent, , m_valueChanged( false ) , m_stringValue( defaultvalue ) { - TQGridLayout *grid = (TQGridLayout*)parent->tqlayout(); + TQGridLayout *grid = (TQGridLayout*)parent->layout(); m_w = new KLineEdit( m_stringValue, parent ); connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) ); @@ -62,7 +62,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent, TQToolTip::add( (TQWidget *) m_w, "<qt>" + tooltip ); TQLabel* d = new TQLabel( description + ':', parent ); - d->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); + d->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); grid->addWidget( (TQWidget *) m_w, row, 1 ); grid->addWidget( d, row, 0 ); @@ -79,7 +79,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent, , m_valueChanged( false ) , m_stringValue( defaultvalue ) { - TQGridLayout *grid = (TQGridLayout*)parent->tqlayout(); + TQGridLayout *grid = (TQGridLayout*)parent->layout(); m_key = str; @@ -90,7 +90,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent, TQToolTip::add( m_w, "<qt>" + tooltip ); TQLabel* d = new TQLabel( description + ':', parent ); - d->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); + d->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); grid->addWidget( m_w, row, 1 ); grid->addWidget( d, row, 0 ); @@ -110,7 +110,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent, HelixEngine *engine ) : deviceComboBox(0), checkBox_outputDevice(0), lineEdit_outputDevice(0), m_changed(false), m_engine(engine) { - TQGridLayout *grid = (TQGridLayout*)parent->tqlayout(); + TQGridLayout *grid = (TQGridLayout*)parent->layout(); deviceComboBox = new KComboBox( false, parent, "deviceComboBox" ); deviceComboBox->insertItem("oss"); // I believe these are not subject to translation (they don't seem to be in xine, @@ -119,7 +119,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent, #endif deviceComboBox->setCurrentItem(HelixConfig::outputplugin()); TQLabel* op = new TQLabel( i18n("Output plugin:"), parent ); - op->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); + op->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); grid->addWidget( op, row, 0 ); grid->addWidget( deviceComboBox, row, 1); connect( (TQWidget *)deviceComboBox, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( slotNewDevice( const TQString& )) ); @@ -128,7 +128,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent, ++row; checkBox_outputDevice = new TQCheckBox( parent, "checkBox_outputDevice" ); - checkBox_outputDevice->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, checkBox_outputDevice->sizePolicy().hasHeightForWidth() ) ); + checkBox_outputDevice->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, checkBox_outputDevice->sizePolicy().hasHeightForWidth() ) ); grid->addWidget( checkBox_outputDevice, row, 0 ); checkBox_outputDevice->setText( i18n( "Device:" ) ); @@ -276,7 +276,7 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi grid->setColStretch( 1, 1 ); if( sv ) - sv->setMinimumWidth( grid->tqsizeHint().width() + 20 ); + sv->setMinimumWidth( grid->sizeHint().width() + 20 ); engine->m_coredir = HelixConfig::coreDirectory(); m_core = new HelixConfigEntry( parent, engine->m_coredir, @@ -349,7 +349,7 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi TQTextEdit *le = new TQTextEdit( parent ); if( sv ) - sv->setMinimumWidth( le->tqsizeHint().width() ); + sv->setMinimumWidth( le->sizeHint().width() ); grid = new TQGridLayout( parent, /*rows*/1, /*cols*/1, /*margin*/2, /*spacing*/1 ); grid->addMultiCellWidget( le, 0, 1, 0, 1, 0 ); diff --git a/amarok/src/engine/helix/helix-engine.cpp b/amarok/src/engine/helix/helix-engine.cpp index 7d778741..fb4dc695 100644 --- a/amarok/src/engine/helix/helix-engine.cpp +++ b/amarok/src/engine/helix/helix-engine.cpp @@ -126,7 +126,7 @@ void HelixEngine::notifyUser(unsigned long code, const char *moreinfo, const cha { TQString *err = HelixErrors::errorText(code); if (err) - emit statusText(i18n("Helix Core returned error: %1 %2 %3").tqarg(TQString(*err)).tqarg(TQString(moreinfo)).tqarg(TQString(moreinfourl))); + emit statusText(i18n("Helix Core returned error: %1 %2 %3").arg(TQString(*err)).arg(TQString(moreinfo)).arg(TQString(moreinfourl))); else emit statusText(i18n("Helix Core returned error: <unknown>")); } @@ -135,7 +135,7 @@ void HelixEngine::interruptUser(unsigned long code, const char *moreinfo, const { TQString *err = HelixErrors::errorText(code); if (err) - emit infoMessage(i18n("Helix Core returned error: %1 %1 %1").tqarg(TQString(*err)).tqarg(TQString(moreinfo)).tqarg(TQString(moreinfourl))); + emit infoMessage(i18n("Helix Core returned error: %1 %1 %1").arg(TQString(*err)).arg(TQString(moreinfo)).arg(TQString(moreinfourl))); else emit infoMessage(i18n("Helix Core returned error: <unknown>")); @@ -146,13 +146,13 @@ void HelixEngine::interruptUser(unsigned long code, const char *moreinfo, const void HelixEngine::onContacting(const char *host) { - emit statusText( i18n("Contacting: %1").tqarg( TQString(host) ) ); + emit statusText( i18n("Contacting: %1").arg( TQString(host) ) ); } void HelixEngine::onBuffering(int pcnt) { if (pcnt != 100) // let's not report that... - emit statusText( i18n( "Buffering %1%" ).tqarg( pcnt ) ); + emit statusText( i18n( "Buffering %1%" ).arg( pcnt ) ); } @@ -289,7 +289,7 @@ HelixEngine::load( const KURL &url, bool isStream ) { const TQString path = url.path(); const TQString ext = path.mid( path.findRev( '.' ) + 1 ).lower(); - emit statusText( i18n("No plugin found for the %1 format").tqarg(ext) ); + emit statusText( i18n("No plugin found for the %1 format").arg(ext) ); return false; } diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h index 6789f26f..4d6d7178 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h @@ -224,7 +224,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) /************************************************************************ * Method: - * IHXStream::ReportRebuffertqStatus + * IHXStream::ReportRebufferStatus * Purpose: * Call this method to report to the playback context that the * available data has dropped to a critically low level, and that @@ -235,12 +235,12 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * NOTE: The values of unNeeded and unAvailable are used to indicate * the general status of the rebuffering effort. For example, if a * renderer has "run dry" and needs 5 data packets to play smoothly - * again, it should call ReportRebuffertqStatus() with 5,0 then as + * again, it should call ReportRebufferStatus() with 5,0 then as * packet arrive it should call again with 5,1; 5,2... and eventually * 5,5. * */ - STDTQT_METHOD(ReportRebuffertqStatus) (THIS_ + STDTQT_METHOD(ReportRebufferStatus) (THIS_ UINT8 unNeeded, UINT8 unAvailable) PURE; @@ -302,20 +302,20 @@ DECLARE_INTERFACE_(IHXStream2, IHXStream) { /************************************************************************ * Method: - * IHXStream2::ReportAudioRebuffertqStatus + * IHXStream2::ReportAudioRebufferStatus * Purpose: * For audio only, when it's called, the rebuffer will only occur when * there aren't any packets in the transport and the amount of audio in * audio device falls below the minimum startup audio pushdown(1000ms * by default) * - * Non-audio renderers should still call ReportRebuffertqStatus(), the + * Non-audio renderers should still call ReportRebufferStatus(), the * rebuffer will occur when the core drains out all the packets from * the transport buffer * * The rest semantic are the same between the 2 calls. */ - STDTQT_METHOD(ReportAudioRebuffertqStatus) (THIS_ + STDTQT_METHOD(ReportAudioRebufferStatus) (THIS_ UINT8 unNeeded, UINT8 unAvailable) PURE; }; @@ -1129,7 +1129,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown) * Method: * IHXLayoutStream::GetProperty * Purpose: - * Get tqlayout stream property + * Get layout stream property * * */ @@ -1140,7 +1140,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown) * Method: * IHXLayoutStream::SetProperty * Purpose: - * Set tqlayout stream property + * Set layout stream property * */ STDTQT_METHOD(SetProperties) (THIS_ diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h index ccbcb0a2..6e0e6cd6 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h @@ -2252,7 +2252,7 @@ typedef enum NI_OPER_STATUS_CONNECTING, NI_OPER_STATUS_CONNECTED, NI_OPER_STATUS_OPERATIONAL -} NItqStatus; +} NIStatus; typedef enum { @@ -2290,7 +2290,7 @@ struct NIInfo { NIType type; IHXBuffer* pDescription; - NItqStatus status; + NIStatus status; UINT32 ulIPv4Index; UINT32 ulIPv6Index; UINT32 ulMTU; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h index 6557e510..883d50e3 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h @@ -695,10 +695,10 @@ DEFINE_GUID_ENUM(IID_IHXSourceHandler, 0xb2646da0, 0x410a, 0x11d6, * Description: * Interfaces related to get pending status from objects * Interfaces: - * IHXPendingtqStatus: {00001100-0901-11d1-8B06-00A024406D59} + * IHXPendingStatus: {00001100-0901-11d1-8B06-00A024406D59} */ #ifndef _HXPENDS_H_ -DEFINE_GUID_ENUM(IID_IHXPendingtqStatus, 0x00001100, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59) +DEFINE_GUID_ENUM(IID_IHXPendingStatus, 0x00001100, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59) #endif /* * File: diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h index 775d287c..e29fe874 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h @@ -531,7 +531,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * Returns the count of the number of Properties under the one * whose name is specified in "pName". * - * pName - IN - name of the Property whose number of tqchildren is to be + * pName - IN - name of the Property whose number of children is to be * retrieved */ STDMETHOD_(INT32, GetNumPropsByName) (THIS_ @@ -544,7 +544,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * Returns the count of the number of Properties under the one * whose unique id is specified in "ulId". * - * ulId - IN - unique id of the Property whose number of tqchildren is + * ulId - IN - unique id of the Property whose number of children is * to be retrieved */ STDMETHOD_(INT32, GetNumPropsById) (THIS_ @@ -1594,7 +1594,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Returns the count of the number of Properties under the one * whose name is specified in "pName". * - * pName - IN - name of the Property whose number of tqchildren is to be + * pName - IN - name of the Property whose number of children is to be * retrieved */ STDMETHOD_(INT32, GetNumPropsByName) (THIS_ @@ -1607,7 +1607,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Returns the count of the number of Properties under the one * whose unique id is specified in "ulId". * - * ulId - IN - unique id of the Property whose number of tqchildren is + * ulId - IN - unique id of the Property whose number of children is * to be retrieved */ STDMETHOD_(INT32, GetNumPropsById) (THIS_ @@ -2089,10 +2089,10 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Method: * IHXRegistry2::GetChildIdListByName * Purpose: - * Get a array which enumerates all of the tqchildren under a + * Get a array which enumerates all of the children under a * property by id. * - * pName - IN - name of the Property whose tqchildren are to be enumerated. + * pName - IN - name of the Property whose children are to be enumerated. * pValues - OUT - array of unique Property id's. * ulCount - OUT - size of the returned pValues array. * @@ -2108,10 +2108,10 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Method: * IHXRegistry2::GetChildIdListById * Purpose: - * Get a array which enumerates all of the tqchildren under a + * Get a array which enumerates all of the children under a * property by id. * - * ulId - IN - unique id of the Property whose tqchildren are to be enumerated. + * ulId - IN - unique id of the Property whose children are to be enumerated. * pValues - OUT - array of unique Property id's. * ulCount - OUT - size of the returned pValues array. * diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h index a436c63e..b3921e04 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h @@ -740,7 +740,7 @@ DEFINE_GUID_ENUM(IID_IHXMMSResendResponse, 0xa581f3a4, 0xc508, 0x4800, 0xba, 0xd * */ DEFINE_GUID_ENUM(IID_IHXDistributedLicenseRequester, 0x00005702, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59) -DEFINE_GUID_ENUM(IID_IHXDistributedLicenseRequesttqStatus, 0x00005703, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59) +DEFINE_GUID_ENUM(IID_IHXDistributedLicenseRequestStatus, 0x00005703, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59) /* * File: hxauto.h diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h index 180c5e5d..e9ce4dcc 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h @@ -27,8 +27,8 @@ typedef LONG32 HX_RESULT; # define MAKE_HRESULT(sev,fac,code) \ ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | \ ((unsigned long)(code))) ) -# define SUCCEEDED(tqStatus) (((unsigned long)(tqStatus)>>31) == 0) -# define FAILED(tqStatus) (((unsigned long)(tqStatus)>>31) != 0) +# define SUCCEEDED(Status) (((unsigned long)(Status)>>31) == 0) +# define FAILED(Status) (((unsigned long)(Status)>>31) != 0) #else # ifndef _HRESULT_DEFINED typedef LONG32 HRESULT; @@ -120,7 +120,7 @@ typedef LONG32 HX_RESULT; #define HXR_WM_OPL_NOT_SUPPORTED MAKE_HX_RESULT(1,SS_GLO,36) // 80040024 // $Private: -/* tqStatus Code for backup/restore*/ +/* Status Code for backup/restore*/ #define HXR_RESTORATION_COMPLETE MAKE_HX_RESULT(1,SS_GLO,27) // 8004001b #define HXR_BACKUP_COMPLETE MAKE_HX_RESULT(1,SS_GLO,28) // 8004001c #define HXR_TLC_NOT_CERTIFIED MAKE_HX_RESULT(1,SS_GLO,29) // 8004001d diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h index 42afd584..1ccba13b 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h @@ -614,9 +614,9 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * Method: * IHXSiteSupplier::BeginChangeLayout * Purpose: - * Called to inform the site supplier a tqlayout change has beginning + * Called to inform the site supplier a layout change has beginning * it can expect to receive SitesNeeded() and SitesNotNeeded() calls - * while a tqlayout change is in progress, + * while a layout change is in progress, */ STDTQT_METHOD(BeginChangeLayout) (THIS) PURE; @@ -624,7 +624,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * Method: * IHXSiteSupplier::DoneChangeLayout * Purpose: - * Called to inform the site supplier the tqlayout change has been + * Called to inform the site supplier the layout change has been * completed. */ STDTQT_METHOD(DoneChangeLayout) (THIS) PURE; @@ -642,7 +642,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * * Interface implemented by the client core. This interface is called * by users of the client core to inform it of IHXSite's which are - * available for tqlayout of renderers + * available for layout of renderers * * IID_IHXSiteManager: * @@ -923,7 +923,7 @@ DECLARE_INTERFACE_(IHXSiteFullScreen, IUnknown) * * Purpose: * - * Allow tqlayout site groups to be added and removed + * Allow layout site groups to be added and removed * * IID_IHXLayoutSiteGroupManager: * @@ -1091,7 +1091,7 @@ DECLARE_INTERFACE_(IHXStatusMessage, IUnknown) * IHXStatusMessage methods */ - STDTQT_METHOD(SettqStatus) (THIS_ const char* pText) PURE; + STDTQT_METHOD(SetStatus) (THIS_ const char* pText) PURE; }; // $Private: diff --git a/amarok/src/engine/helix/helix-sp/helix-sp.cpp b/amarok/src/engine/helix/helix-sp/helix-sp.cpp index 4cb58bb7..41c84a1d 100644 --- a/amarok/src/engine/helix/helix-sp/helix-sp.cpp +++ b/amarok/src/engine/helix/helix-sp/helix-sp.cpp @@ -835,7 +835,7 @@ HelixSimplePlayer::~HelixSimplePlayer() { tearDown(); - // only now tqinvalidate the device, not whenever we teardown + // only now invalidate the device, not whenever we teardown delete [] m_device; } diff --git a/amarok/src/engine/helix/hxplayercontrol.cpp b/amarok/src/engine/helix/hxplayercontrol.cpp index fabc8a0d..8cb26939 100644 --- a/amarok/src/engine/helix/hxplayercontrol.cpp +++ b/amarok/src/engine/helix/hxplayercontrol.cpp @@ -69,7 +69,7 @@ PlayerControl::PlayerControl() : m_eq_enabled(false), m_preamp(0), m_err(0), iam m_inited(false), m_api( HelixSimplePlayer::OSS ), m_device(0), mimehead(0), mimelistlen(0), m_numPlugins(0), m_pluginInfo(0) { - memset(m_tqchildren, 0, sizeof(m_tqchildren)); + memset(m_children, 0, sizeof(m_children)); } PlayerControl::~PlayerControl() @@ -100,7 +100,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co return; } - memset(&m_tqchildren, 0, numPlayers * sizeof(struct playerChildren)); + memset(&m_children, 0, numPlayers * sizeof(struct playerChildren)); m_inited = false; @@ -121,30 +121,30 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co { if (pmapped) { - m_tqchildren[i].current_time = &(pmapped[i].current_time); - m_tqchildren[i].duration = &(pmapped[i].duration); - m_tqchildren[i].md = &(pmapped[i].md); + m_children[i].current_time = &(pmapped[i].current_time); + m_children[i].duration = &(pmapped[i].duration); + m_children[i].md = &(pmapped[i].md); - m_tqchildren[i].m_current = &(pmapped[i].m_current); - m_tqchildren[i].m_consumed = &(pmapped[i].m_consumed); - //m_tqchildren[i].q = pmapped[i].q; + m_children[i].m_current = &(pmapped[i].m_current); + m_children[i].m_consumed = &(pmapped[i].m_consumed); + //m_children[i].q = pmapped[i].q; //for (int j=0; j<NUM_SCOPEBUFS; j++) //{ - // m_tqchildren[i].q[j].allocd = false; - // m_tqchildren[i].q[j].buf = pmapped[i].b[j]; + // m_children[i].q[j].allocd = false; + // m_children[i].q[j].buf = pmapped[i].b[j]; //} } - err = pipe(m_tqchildren[i].m_pipeA); - err |= pipe(m_tqchildren[i].m_pipeB); + err = pipe(m_children[i].m_pipeA); + err |= pipe(m_children[i].m_pipeB); if ( !err && (iamparent = fork()) ) { // parent print2stderr("%%%%%% parent initializes player %d\n", i); // parent's m_pid remains 0 - m_tqchildren[i].m_pid = iamparent; - close(m_tqchildren[i].m_pipeA[1]); // parent uses A for reading - close(m_tqchildren[i].m_pipeB[0]); // and B for writing + m_children[i].m_pid = iamparent; + close(m_children[i].m_pipeA[1]); // parent uses A for reading + close(m_children[i].m_pipeB[0]); // and B for writing } else if (!err) { @@ -153,17 +153,17 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co cerr << "%%%%%% child initializes as player " << i << endl;; m_index = i; // child's index is saved - close(m_tqchildren[i].m_pipeA[0]); // child uses A for writing - close(m_tqchildren[i].m_pipeB[1]); // and B for reading + close(m_children[i].m_pipeA[0]); // child uses A for writing + close(m_children[i].m_pipeB[1]); // and B for reading break; } } - if (!iamparent) // tqchildren stay here, parents return + if (!iamparent) // children stay here, parents return { - int rfd = m_tqchildren[m_index].m_pipeB[0]; - int wfd = m_tqchildren[m_index].m_pipeA[1]; + int rfd = m_children[m_index].m_pipeB[0]; + int wfd = m_children[m_index].m_pipeA[1]; int n; struct timeval timeout; HSPPlayerControlled *player = 0; @@ -237,7 +237,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co if (m_inited) { if (pmapped) - *m_tqchildren[m_index].current_time = 0; + *m_children[m_index].current_time = 0; if (sz == sizeof(unsigned long) + 1) { @@ -397,7 +397,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co { player->clearScopeQ(0); if (pmapped) - *m_tqchildren[m_index].m_consumed = *m_tqchildren[m_index].m_current = 0; + *m_children[m_index].m_consumed = *m_children[m_index].m_current = 0; } break; case TEARDOWN: @@ -437,36 +437,36 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co playing = false; if (pmapped) { - *m_tqchildren[m_index].current_time = 0; - *m_tqchildren[m_index].duration = 0; + *m_children[m_index].current_time = 0; + *m_children[m_index].duration = 0; } } if (pmapped) { - *m_tqchildren[m_index].current_time = player->where(0); - *m_tqchildren[m_index].duration = player->duration(0); + *m_children[m_index].current_time = player->where(0); + *m_children[m_index].duration = player->duration(0); HelixSimplePlayer::metaData *md = player->getMetaData(0); if (md) - memcpy((void *) m_tqchildren[m_index].md, (void *) md, sizeof(HelixSimplePlayer::metaData)); + memcpy((void *) m_children[m_index].md, (void *) md, sizeof(HelixSimplePlayer::metaData)); struct DelayQueue *item; //int j; while ((item = player->getScopeBuf(0))) { - //j = (*m_tqchildren[m_index].m_current + 1) % NUM_SCOPEBUFS; + //j = (*m_children[m_index].m_current + 1) % NUM_SCOPEBUFS; //cerr << "player:" << m_index << " j=" << j << " time=" << item->time << " etime=" << item->etime << " len=" << item->len << endl; - //m_tqchildren[m_index].q[j].len = item->len; - //m_tqchildren[m_index].q[j].time = item->time; - //m_tqchildren[m_index].q[j].etime = item->etime; - //m_tqchildren[m_index].q[j].nchan = item->nchan; - //m_tqchildren[m_index].q[j].bps = item->bps; - //m_tqchildren[m_index].q[j].tps = item->tps; - //m_tqchildren[m_index].q[j].spb = item->spb; - //memcpy((void *)m_tqchildren[m_index].q[j].buf, (void *) item->buf, item->len ); - //*m_tqchildren[m_index].m_current = j; + //m_children[m_index].q[j].len = item->len; + //m_children[m_index].q[j].time = item->time; + //m_children[m_index].q[j].etime = item->etime; + //m_children[m_index].q[j].nchan = item->nchan; + //m_children[m_index].q[j].bps = item->bps; + //m_children[m_index].q[j].tps = item->tps; + //m_children[m_index].q[j].spb = item->spb; + //memcpy((void *)m_children[m_index].q[j].buf, (void *) item->buf, item->len ); + //*m_children[m_index].m_current = j; //cerr << "player:" << m_index << " time=" << item->time << " etime=" << item->etime << endl; sendscopebuf(wfd, item); delete item; @@ -488,15 +488,15 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co sendsetdevice(); sendinit(); - // wait for ready from tqchildren + // wait for ready from children while (!done && !dead) { dispatch(); done = true; for (i=0; i<numPlayers; i++) { - done &= m_tqchildren[i].isready; - dead |= m_tqchildren[i].isdead; + done &= m_children[i].isready; + dead |= m_children[i].isdead; } } @@ -540,12 +540,12 @@ void PlayerControl::tearDown() { if (m_inited) { - sendteardown(m_tqchildren[i].m_pipeB[1]); - close(m_tqchildren[i].m_pipeB[1]); - close(m_tqchildren[i].m_pipeA[0]); - cerr << "About to waitpid for pid " << m_tqchildren[i].m_pid << endl; - kill(m_tqchildren[i].m_pid, SIGTERM); - waitpid(m_tqchildren[i].m_pid, &tmp, 0); + sendteardown(m_children[i].m_pipeB[1]); + close(m_children[i].m_pipeB[1]); + close(m_children[i].m_pipeA[0]); + cerr << "About to waitpid for pid " << m_children[i].m_pid << endl; + kill(m_children[i].m_pid, SIGTERM); + waitpid(m_children[i].m_pid, &tmp, 0); } } } @@ -553,16 +553,16 @@ void PlayerControl::tearDown() void PlayerControl::start(int playerIndex, bool fadein, unsigned long fadetime) { - m_tqchildren[playerIndex].isplaying = true; + m_children[playerIndex].isplaying = true; if (pmapped) - *m_tqchildren[playerIndex].m_consumed = *m_tqchildren[playerIndex].m_current = 0; - sendstart(m_tqchildren[playerIndex].m_pipeB[1], fadein, fadetime); + *m_children[playerIndex].m_consumed = *m_children[playerIndex].m_current = 0; + sendstart(m_children[playerIndex].m_pipeB[1], fadein, fadetime); } int PlayerControl::setURL(const char *url, int playerIndex, bool islocal) { - m_tqchildren[playerIndex].islocal = islocal; - if (sendsetURL(m_tqchildren[playerIndex].m_pipeB[1], url, islocal)) + m_children[playerIndex].islocal = islocal; + if (sendsetURL(m_children[playerIndex].m_pipeB[1], url, islocal)) return 0; return -1; @@ -570,7 +570,7 @@ int PlayerControl::setURL(const char *url, int playerIndex, bool islocal) bool PlayerControl::done(int playerIndex) { - return (!m_tqchildren[playerIndex].isplaying); + return (!m_children[playerIndex].isplaying); } void PlayerControl::stop(int playerIndex) @@ -582,30 +582,30 @@ void PlayerControl::stop(int playerIndex) } else { - m_tqchildren[playerIndex].isplaying = false; - sendstop(m_tqchildren[playerIndex].m_pipeB[1]); + m_children[playerIndex].isplaying = false; + sendstop(m_children[playerIndex].m_pipeB[1]); } } void PlayerControl::pause(int playerIndex) { - sendpause(m_tqchildren[playerIndex].m_pipeB[1]); + sendpause(m_children[playerIndex].m_pipeB[1]); } void PlayerControl::resume(int playerIndex) { - sendresume(m_tqchildren[playerIndex].m_pipeB[1]); + sendresume(m_children[playerIndex].m_pipeB[1]); } void PlayerControl::seek(unsigned long pos, int playerIndex) { - sendmessage(m_tqchildren[playerIndex].m_pipeB[1], SEEK, (unsigned char *) &pos, sizeof(unsigned long)); + sendmessage(m_children[playerIndex].m_pipeB[1], SEEK, (unsigned char *) &pos, sizeof(unsigned long)); } unsigned long PlayerControl::where(int playerIndex) const { if (pmapped) - return *m_tqchildren[playerIndex].current_time; + return *m_children[playerIndex].current_time; else return 0; } @@ -613,7 +613,7 @@ unsigned long PlayerControl::where(int playerIndex) const unsigned long PlayerControl::duration(int playerIndex) const { if (pmapped) - return *m_tqchildren[playerIndex].duration; + return *m_children[playerIndex].duration; else return 0; } @@ -627,7 +627,7 @@ void PlayerControl::setVolume(unsigned long vol) { m_volume = vol; for (int i = 0; i < nNumPlayers; i++) - sendsetvolume(m_tqchildren[i].m_pipeB[1], vol); + sendsetvolume(m_children[i].m_pipeB[1], vol); } void PlayerControl::dispatch() @@ -647,8 +647,8 @@ void PlayerControl::dispatch() for (i=0; i<nNumPlayers; i++) { - rfd = m_tqchildren[i].m_pipeA[0]; - wfd = m_tqchildren[i].m_pipeB[1]; + rfd = m_children[i].m_pipeA[0]; + wfd = m_children[i].m_pipeB[1]; FD_SET(rfd, &rdset); FD_SET(wfd, &wrset); // really should check to see if we can write, but not gonna if (rfd > n) @@ -661,8 +661,8 @@ void PlayerControl::dispatch() ntot = select(n + 1, &rdset, 0, 0, &timeout); for (i=0; ntot && i < nNumPlayers; i++) { - rfd = m_tqchildren[i].m_pipeA[0]; - wfd = m_tqchildren[i].m_pipeB[1]; + rfd = m_children[i].m_pipeA[0]; + wfd = m_children[i].m_pipeB[1]; if ( FD_ISSET(rfd, &rdset) ) { msgid m; @@ -675,14 +675,14 @@ void PlayerControl::dispatch() { case READY: print2stderr("CHILD %d is READY\n", i); - m_tqchildren[i].isready = true;; + m_children[i].isready = true;; break; case DONE: print2stderr("CHILD %d is DONE\n", i); if (!sz) { - m_tqchildren[i].isplaying = false; + m_children[i].isplaying = false; clearScopeQ(i); play_finished(i); } @@ -852,7 +852,7 @@ void PlayerControl::dispatch() } else { - m_tqchildren[i].isdead = true; + m_children[i].isdead = true; return; // should never happen } } @@ -860,16 +860,16 @@ void PlayerControl::dispatch() for (i=0; pmapped && i<nNumPlayers; i++) { - while (*m_tqchildren[i].m_consumed != *m_tqchildren[i].m_current) + while (*m_children[i].m_consumed != *m_children[i].m_current) { - addScopeBuf(&m_tqchildren[i].q[*m_tqchildren[i].m_consumed], i); + addScopeBuf(&m_children[i].q[*m_children[i].m_consumed], i); - //cerr << "j=" << *m_tqchildren[i].m_consumed << - // " time=" << m_tqchildren[i].q[*m_tqchildren[i].m_consumed].time << - // " etime=" << m_tqchildren[i].q[*m_tqchildren[i].m_consumed].etime << - // " len=" << m_tqchildren[i].q[*m_tqchildren[i].m_consumed].len << endl; + //cerr << "j=" << *m_children[i].m_consumed << + // " time=" << m_children[i].q[*m_children[i].m_consumed].time << + // " etime=" << m_children[i].q[*m_children[i].m_consumed].etime << + // " len=" << m_children[i].q[*m_children[i].m_consumed].len << endl; - *m_tqchildren[i].m_consumed = (*m_tqchildren[i].m_consumed + 1) % NUM_SCOPEBUFS; + *m_children[i].m_consumed = (*m_children[i].m_consumed + 1) % NUM_SCOPEBUFS; } } } @@ -881,37 +881,37 @@ void PlayerControl::cleanUpStream(int playerIndex) bool PlayerControl::isPlaying(int playerIndex) const { - return m_tqchildren[playerIndex].isplaying; + return m_children[playerIndex].isplaying; } bool PlayerControl::isLocal(int playerIndex) const { - return m_tqchildren[playerIndex].islocal; + return m_children[playerIndex].islocal; } void PlayerControl::setFadeout(bool fadeout, unsigned long fadelength, int playerIndex) { - sendsetfade(m_tqchildren[playerIndex].m_pipeB[1], fadeout, fadelength); + sendsetfade(m_children[playerIndex].m_pipeB[1], fadeout, fadelength); } void PlayerControl::addScopeBuf(struct DelayQueue *item, int playerIndex) { if (playerIndex >=0 && playerIndex < nNumPlayers) { - if (m_tqchildren[playerIndex].scopebuftail) + if (m_children[playerIndex].scopebuftail) { item->fwd = 0; - m_tqchildren[playerIndex].scopebuftail->fwd = item; - m_tqchildren[playerIndex].scopebuftail = item; - m_tqchildren[playerIndex].scopecount++; + m_children[playerIndex].scopebuftail->fwd = item; + m_children[playerIndex].scopebuftail = item; + m_children[playerIndex].scopecount++; } else { item->fwd = 0; - m_tqchildren[playerIndex].scopebufhead = item; - m_tqchildren[playerIndex].scopebuftail = item; - m_tqchildren[playerIndex].scopecount = 1; + m_children[playerIndex].scopebufhead = item; + m_children[playerIndex].scopebuftail = item; + m_children[playerIndex].scopecount = 1; } } } @@ -920,14 +920,14 @@ DelayQueue *PlayerControl::getScopeBuf(int playerIndex) { if (playerIndex >=0 && playerIndex < nNumPlayers) { - struct DelayQueue *item = m_tqchildren[playerIndex].scopebufhead; + struct DelayQueue *item = m_children[playerIndex].scopebufhead; if (item) { - m_tqchildren[playerIndex].scopebufhead = item->fwd; - m_tqchildren[playerIndex].scopecount--; - if (!m_tqchildren[playerIndex].scopebufhead) - m_tqchildren[playerIndex].scopebuftail = 0; + m_children[playerIndex].scopebufhead = item->fwd; + m_children[playerIndex].scopecount--; + if (!m_children[playerIndex].scopebufhead) + m_children[playerIndex].scopebuftail = 0; } return item; } @@ -937,15 +937,15 @@ DelayQueue *PlayerControl::getScopeBuf(int playerIndex) int PlayerControl::getScopeCount(int playerIndex) { - return (playerIndex >= 0 && playerIndex < nNumPlayers ? m_tqchildren[playerIndex].scopecount : 0); + return (playerIndex >= 0 && playerIndex < nNumPlayers ? m_children[playerIndex].scopecount : 0); } int PlayerControl::peekScopeTime(unsigned long &t, int playerIndex) { if (playerIndex >=0 && playerIndex < nNumPlayers) { - if (m_tqchildren[playerIndex].scopebufhead) - t = m_tqchildren[playerIndex].scopebufhead->time; + if (m_children[playerIndex].scopebufhead) + t = m_children[playerIndex].scopebufhead->time; else return -1; return 0; @@ -962,7 +962,7 @@ void PlayerControl::clearScopeQ(int playerIndex) } else { - sendscopeclear(m_tqchildren[playerIndex].m_pipeB[1]); + sendscopeclear(m_children[playerIndex].m_pipeB[1]); struct DelayQueue *item; while ((item = getScopeBuf(playerIndex))) if (item->allocd) @@ -976,7 +976,7 @@ void PlayerControl::enableEQ(bool enabled) unsigned char c = (char) enabled; for (i=0; i<nNumPlayers; i++) - sendmessage(m_tqchildren[i].m_pipeB[1], ENABLEEQ, (unsigned char *) &c, 1); + sendmessage(m_children[i].m_pipeB[1], ENABLEEQ, (unsigned char *) &c, 1); m_eq_enabled = enabled; } @@ -1021,7 +1021,7 @@ int PlayerControl::getMimeListLen() const HelixSimplePlayer::metaData *PlayerControl::getMetaData(int playerIndex ) { - return m_tqchildren[playerIndex].md; + return m_children[playerIndex].md; } bool PlayerControl::sendsetoutputsink() @@ -1031,7 +1031,7 @@ bool PlayerControl::sendsetoutputsink() bool ok = false; for (i=0; i<nNumPlayers; i++) - ok |= sendmessage(m_tqchildren[i].m_pipeB[1], OUTPUTSINK, (unsigned char *) &c, 1); + ok |= sendmessage(m_children[i].m_pipeB[1], OUTPUTSINK, (unsigned char *) &c, 1); return ok; } @@ -1045,7 +1045,7 @@ bool PlayerControl::sendsetdevice() bool ok = false; for (i=0; i<nNumPlayers; i++) - ok |= sendmessage(m_tqchildren[i].m_pipeB[1], DEVICE, (unsigned char *) m_device, len + 1); + ok |= sendmessage(m_children[i].m_pipeB[1], DEVICE, (unsigned char *) m_device, len + 1); return ok; } @@ -1056,7 +1056,7 @@ bool PlayerControl::sendinit() bool ok = false; for (i=0; i<nNumPlayers; i++) - ok |= sendrequest(m_tqchildren[i].m_pipeB[1], INIT); + ok |= sendrequest(m_children[i].m_pipeB[1], INIT); return ok; } @@ -1077,12 +1077,12 @@ bool PlayerControl::sendupdateeqgains() memcpy((void *)&buf[ sizeof(m_preamp) + (i+1) * sizeof(int) ], (void *) &bandGain, sizeof(int)); } for ( i = 0; i < (uint) nNumPlayers; i++ ) - ok |= sendmessage(m_tqchildren[i].m_pipeB[1], UPDATEETQGAINS, buf, sizeof(m_preamp) + (m_equalizerGains.size()+1) * sizeof(int)); + ok |= sendmessage(m_children[i].m_pipeB[1], UPDATEETQGAINS, buf, sizeof(m_preamp) + (m_equalizerGains.size()+1) * sizeof(int)); return ok; } -// tqchildren send this! +// children send this! bool PlayerControl::sendnotifyuser(unsigned long code, const char *moreinfo, const char *moreinfourl) { int len1 = strlen(moreinfo), len2 = strlen(moreinfourl), len; @@ -1095,10 +1095,10 @@ bool PlayerControl::sendnotifyuser(unsigned long code, const char *moreinfo, con memcpy( (void *) &buf[ len ], (void *) moreinfourl, len2 + 1); len += len2 + 1; - return (sendmessage(m_tqchildren[m_index].m_pipeA[1], NOTIFYUSER, buf, len)); + return (sendmessage(m_children[m_index].m_pipeA[1], NOTIFYUSER, buf, len)); } -// tqchildren send this! +// children send this! bool PlayerControl::sendinterruptuser(unsigned long code, const char *moreinfo, const char *moreinfourl) { int len1 = strlen(moreinfo), len2 = strlen(moreinfourl), len; @@ -1111,21 +1111,21 @@ bool PlayerControl::sendinterruptuser(unsigned long code, const char *moreinfo, memcpy( (void *) &buf[ len ], (void *) moreinfourl, len2 + 1); len += len2 + 1; - return (sendmessage(m_tqchildren[m_index].m_pipeA[1], INTERRUPTUSER, buf, len)); + return (sendmessage(m_children[m_index].m_pipeA[1], INTERRUPTUSER, buf, len)); } -// tqchildren send this! +// children send this! bool PlayerControl::sendcontacting(const char *host) { int len = strlen(host); - return (sendmessage(m_tqchildren[m_index].m_pipeA[1], CONTACTING, (unsigned char *) host, len + 1)); + return (sendmessage(m_children[m_index].m_pipeA[1], CONTACTING, (unsigned char *) host, len + 1)); } -// tqchildren send this! +// children send this! bool PlayerControl::sendbuffering(int percentage) { - return (sendmessage(m_tqchildren[m_index].m_pipeA[1], BUFFERING, (unsigned char *) &percentage, sizeof(unsigned long))); + return (sendmessage(m_children[m_index].m_pipeA[1], BUFFERING, (unsigned char *) &percentage, sizeof(unsigned long))); } diff --git a/amarok/src/engine/helix/hxplayercontrol.h b/amarok/src/engine/helix/hxplayercontrol.h index 37b0a121..8ccdd445 100644 --- a/amarok/src/engine/helix/hxplayercontrol.h +++ b/amarok/src/engine/helix/hxplayercontrol.h @@ -87,7 +87,7 @@ public: virtual void onContacting(const char */*host*/) {} virtual void onBuffering(int /*percentage*/) {} - // tqchildren send functions + // children send functions bool sendnotifyuser(unsigned long code, const char *moreinfo, const char *moreinfourl); bool sendinterruptuser(unsigned long code, const char *moreinfo, const char *moreinfourl); bool sendcontacting(const char *host); @@ -129,7 +129,7 @@ private: DelayQueue *q; int *m_current; int *m_consumed; - } m_tqchildren[2]; + } m_children[2]; unsigned long m_volume; diff --git a/amarok/src/engine/kdemm/kdemmengine.cpp b/amarok/src/engine/kdemm/kdemmengine.cpp index b39033e0..a5ea4a7a 100644 --- a/amarok/src/engine/kdemm/kdemmengine.cpp +++ b/amarok/src/engine/kdemm/kdemmengine.cpp @@ -27,9 +27,9 @@ what : interface to the KDE Multimedia interface (KDEMM) #include <tqdir.h> #include <tqdom.h> #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <kapplication.h> diff --git a/amarok/src/engine/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp index 190fce88..f515f5ec 100644 --- a/amarok/src/engine/mas/masengine.cpp +++ b/amarok/src/engine/mas/masengine.cpp @@ -401,7 +401,7 @@ bool MasEngine::masinit() warning() << "MAS daemon not running. Starting! Please provide password..." << endl; // masd seems not to be running, let's try to run it TQCString cmdline; - cmdline = TQFile::encodeName( KStandardDirs::findExe( TQString::tqfromLatin1( "tdesu" ) ) ); + cmdline = TQFile::encodeName( KStandardDirs::findExe( TQString::fromLatin1( "tdesu" ) ) ); // TODO !!!hardcoded path cmdline += " -n -f /usr/local/mas/log/mas-1.log -c "; cmdline += "/usr/local/mas/bin/mas-launch"; diff --git a/amarok/src/engine/nmm/HostList.cpp b/amarok/src/engine/nmm/HostList.cpp index 32fb19c8..623f2852 100644 --- a/amarok/src/engine/nmm/HostList.cpp +++ b/amarok/src/engine/nmm/HostList.cpp @@ -52,7 +52,7 @@ HostList::HostList( TQWidget *parent, const char *name ) setColumnAlignment( HostListItem::Video, TQt::AlignCenter ); setColumnAlignment( HostListItem::Audio, TQt::AlignCenter ); setColumnAlignment( HostListItem::Volume, TQt::AlignCenter ); - setColumnAlignment( HostListItem::tqStatus, TQt::AlignLeft ); + setColumnAlignment( HostListItem::Status, TQt::AlignLeft ); } HostList::~HostList() @@ -67,8 +67,8 @@ void HostList::notifyHostError( TQString hostname, int error) if( host->text(HostListItem::Hostname) == hostname ) { host->setText( HostListItem::Hostname, hostname ); - host->settqStatus( error ); - host->tqrepaint(); + host->setStatus( error ); + host->repaint(); return; } ++it; @@ -101,8 +101,8 @@ void HostList::contentsMousePressEvent( TQMouseEvent *e) } // status column else - if( e->pos().x() > header()->sectionPos( HostListItem::tqStatus ) && - e->pos().x() < header()->sectionPos( HostListItem::tqStatus ) + header()->sectionSize( HostListItem::tqStatus ) ) + if( e->pos().x() > header()->sectionPos( HostListItem::Status ) && + e->pos().x() < header()->sectionPos( HostListItem::Status ) + header()->sectionSize( HostListItem::Status ) ) { item->statusToolTip(); } diff --git a/amarok/src/engine/nmm/HostListItem.cpp b/amarok/src/engine/nmm/HostListItem.cpp index cb8e61f0..f7a8e83a 100644 --- a/amarok/src/engine/nmm/HostListItem.cpp +++ b/amarok/src/engine/nmm/HostListItem.cpp @@ -51,8 +51,8 @@ HostListItem::HostListItem( TQListView *parent, TQString hostname, bool audio, b { setText( HostListItem::Hostname, hostname); - setPixmap( HostListItem::tqStatus, SmallIcon("info") ); - setText( HostListItem::tqStatus, i18n("Unknown") ); + setPixmap( HostListItem::Status, SmallIcon("info") ); + setText( HostListItem::Status, i18n("Unknown") ); setPixmap( HostListItem::Playback, SmallIcon("info") ); setText( HostListItem::Playback, i18n("Unknown") ); @@ -77,7 +77,7 @@ int HostListItem::volumeAtPosition( int x ) void HostListItem::updateColumn( int column ) const { - const TQRect r = listView()->tqitemRect( this ); + const TQRect r = listView()->itemRect( this ); if( !r.isValid() ) return; @@ -88,10 +88,10 @@ void HostListItem::updateColumn( int column ) const void HostListItem::statusToolTip() { - TQWhatsThis::display( prettytqStatus( m_status ) ); + TQWhatsThis::display( prettyStatus( m_status ) ); } -TQString HostListItem::prettytqStatus( int error ) +TQString HostListItem::prettyStatus( int error ) { TQString st; @@ -146,24 +146,24 @@ void HostListItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, if( ! m_read_only) setPixmap( HostListItem::Audio, SmallIcon("nmm_option_off") ); } - else if( column == HostListItem::tqStatus ) + else if( column == HostListItem::Status ) { TQFont font( p->font() ); if( ! m_status ) // Unknown { font.setBold( false ); - setText( HostListItem::tqStatus , i18n("Unknown") ); + setText( HostListItem::Status , i18n("Unknown") ); } else if( m_status == NmmEngine::STATUS_OK ) { font.setBold( false ); m_cg.setColor( TQColorGroup::Text, TQt::darkGreen ); - setText( HostListItem::tqStatus , i18n("OK") ); + setText( HostListItem::Status , i18n("OK") ); } else { // error font.setBold( true ); m_cg.setColor( TQColorGroup::Text, TQt::red ); - setText( HostListItem::tqStatus , i18n("Failed") ); + setText( HostListItem::Status , i18n("Failed") ); } p->setFont( font ); } @@ -257,9 +257,9 @@ TQPixmap HostListItem::generateGradient( int type ) KPixmap result = TQPixmap( 113, 24 ); if( type == PixRight) - KPixmapEffect::gradient( result, listView()->tqcolorGroup().background(), listView()->tqcolorGroup().highlight(), KPixmapEffect::HorizontalGradient ); + KPixmapEffect::gradient( result, listView()->colorGroup().background(), listView()->colorGroup().highlight(), KPixmapEffect::HorizontalGradient ); else - KPixmapEffect::gradient( result, listView()->tqcolorGroup().highlight(), listView()->tqcolorGroup().background(), KPixmapEffect::HorizontalGradient ); + KPixmapEffect::gradient( result, listView()->colorGroup().highlight(), listView()->colorGroup().background(), KPixmapEffect::HorizontalGradient ); result.setMask( mask); return result; diff --git a/amarok/src/engine/nmm/HostListItem.h b/amarok/src/engine/nmm/HostListItem.h index ae3c9bcd..2a3b649e 100644 --- a/amarok/src/engine/nmm/HostListItem.h +++ b/amarok/src/engine/nmm/HostListItem.h @@ -36,7 +36,7 @@ class HostListItem : public KListViewItem { Video, Audio, Volume, - tqStatus, + Status, Playback }; @@ -49,7 +49,7 @@ class HostListItem : public KListViewItem { bool isAudioEnabled() const { return m_audio; } void toggleAudio() { m_audio = !m_audio; } - void settqStatus( int s ) { m_status = s; } + void setStatus( int s ) { m_status = s; } int status() const { return m_status; } void setVolume( int v ) { m_volume = v; } @@ -69,7 +69,7 @@ class HostListItem : public KListViewItem { * \todo make it user friendly/understandable * \todo right place for this method? */ - static TQString prettytqStatus( int ); + static TQString prettyStatus( int ); protected: void paintCell( TQPainter * painter, const TQColorGroup & cg, int column, int width, int align ); diff --git a/amarok/src/engine/nmm/NmmLocation.h b/amarok/src/engine/nmm/NmmLocation.h index 2c628602..a1bc693d 100644 --- a/amarok/src/engine/nmm/NmmLocation.h +++ b/amarok/src/engine/nmm/NmmLocation.h @@ -46,7 +46,7 @@ class NmmLocation { int volume() const { return m_volume; } void setVolume( int v ) { m_volume = v; } - void settqStatus( int s ) { m_status = s; } + void setStatus( int s ) { m_status = s; } int status() const { return m_status; } private: diff --git a/amarok/src/engine/nmm/nmm_configdialog.cpp b/amarok/src/engine/nmm/nmm_configdialog.cpp index 712e98ea..e670c823 100644 --- a/amarok/src/engine/nmm/nmm_configdialog.cpp +++ b/amarok/src/engine/nmm/nmm_configdialog.cpp @@ -31,7 +31,7 @@ #include <tqbuttongroup.h> #include <tqinputdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> #include <tqradiobutton.h> diff --git a/amarok/src/engine/nmm/nmm_configdialogbase.ui b/amarok/src/engine/nmm/nmm_configdialogbase.ui index bef5c7e0..c716be9c 100644 --- a/amarok/src/engine/nmm/nmm_configdialogbase.ui +++ b/amarok/src/engine/nmm/nmm_configdialogbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -130,7 +130,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -159,7 +159,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <vbox> <property name="name"> @@ -191,7 +191,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>1</height> @@ -214,7 +214,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/amarok/src/engine/nmm/nmm_engine.cpp b/amarok/src/engine/nmm/nmm_engine.cpp index 43b065de..f370974a 100644 --- a/amarok/src/engine/nmm/nmm_engine.cpp +++ b/amarok/src/engine/nmm/nmm_engine.cpp @@ -155,14 +155,14 @@ void NmmEngine::notifyHostError( TQString hostname, int error ) for( TQValueList<NmmLocation>::Iterator it = tmp_user_list.begin(); it != tmp_user_list.end(); ++it ) { if( (*it).hostname() == hostname ) { - (*it).settqStatus( error ); + (*it).setStatus( error ); break; } } for( TQValueList<NmmLocation>::Iterator it = tmp_environment_list.begin(); it != tmp_environment_list.end(); ++it ) { if( (*it).hostname() == hostname ) { - (*it).settqStatus( error ); + (*it).setStatus( error ); break; } } @@ -368,7 +368,7 @@ bool NmmEngine::load(const KURL& url, bool stream) if( NmmKDEConfig::location() == NmmKDEConfig::EnumLocation::LocalhostOnly ) { m_localhostonly_errordialog = true; - TQString detailed_status = HostListItem::prettytqStatus( error ); + TQString detailed_status = HostListItem::prettyStatus( error ); KMessageBox::detailedError( 0, i18n("Local NMM playback failed."), detailed_status, i18n("Error"), KMessageBox::AllowLink ); m_localhostonly_errordialog = false; } diff --git a/amarok/src/engine/nmm/nmm_engine.h b/amarok/src/engine/nmm/nmm_engine.h index 2b78b610..f2238fef 100644 --- a/amarok/src/engine/nmm/nmm_engine.h +++ b/amarok/src/engine/nmm/nmm_engine.h @@ -245,7 +245,7 @@ private: static NmmEngine* s_instance; public: - enum HosttqStatus { + enum HostStatus { STATUS_UNKNOWN = 0, STATUS_OK = 1 << 0, ERROR_PLAYBACKNODE = 1 << 1, diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp index 581923be..48353ac3 100644 --- a/amarok/src/engine/xine/xine-engine.cpp +++ b/amarok/src/engine/xine/xine-engine.cpp @@ -801,7 +801,7 @@ XineEngine::customEvent( TQCustomEvent *e ) break; case 3001: - emit infoMessage( (*message).tqarg( m_url.prettyURL() ) ); + emit infoMessage( (*message).arg( m_url.prettyURL() ) ); delete message; break; @@ -818,7 +818,7 @@ XineEngine::customEvent( TQCustomEvent *e ) } break; case 3004: - emit statusText( i18n("Redirecting to: ").tqarg( *message ) ); + emit statusText( i18n("Redirecting to: ").arg( *message ) ); load( KURL( *message ), false ); play(); delete message; @@ -923,8 +923,8 @@ XineEngine::XineEventListener( void *p, const xine_event_t* xineEvent ) TQString msg = "%1 %2%"; - msg = msg.tqarg( TQString::fromUtf8( pd->description ) ) - .tqarg( KGlobal::locale()->formatNumber( pd->percent, 0 ) ); + msg = msg.arg( TQString::fromUtf8( pd->description ) ) + .arg( KGlobal::locale()->formatNumber( pd->percent, 0 ) ); TQCustomEvent *e = new TQCustomEvent( 3002 ); e->setData( new TQString( msg ) ); @@ -1102,7 +1102,7 @@ bool XineEngine::metaDataForUrl(const KURL &url, Engine::SimpleMetaBundle &b) if( b.tracknr.isEmpty() ) b.tracknr = url.filename(); } else { - b.title = TQString(i18n("Track %1")).tqarg(url.filename()); + b.title = TQString(i18n("Track %1")).arg(url.filename()); b.album = i18n("AudioCD"); } } diff --git a/amarok/src/engine/xine/xineconfigbase.ui b/amarok/src/engine/xine/xineconfigbase.ui index a280f3e3..50e87bbf 100644 --- a/amarok/src/engine/xine/xineconfigbase.ui +++ b/amarok/src/engine/xine/xineconfigbase.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -68,13 +68,13 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -82,7 +82,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -90,7 +90,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -129,7 +129,7 @@ <property name="text"> <string>Sound device may be modified after the output plugin has been changed to ALSA or OSS.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -241,7 +241,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -278,7 +278,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -318,7 +318,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -376,7 +376,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -419,7 +419,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -435,7 +435,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -486,7 +486,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/amarok/src/engine/yauap/yauap-engine.cpp b/amarok/src/engine/yauap/yauap-engine.cpp index e9fef143..b3e8f0cd 100644 --- a/amarok/src/engine/yauap/yauap-engine.cpp +++ b/amarok/src/engine/yauap/yauap-engine.cpp @@ -646,7 +646,7 @@ yauapEngine::getAudioCDContents(const TQString &device, KURL::List &urls) KURL url = TQString(TQString("cdda://").append( strtok_r(reply_ptr,"=",&saveptr))); urls << url; debug() << url << endl; - b.title = TQString( i18n( "Track %1" ) ).tqarg( i+1 ); + b.title = TQString( i18n( "Track %1" ) ).arg( i+1 ); b.length = strtok_r(NULL,"=",&saveptr); b.album = "AudioCD"; b.tracknr = i+1; diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp index d41f5c75..200722e0 100644 --- a/amarok/src/enginecontroller.cpp +++ b/amarok/src/enginecontroller.cpp @@ -120,8 +120,8 @@ EngineController::loadEngine() //static Amarok::StatusBar::instance()->longMessage( i18n( "Sorry, the '%1' could not be loaded, instead we have loaded the '%2'." ) - .tqarg( AmarokConfig::soundSystem() ) - .tqarg( engineName ), + .arg( AmarokConfig::soundSystem() ) + .arg( engineName ), KDE::StatusBar::Sorry ); AmarokConfig::setSoundSystem( engineName ); @@ -143,7 +143,7 @@ EngineController::loadEngine( const TQString &engineName ) DEBUG_BLOCK TQString query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] != '%1'"; - KTrader::OfferList offers = PluginManager::query( query.tqarg( engineName ) ); + KTrader::OfferList offers = PluginManager::query( query.arg( engineName ) ); // sort by rank, TQValueList::operator[] is O(n), so this is quite inefficient #define rank( x ) (x)->property( "X-KDE-Amarok-rank" ).toInt() @@ -155,7 +155,7 @@ EngineController::loadEngine( const TQString &engineName ) // this is the actual engine we want query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] == '%1'"; - offers = PluginManager::query( query.tqarg( engineName ) ) + offers; + offers = PluginManager::query( query.arg( engineName ) ) + offers; foreachType( KTrader::OfferList, offers ) { Amarok::Plugin *plugin = PluginManager::createFromService( *it ); @@ -265,13 +265,13 @@ void EngineController::unplayableNotification() { "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine " "the installation of the multimedia-framework that the current engine uses. " "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." ) - .tqarg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error ); + .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error ); } bool EngineController::installDistroCodec( const TQString& engine /*Filetype type*/) { KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall" - , TQString("[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == '%1'").tqarg(engine) ).first(); + , TQString("[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == '%1'").arg(engine) ).first(); if( service ) { TQString installScript = service->exec(); diff --git a/amarok/src/equalizergraph.cpp b/amarok/src/equalizergraph.cpp index 7f4d2951..d1849a1f 100644 --- a/amarok/src/equalizergraph.cpp +++ b/amarok/src/equalizergraph.cpp @@ -51,7 +51,7 @@ EqualizerGraph::resizeEvent( TQResizeEvent* ) } TQSize -EqualizerGraph::tqsizeHint() const +EqualizerGraph::sizeHint() const { return TQSize( 100, 60 ); } @@ -65,11 +65,11 @@ EqualizerGraph::paintEvent( TQPaintEvent* ) // Draw middle line int middleLineY = (int) ( ( height() - 1 ) / 2.0 + AmarokConfig::equalizerPreamp() * ( height() - 1 ) / 200.0 ); - TQPen pen( tqcolorGroup().dark(), 0, TQt::DotLine); + TQPen pen( colorGroup().dark(), 0, TQt::DotLine); p.setPen( pen ); p.drawLine( 8, middleLineY, width() - 1, middleLineY ); - TQColor color( tqcolorGroup().highlight() ); + TQColor color( colorGroup().highlight() ); int h, s, v; color.getHsv( &h, &s, &v ); @@ -141,14 +141,14 @@ EqualizerGraph::drawBackground() m_backgroundPixmap->resize( size() ); m_composePixmap->resize( size() ); - m_backgroundPixmap->fill( tqcolorGroup().background().dark( 105 ) ); + m_backgroundPixmap->fill( colorGroup().background().dark( 105 ) ); TQPainter p( m_backgroundPixmap ); // Erase background for scale - p.fillRect( 0, 0, 7, height() -1, tqcolorGroup().background()); + p.fillRect( 0, 0, 7, height() -1, colorGroup().background()); // Draw scale - p.setPen( tqcolorGroup().shadow() ); + p.setPen( colorGroup().shadow() ); p.drawLine( 7, 0, 7, height() - 1 ); p.drawLine( 0, 0, 7, 0 ); p.drawLine( 0, height() / 2 - 1, 7, height() / 2 - 1 ); diff --git a/amarok/src/equalizergraph.h b/amarok/src/equalizergraph.h index de9cea6c..fbbf1e48 100644 --- a/amarok/src/equalizergraph.h +++ b/amarok/src/equalizergraph.h @@ -28,7 +28,7 @@ class EqualizerGraph : public TQWidget public: EqualizerGraph( TQWidget* parent ); ~EqualizerGraph(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: void resizeEvent( TQResizeEvent* ); diff --git a/amarok/src/equalizerpresetmanager.cpp b/amarok/src/equalizerpresetmanager.cpp index 02e9a8d4..bc1e94e9 100644 --- a/amarok/src/equalizerpresetmanager.cpp +++ b/amarok/src/equalizerpresetmanager.cpp @@ -21,7 +21,7 @@ #include <tqdom.h> #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqvbox.h> @@ -63,7 +63,7 @@ EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *na updateButtonState(); - resize( TQSize(300, 250).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(300, 250).expandedTo(minimumSizeHint()) ); } @@ -103,7 +103,7 @@ EqualizerPresetManager::slotRename() if ( ok && item->text(0) != title ) { // Check if the new preset title exists if ( m_presets.find( title ) != m_presets.end() ) { - int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).tqarg( title ) ); + int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).arg( title ) ); if ( button != KMessageBox::Yes ) return; diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp index ade7fead..23e0ecbf 100644 --- a/amarok/src/equalizersetup.cpp +++ b/amarok/src/equalizersetup.cpp @@ -29,10 +29,10 @@ #include <tqfile.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqstringlist.h> -#include <tqtextstream.h> //presets +#include <textstream.h> //presets #include <tqtooltip.h> #include <tqvbox.h> @@ -73,7 +73,7 @@ EqualizerSetup::EqualizerSetup() new TQLabel( i18n("Presets:"), presetBox ); m_presetCombo = new KComboBox( presetBox ); - m_presetCombo->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + m_presetCombo->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); TQPushButton* presetAdd = new TQPushButton( presetBox ); presetAdd->setIconSet( SmallIconSet( Amarok::icon( "add_playlist" ) ) ); @@ -98,7 +98,7 @@ EqualizerSetup::EqualizerSetup() // Helper widget for layouting inside the groupbox TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders ); - slidersLayoutWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + slidersLayoutWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); TQGridLayout* slidersGridLayout = new TQGridLayout( slidersLayoutWidget, 1, 1, 0, KDialog::spacingHint() ); // END GroupBox @@ -149,12 +149,12 @@ EqualizerSetup::EqualizerSetup() TQLabel* graphLabel1 = new TQLabel("+20 db", graphVBox); TQLabel* graphLabel2 = new TQLabel("0 db", graphVBox); TQLabel* graphLabel3 = new TQLabel("-20 db", graphVBox); - graphLabel1->tqsetAlignment( TQt::AlignRight | TQt::AlignTop ); - graphLabel2->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter ); - graphLabel3->tqsetAlignment( TQt::AlignRight | TQt::AlignBottom ); + graphLabel1->setAlignment( TQt::AlignRight | TQt::AlignTop ); + graphLabel2->setAlignment( TQt::AlignRight | TQt::AlignVCenter ); + graphLabel3->setAlignment( TQt::AlignRight | TQt::AlignBottom ); m_equalizerGraph = new EqualizerGraph( graphGBox ); - m_equalizerGraph->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_equalizerGraph->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); // END Graph Widget // Fill the combobox @@ -370,7 +370,7 @@ EqualizerSetup::addPreset() if (ok) { // Check if the new preset title exists if ( m_presets.find( title ) != m_presets.end() ) { - int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).tqarg( title ) ); + int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).arg( title ) ); if ( button != KMessageBox::Yes ) return; diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp index df79b622..424ed23b 100644 --- a/amarok/src/filebrowser.cpp +++ b/amarok/src/filebrowser.cpp @@ -145,7 +145,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium ) m_dir->setOnlyDoubleClickSelectsFiles( true ); //Amarok type settings m_dir->readConfig( Amarok::config( "Filebrowser" ) ); m_dir->setView( KFile::Default ); //will set userconfigured view, will load URL - m_dir->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); + m_dir->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); m_dir->setAcceptDrops( true ); //Automatically open folder after hovering above it...probably a good thing //but easily disabled by commenting this line out @@ -264,7 +264,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium ) setSpacing( 4 ); setFocusProxy( m_dir ); //so the dirOperator is focused when we get focus events // Toolbar is more than 250px wide, BrowserBar doesn't allow that. -> Resizing issues. - setMinimumWidth( 250 /* toolbar->tqsizeHint().width() */ ); + setMinimumWidth( 250 /* toolbar->sizeHint().width() */ ); } @@ -575,9 +575,9 @@ public: 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() ); } else { p.setPen( palette().color( TQPalette::Disabled, TQColorGroup::Text ) ); diff --git a/amarok/src/firstrunwizard.ui b/amarok/src/firstrunwizard.ui index 3ab4cc92..d5885635 100644 --- a/amarok/src/firstrunwizard.ui +++ b/amarok/src/firstrunwizard.ui @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -130,7 +130,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>257</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>194</height> @@ -197,7 +197,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>294</height> diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp index a9c6db44..5247766d 100644 --- a/amarok/src/htmlview.cpp +++ b/amarok/src/htmlview.cpp @@ -10,7 +10,7 @@ #include "htmlview.h" #include "playlist.h" //appendMedia() -#include <tqclipboard.h> +#include <clipboard.h> #include <tqfile.h> // External CSS opening #include <tqimage.h> // External CSS opening @@ -83,8 +83,8 @@ HTMLView::copyText() TQString text = selectedText(); // Copy both to clipboard and X11-selection - TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); + TQApplication::clipboard()->setText( text, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( text, TQClipboard::Selection ); } void HTMLView::paletteChange() { @@ -112,21 +112,21 @@ HTMLView::loadStyleSheet() const TQString fontFamily = AmarokConfig::useCustomFonts() ? AmarokConfig::contextBrowserFont().family() : TQApplication::font().family(); - const TQString text = ContextBrowser::instance()->tqcolorGroup().text().name(); - const TQString link = ContextBrowser::instance()->tqcolorGroup().link().name(); - const TQString fg = ContextBrowser::instance()->tqcolorGroup().highlightedText().name(); - const TQString bg = ContextBrowser::instance()->tqcolorGroup().highlight().name(); - const TQString base = ContextBrowser::instance()->tqcolorGroup().base().name(); - const TQColor bgColor = ContextBrowser::instance()->tqcolorGroup().highlight(); + const TQString text = ContextBrowser::instance()->colorGroup().text().name(); + const TQString link = ContextBrowser::instance()->colorGroup().link().name(); + const TQString fg = ContextBrowser::instance()->colorGroup().highlightedText().name(); + const TQString bg = ContextBrowser::instance()->colorGroup().highlight().name(); + const TQString base = ContextBrowser::instance()->colorGroup().base().name(); + const TQColor bgColor = ContextBrowser::instance()->colorGroup().highlight(); TQColor gradientColor = bgColor; //we have to set the color for body due to a KHTML bug //KHTML sets the base color but not the text color styleSheet = TQString( "body { margin: 8px; font-size: %1px; color: %2; background-color: %3; font-family: %4; }" ) - .tqarg( pxSize ) - .tqarg( text ) - .tqarg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) - .tqarg( fontFamily ); + .arg( pxSize ) + .arg( text ) + .arg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) + .arg( fontFamily ); TQTextStream eCSSts( &ExternalCSS ); TQString tmpCSS = eCSSts.read(); @@ -142,7 +142,7 @@ HTMLView::loadStyleSheet() tmpCSS.replace( "AMAROK_BGCOLOR", bg ); tmpCSS.replace( "AMAROK_FGCOLOR", fg ); tmpCSS.replace( "AMAROK_BASECOLOR", base ); - tmpCSS.replace( "AMAROK_DARKBASECOLOR", ContextBrowser::instance()->tqcolorGroup().base().dark( 120 ).name() ); + tmpCSS.replace( "AMAROK_DARKBASECOLOR", ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ); tmpCSS.replace( "AMAROK_GRADIENTCOLOR", gradientColor.name() ); styleSheet += tmpCSS; @@ -151,12 +151,12 @@ HTMLView::loadStyleSheet() { int pxSize = ContextBrowser::instance()->fontMetrics().height() - 4; const TQString fontFamily = AmarokConfig::useCustomFonts() ? AmarokConfig::contextBrowserFont().family() : TQApplication::font().family(); - const TQString text = ContextBrowser::instance()->tqcolorGroup().text().name(); - const TQString link = ContextBrowser::instance()->tqcolorGroup().link().name(); - const TQString fg = ContextBrowser::instance()->tqcolorGroup().highlightedText().name(); - const TQString bg = ContextBrowser::instance()->tqcolorGroup().highlight().name(); - const TQColor baseColor = ContextBrowser::instance()->tqcolorGroup().base(); - const TQColor bgColor = ContextBrowser::instance()->tqcolorGroup().highlight(); + const TQString text = ContextBrowser::instance()->colorGroup().text().name(); + const TQString link = ContextBrowser::instance()->colorGroup().link().name(); + const TQString fg = ContextBrowser::instance()->colorGroup().highlightedText().name(); + const TQString bg = ContextBrowser::instance()->colorGroup().highlight().name(); + const TQColor baseColor = ContextBrowser::instance()->colorGroup().base(); + const TQColor bgColor = ContextBrowser::instance()->colorGroup().highlight(); const TQColor gradientColor = bgColor; if ( !m_bgGradientImage ) { @@ -188,103 +188,103 @@ HTMLView::loadStyleSheet() //we have to set the color for body due to a KHTML bug //KHTML sets the base color but not the text color styleSheet = TQString( "body { margin: 4px; font-size: %1px; color: %2; background-color: %3; background-image: url( %4 ); background-repeat: repeat; font-family: %5; }" ) - .tqarg( pxSize ) - .tqarg( text ) - .tqarg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) - .tqarg( m_bgGradientImage->name() ) - .tqarg( fontFamily ); + .arg( pxSize ) + .arg( text ) + .arg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) + .arg( m_bgGradientImage->name() ) + .arg( fontFamily ); //text attributes - styleSheet += TQString( "h1 { font-size: %1px; }" ).tqarg( pxSize + 8 ); - styleSheet += TQString( "h2 { font-size: %1px; }" ).tqarg( pxSize + 6 ); - styleSheet += TQString( "h3 { font-size: %1px; }" ).tqarg( pxSize + 4 ); - styleSheet += TQString( "h4 { font-size: %1px; }" ).tqarg( pxSize + 3 ); - styleSheet += TQString( "h5 { font-size: %1px; }" ).tqarg( pxSize + 2 ); - styleSheet += TQString( "h6 { font-size: %1px; }" ).tqarg( pxSize + 1 ); - styleSheet += TQString( "a { font-size: %1px; color: %2; }" ).tqarg( pxSize ).tqarg( text ); + styleSheet += TQString( "h1 { font-size: %1px; }" ).arg( pxSize + 8 ); + styleSheet += TQString( "h2 { font-size: %1px; }" ).arg( pxSize + 6 ); + styleSheet += TQString( "h3 { font-size: %1px; }" ).arg( pxSize + 4 ); + styleSheet += TQString( "h4 { font-size: %1px; }" ).arg( pxSize + 3 ); + styleSheet += TQString( "h5 { font-size: %1px; }" ).arg( pxSize + 2 ); + styleSheet += TQString( "h6 { font-size: %1px; }" ).arg( pxSize + 1 ); + styleSheet += TQString( "a { font-size: %1px; color: %2; }" ).arg( pxSize ).arg( text ); styleSheet += TQString( ".info { display: block; margin-left: 4px; font-weight: normal; }" ); styleSheet += TQString( ".song a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" ); - styleSheet += TQString( ".song a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg ); + styleSheet += TQString( ".song a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg ); styleSheet += TQString( ".song-title { font-weight: bold; }" ); - styleSheet += TQString( ".song-place { font-size: %1px; font-weight: bold; }" ).tqarg( pxSize + 3 ); + styleSheet += TQString( ".song-place { font-size: %1px; font-weight: bold; }" ).arg( pxSize + 3 ); //box: the base container for every block (border hilighted on hover, 'A' without underlining) - styleSheet += TQString( ".box { border: solid %1 1px; text-align: left; margin-bottom: 10px; }" ).tqarg( bg ); + styleSheet += TQString( ".box { border: solid %1 1px; text-align: left; margin-bottom: 10px; }" ).arg( bg ); styleSheet += TQString( ".box a { text-decoration: none; }" ); - styleSheet += TQString( ".box:hover { border: solid %1 1px; }" ).tqarg( text ); + styleSheet += TQString( ".box:hover { border: solid %1 1px; }" ).arg( text ); //box contents: header, body, rows and alternate-rows styleSheet += TQString( ".box-header { color: %1; background-color: %2; background-image: url( %4 ); background-repeat: repeat-x; font-size: %3px; font-weight: bold; padding: 1px 0.5em; border-bottom: 1px solid #000; }" ) - .tqarg( fg ) - .tqarg( bg ) - .tqarg( pxSize + 2 ) - .tqarg( m_headerGradientImage->name() ); + .arg( fg ) + .arg( bg ) + .arg( pxSize + 2 ) + .arg( m_headerGradientImage->name() ); styleSheet += TQString( ".box-body { padding: 2px; background-color: %1; background-image: url( %2 ); background-repeat: repeat-x; font-size:%3px; }" ) - .tqarg( ContextBrowser::instance()->tqcolorGroup().base().name() ) - .tqarg( m_shadowGradientImage->name() ) - .tqarg( pxSize ); + .arg( ContextBrowser::instance()->colorGroup().base().name() ) + .arg( m_shadowGradientImage->name() ) + .arg( pxSize ); //"Related Artists" related styles styleSheet += TQString( ".box-header-nav { color: %1; background-color: %2; font-size: %3px; font-weight: bold; padding: 1px 0.5em; border-bottom: 1px solid #000; text-align: right; }" ) - .tqarg( fg ) - .tqarg( bg ) - .tqarg( pxSize ); + .arg( fg ) + .arg( bg ) + .arg( pxSize ); //"Albums by ..." related styles - styleSheet += TQString( ".album-header:hover { color: %1; background-color: %2; cursor: pointer; }" ).tqarg( fg ).tqarg( bg ); - styleSheet += TQString( ".album-header:hover a { color: %1; }" ).tqarg( fg ); - styleSheet += TQString( ".album-body { background-color: %1; border-bottom: solid %2 1px; border-top: solid %3 1px; }" ).tqarg( ContextBrowser::instance()->tqcolorGroup().base().name() ).tqarg( bg ).tqarg( bg ); + styleSheet += TQString( ".album-header:hover { color: %1; background-color: %2; cursor: pointer; }" ).arg( fg ).arg( bg ); + styleSheet += TQString( ".album-header:hover a { color: %1; }" ).arg( fg ); + styleSheet += TQString( ".album-body { background-color: %1; border-bottom: solid %2 1px; border-top: solid %3 1px; }" ).arg( ContextBrowser::instance()->colorGroup().base().name() ).arg( bg ).arg( bg ); styleSheet += TQString( ".album-title { font-weight: bold; }" ); - styleSheet += TQString( ".album-info { float:right; padding-right:4px; font-size: %1px }" ).tqarg( pxSize ); - styleSheet += TQString( ".album-length { float:right; padding-right:4px; font-size: %1px; clear:right; }" ).tqarg( pxSize ); + styleSheet += TQString( ".album-info { float:right; padding-right:4px; font-size: %1px }" ).arg( pxSize ); + styleSheet += TQString( ".album-length { float:right; padding-right:4px; font-size: %1px; clear:right; }" ).arg( pxSize ); styleSheet += TQString( ".album-image { padding-right: 4px; }" ); styleSheet += TQString( ".album-song a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" ); - styleSheet += TQString( ".album-song a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg ); + styleSheet += TQString( ".album-song a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg ); styleSheet += TQString( ".album-song-trackno { font-weight: bold; }" ); - styleSheet += TQString( ".disc-separator { color: %1; border-bottom: 1px solid %2; }" ).tqarg( bg ).tqarg( bg ); + styleSheet += TQString( ".disc-separator { color: %1; border-bottom: 1px solid %2; }" ).arg( bg ).arg( bg ); styleSheet += TQString( ".disc-separator a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" ); - styleSheet += TQString( ".disc-separator a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg ); + styleSheet += TQString( ".disc-separator a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg ); styleSheet += TQString( ".button { width: 100%; }" ); //boxes used to display score (sb: score box) styleSheet += TQString( ".sbtext { text-align: right; padding: 0px 4px; }" ); styleSheet += TQString( ".sbinner { height: 8px; background-color: %1; border: solid %2 1px; }" ) - .tqarg( ContextBrowser::instance()->tqcolorGroup().highlight().name() ) - .tqarg( ContextBrowser::instance()->tqcolorGroup().highlightedText().name() ); + .arg( ContextBrowser::instance()->colorGroup().highlight().name() ) + .arg( ContextBrowser::instance()->colorGroup().highlightedText().name() ); styleSheet += TQString( ".sbouter { width: 52px; height: 10px; background-color: %1; border: solid %2 1px; }" ) - .tqarg( ContextBrowser::instance()->tqcolorGroup().base().dark( 120 ).name() ) - .tqarg( ContextBrowser::instance()->tqcolorGroup().highlight().name() ); + .arg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ) + .arg( ContextBrowser::instance()->colorGroup().highlight().name() ); styleSheet += TQString( ".ratingBox { padding: 0px 4px; }" ); styleSheet += TQString( ".ratingStar { height: 0.9em; }" ); styleSheet += TQString( ".statsBox { border-left: solid %1 1px; }" ) - .tqarg( ContextBrowser::instance()->tqcolorGroup().base().dark( 120 ).name() ); + .arg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ); styleSheet += TQString( "#current_box-header-album { font-weight: normal; }" ); styleSheet += TQString( "#current_box-information-td { text-align: right; vertical-align: bottom; padding: 3px; }" ); styleSheet += TQString( "#current_box-largecover-td { text-align: left; width: 100px; padding: 0; vertical-align: bottom; }" ); styleSheet += TQString( "#current_box-largecover-image { padding: 4px; vertical-align: bottom; }" ); - styleSheet += TQString( "#wiki_box-body a { color: %1; }" ).tqarg( link ); + styleSheet += TQString( "#wiki_box-body a { color: %1; }" ).arg( link ); styleSheet += TQString( "#wiki_box-body a:hover { text-decoration: underline; }" ); //labels in tag dialog styleSheet += ".label a:hover { font-weight: bold; }"; - styleSheet += TQString( ".label.size1 { font-size: %1px; }" ).tqarg( pxSize ); - styleSheet += TQString( ".label.size2 { font-size: %1px; }" ).tqarg( pxSize + 1 ); - styleSheet += TQString( ".label.size3 { font-size: %1px; }" ).tqarg( pxSize + 2 ); - styleSheet += TQString( ".label.size4 { font-size: %1px; }" ).tqarg( pxSize + 3 ); - styleSheet += TQString( ".label.size5 { font-size: %1px; }" ).tqarg( pxSize + 4); - styleSheet += TQString( ".label.size6 { font-size: %1px; }" ).tqarg( pxSize + 5 ); - styleSheet += TQString( ".label.size7 { font-size: %1px; }" ).tqarg( pxSize + 6 ); - styleSheet += TQString( ".label.size8 { font-size: %1px; }" ).tqarg( pxSize + 7 ); - styleSheet += TQString( ".label.size9 { font-size: %1px; }" ).tqarg( pxSize + 8 ); - styleSheet += TQString( ".label.size10 { font-size: %1px; }" ).tqarg( pxSize + 9 ); + styleSheet += TQString( ".label.size1 { font-size: %1px; }" ).arg( pxSize ); + styleSheet += TQString( ".label.size2 { font-size: %1px; }" ).arg( pxSize + 1 ); + styleSheet += TQString( ".label.size3 { font-size: %1px; }" ).arg( pxSize + 2 ); + styleSheet += TQString( ".label.size4 { font-size: %1px; }" ).arg( pxSize + 3 ); + styleSheet += TQString( ".label.size5 { font-size: %1px; }" ).arg( pxSize + 4); + styleSheet += TQString( ".label.size6 { font-size: %1px; }" ).arg( pxSize + 5 ); + styleSheet += TQString( ".label.size7 { font-size: %1px; }" ).arg( pxSize + 6 ); + styleSheet += TQString( ".label.size8 { font-size: %1px; }" ).arg( pxSize + 7 ); + styleSheet += TQString( ".label.size9 { font-size: %1px; }" ).arg( pxSize + 8 ); + styleSheet += TQString( ".label.size10 { font-size: %1px; }" ).arg( pxSize + 9 ); } return styleSheet; diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp index 083b6b40..78c5437b 100644 --- a/amarok/src/konquisidebar/universalamarok.cpp +++ b/amarok/src/konquisidebar/universalamarok.cpp @@ -29,7 +29,7 @@ #include <tqwidget.h> #include <kglobal.h> #include <kstandarddirs.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <dcopclient.h> #include <kmessagebox.h> @@ -123,7 +123,7 @@ UniversalAmarok::UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widg fileInfo = new TQFileInfo(HTML_FILE); TQTimer *t = new TQTimer( this ); - connect( t, TQT_SIGNAL(timeout()), TQT_SLOT(updatetqStatus() ) ); + connect( t, TQT_SIGNAL(timeout()), TQT_SLOT(updateStatus() ) ); t->start( 2000, false ); kdDebug() << "Connecting widget signal" << endl; @@ -208,9 +208,9 @@ void UniversalAmarok::updateBrowser(const TQString& file) /*! - \fn UniversalAmarok::updatetqStatus() + \fn UniversalAmarok::updateStatus() */ -void UniversalAmarok::updatetqStatus() +void UniversalAmarok::updateStatus() { checkForAmarok(); vol_slider->setValue( playerStub->getVolume() ); diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h index f033101d..9c2ee242 100644 --- a/amarok/src/konquisidebar/universalamarok.h +++ b/amarok/src/konquisidebar/universalamarok.h @@ -84,7 +84,7 @@ private: public slots: void updateBrowser(const TQString&); - void updatetqStatus(); + void updateStatus(); void sendPrev() { checkForAmarok(); playerStub->prev(); } void sendPlay() { checkForAmarok(); playerStub->play(); } void sendPause() { checkForAmarok(); playerStub->pause(); } diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp index cc6e86bf..57d3a545 100644 --- a/amarok/src/ktrm.cpp +++ b/amarok/src/ktrm.cpp @@ -162,7 +162,7 @@ protected: short port; tp_GetServer(m_pimp, server, 255, &port); TQString tunepimpHost = TQString(server); - TQString tunepimpHostWithPort = (tunepimpHost + ":%1").tqarg(port); + TQString tunepimpHostWithPort = (tunepimpHost + ":%1").arg(port); for(TQStringList::ConstIterator it = noProxies.constBegin(); it != noProxies.constEnd(); ++it) { TQString normalizedHost = KNetwork::KResolver::normalizeDomain(*it); @@ -212,7 +212,7 @@ private: class KTRMEvent : public TQCustomEvent { public: - enum tqStatus { + enum Status { Recognized, Unrecognized, Collision, @@ -220,7 +220,7 @@ public: Error }; - KTRMEvent(int fileId, tqStatus status) : + KTRMEvent(int fileId, Status status) : TQCustomEvent(id), m_fileId(fileId), m_status(status) {} @@ -230,7 +230,7 @@ public: return m_fileId; } - tqStatus status() const + Status status() const { return m_status; } @@ -239,7 +239,7 @@ public: private: int m_fileId; - tqStatus m_status; + Status m_status; }; /** @@ -250,7 +250,7 @@ private: class KTRMEventHandler : public TQObject { public: - static void send(int fileId, KTRMEvent::tqStatus status) + static void send(int fileId, KTRMEvent::Status status) { KApplication::postEvent(instance(), new KTRMEvent(fileId, status)); } @@ -324,7 +324,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void */*data*/, TPCallbackEnum ty #if HAVE_TUNEPIMP < 4 track_t track = tp_GetTrack(pimp, fileId); - TPFiletqStatus status = tr_GettqStatus(track); + TPFileStatus status = tr_GetStatus(track); #endif //debug() << "Status is: " << status << endl; @@ -731,7 +731,7 @@ void KTRMLookup::puidGenerated() tp_ReleaseTrack(KTRMRequestHandler::instance()->tunePimp(), track); d->results.clear(); - KIO::Job *job = KIO::storedGet( TQString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).tqarg( puid ) , false, false ); + KIO::Job *job = KIO::storedGet( TQString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).arg( puid ) , false, false ); Amarok::StatusBar::instance()->newProgressOperation( job ) .setDescription( i18n( "MusicBrainz Lookup" ) ); diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp index 9fb03845..0d5f3937 100644 --- a/amarok/src/lastfm.cpp +++ b/amarok/src/lastfm.cpp @@ -61,9 +61,9 @@ int AmarokHttp::get ( const TQString & path ) { TQString uri = TQString( "http://%1:%2/%3" ) - .tqarg( m_hostname ) - .tqarg( m_port ) - .tqarg( path ); + .arg( m_hostname ) + .arg( m_port ) + .arg( path ); m_done = false; m_error = TQHttp::NoError; @@ -104,7 +104,7 @@ AmarokHttp::slotData(KIO::Job*, const TQByteArray& data) else if ( m_result.size() == 0 ) { m_result = data; } - else if ( m_result.tqresize( m_result.size() + data.size() ) ) { + else if ( m_result.resize( m_result.size() + data.size() ) ) { memcpy( m_result.end(), data.data(), data.size() ); } } @@ -308,17 +308,17 @@ Controller::stationDescription( TQString url ) /// TAG RADIOS // eg: lastfm://globaltag/rock if ( elements[1] == "globaltags" ) - return i18n( "Global Tag Radio: %1" ).tqarg( elements[2] ); + return i18n( "Global Tag Radio: %1" ).arg( elements[2] ); /// ARTIST RADIOS if ( elements[1] == "artist" ) { // eg: lastfm://artist/Queen/similarartists if ( elements[3] == "similarartists" ) - return i18n( "Similar Artists to %1" ).tqarg( elements[2] ); + return i18n( "Similar Artists to %1" ).arg( elements[2] ); if ( elements[3] == "fans" ) - return i18n( "Artist Fan Radio: %1" ).tqarg( elements[2] ); + return i18n( "Artist Fan Radio: %1" ).arg( elements[2] ); } /// CUSTOM STATION @@ -336,7 +336,7 @@ Controller::stationDescription( TQString url ) artists.replace( *it, capitalized ); } - return i18n( "Custom Station: %1" ).tqarg( artists ); + return i18n( "Custom Station: %1" ).arg( artists ); } /// USER RADIOS @@ -344,25 +344,25 @@ Controller::stationDescription( TQString url ) { // eg: lastfm://user/sebr/neighbours if ( elements[3] == "neighbours" ) - return i18n( "%1's Neighbor Radio" ).tqarg( elements[2] ); + return i18n( "%1's Neighbor Radio" ).arg( elements[2] ); // eg: lastfm://user/sebr/personal if ( elements[3] == "personal" ) - return i18n( "%1's Personal Radio" ).tqarg( elements[2] ); + return i18n( "%1's Personal Radio" ).arg( elements[2] ); // eg: lastfm://user/sebr/loved if ( elements[3] == "loved" ) - return i18n( "%1's Loved Radio" ).tqarg( elements[2] ); + return i18n( "%1's Loved Radio" ).arg( elements[2] ); // eg: lastfm://user/sebr/recommended/100 : 100 is number for how obscure the music should be if ( elements[3] == "recommended" ) - return i18n( "%1's Recommended Radio" ).tqarg( elements[2] ); + return i18n( "%1's Recommended Radio" ).arg( elements[2] ); } /// GROUP RADIOS //eg: lastfm://group/Amarok%20users else if ( elements[1] == "group" ) - return i18n( "Group Radio: %1" ).tqarg( elements[2] ); + return i18n( "Group Radio: %1" ).arg( elements[2] ); /// TRACK RADIOS else if ( elements[1] == "play" ) @@ -429,11 +429,11 @@ WebService::handshake( const TQString& username, const TQString& password ) const TQString path = TQString( "/radio/handshake.php?version=%1&platform=%2&username=%3&passwordmd5=%4&debug=%5" ) - .tqarg( APP_VERSION ) //Muesli-approved: Amarok version, and Amarok-as-platform - .tqarg( TQString("Amarok") ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) - .tqarg( KMD5( m_password.utf8() ).hexDigest().data() ) - .tqarg( "0" ); + .arg( APP_VERSION ) //Muesli-approved: Amarok version, and Amarok-as-platform + .arg( TQString("Amarok") ) + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) + .arg( KMD5( m_password.utf8() ).hexDigest().data() ) + .arg( "0" ); http.get( path ); @@ -478,7 +478,7 @@ WebService::handshake( const TQString& username, const TQString& password ) debug() << "Proxy server using port: " << port << endl; delete socket; - m_proxyUrl = TQString( "http://localhost:%1/lastfm.mp3" ).tqarg( port ); + m_proxyUrl = TQString( "http://localhost:%1/lastfm.mp3" ).arg( port ); m_server = new Amarok::ProcIO(); m_server->setComm( KProcess::Communication( KProcess::AllOutput ) ); @@ -523,8 +523,8 @@ WebService::changeStation( TQString url ) AmarokHttp http( m_baseHost, 80 ); http.get( TQString( m_basePath + "/adjust.php?session=%1&url=%2&debug=0" ) - .tqarg( m_session ) - .tqarg( url ) ); + .arg( m_session ) + .arg( url ) ); m_deletionUnsafe = true; do @@ -568,8 +568,8 @@ WebService::requestMetaData() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( metaDataFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/np.php?session=%1&debug=%2" ) - .tqarg( m_session ) - .tqarg( "0" ) ); + .arg( m_session ) + .arg( "0" ) ); } @@ -655,9 +655,9 @@ WebService::enableScrobbling( bool enabled ) //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( enableScrobblingFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=%2&debug=%3" ) - .tqarg( m_session ) - .tqarg( enabled ? TQString( "rtp" ) : TQString( "nortp" ) ) - .tqarg( "0" ) ); + .arg( m_session ) + .arg( enabled ? TQString( "rtp" ) : TQString( "nortp" ) ) + .arg( "0" ) ); } @@ -679,8 +679,8 @@ WebService::love() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( loveFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=love&debug=%2" ) - .tqarg( m_session ) - .tqarg( "0" ) ); + .arg( m_session ) + .arg( "0" ) ); Amarok::StatusBar::instance()->shortMessage( i18n("love, as in affection", "Loving song...") ); } @@ -692,8 +692,8 @@ WebService::skip() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( skipFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=skip&debug=%2" ) - .tqarg( m_session ) - .tqarg( "0" ) ); + .arg( m_session ) + .arg( "0" ) ); Amarok::StatusBar::instance()->shortMessage( i18n("Skipping song...") ); } @@ -705,8 +705,8 @@ WebService::ban() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( banFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=ban&debug=%2" ) - .tqarg( m_session ) - .tqarg( "0" ) ); + .arg( m_session ) + .arg( "0" ) ); Amarok::StatusBar::instance()->shortMessage( i18n("Ban, as in dislike", "Banning song...") ); } @@ -763,7 +763,7 @@ WebService::friends( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( friendsFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/friends.xml" ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -805,7 +805,7 @@ WebService::neighbours( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( neighboursFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/neighbours.xml" ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -847,7 +847,7 @@ WebService::userTags( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( userTagsFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/tags.xml?debug=%2" ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -889,7 +889,7 @@ WebService::recentTracks( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( recentTracksFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/recenttracks.xml" ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -931,35 +931,35 @@ WebService::recommend( int type, TQString username, TQString artist, TQString to switch ( type ) { case 0: - modeToken = TQString( "artist_name=%1" ).tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ); + modeToken = TQString( "artist_name=%1" ).arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ); break; case 1: modeToken = TQString( "album_artist=%1&album_name=%2" ) - .tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) - .tqarg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); + .arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) + .arg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); break; case 2: modeToken = TQString( "track_artist=%1&track_name=%2" ) - .tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) - .tqarg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); + .arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) + .arg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); break; } TQHttp *http = new TQHttp( "wsdev.audioscrobbler.com", 80, this ); connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( recommendFinished( bool ) ) ); - uint currentTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); + uint currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); TQString challenge = TQString::number( currentTime ); TQCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest(); token = TQString( "user=%1&auth=%2&nonce=%3recipient=%4" ) - .tqarg( TQString( TQUrl( currentUsername() ).encodedPathAndQuery() ) ) - .tqarg( TQString( TQUrl( md5pass ).encodedPathAndQuery() ) ) - .tqarg( TQString( TQUrl( challenge ).encodedPathAndQuery() ) ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ); + .arg( TQString( TQUrl( currentUsername() ).encodedPathAndQuery() ) ) + .arg( TQString( TQUrl( md5pass ).encodedPathAndQuery() ) ) + .arg( TQString( TQUrl( challenge ).encodedPathAndQuery() ) ) + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ); TQHttpRequestHeader header( "POST", "/1.0/rw/recommend.php?" + token.utf8() ); header.setValue( "Host", "wsdev.audioscrobbler.com" ); diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp index 6959139e..6a2b3fe2 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp +++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp @@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA. #include <tqcheckbox.h> #include <tqcombobox.h> -#include <tqtextedit.h> +#include <textedit.h> MagnatuneDownloadDialog::MagnatuneDownloadDialog( TQWidget *parent, const char *name, bool modal, WFlags fl ) diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui index 012aff43..4e1b02c2 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui @@ -92,7 +92,7 @@ <property name="text"> <string>If you download to a location that is already being monitored by Amarok, the album will automatically be added to your collection.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui index 71e66458..801226f3 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui @@ -48,13 +48,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>201</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>201</height> @@ -74,7 +74,7 @@ <property name="text"> <string>You have chosen to purchase the following album from Magnatune.com</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -158,7 +158,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>21</height> @@ -614,7 +614,7 @@ <property name="text"> <string>The amount you choose to pay will be split 50/50 between the artist and Magnatune.com. Your credit card information is sent directly to Magnatune.com using SSL encryption and is not stored by Amarok.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -656,7 +656,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui index cfa248fa..7026bd58 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>170</width> <height>20</height> diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp index 0e760495..ea17966c 100644 --- a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp +++ b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp @@ -48,9 +48,9 @@ MagnatuneXmlParser::completeJob( ) { Amarok::StatusBar::instance() ->longMessage( i18n( "Magnatune.com database update complete. Added %1 tracks on %2 albums from %3 artists" ) - .tqarg( m_nNumberOfTracks ) - .tqarg( m_nNumberOfAlbums ) - .tqarg( m_nNumberOfArtists ), KDE::StatusBar::Information ); + .arg( m_nNumberOfTracks ) + .arg( m_nNumberOfAlbums ) + .arg( m_nNumberOfArtists ), KDE::StatusBar::Information ); emit( doneParsing() ); } diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.h b/amarok/src/magnatunebrowser/magnatunexmlparser.h index 801e8fd7..f3d8346b 100644 --- a/amarok/src/magnatunebrowser/magnatunexmlparser.h +++ b/amarok/src/magnatunebrowser/magnatunexmlparser.h @@ -97,8 +97,8 @@ private: void parseElement( TQDomElement e ); /** - * Parses all tqchildren of a DOM element - * @param e The element whose tqchildren is to be parsed + * Parses all children of a DOM element + * @param e The element whose children is to be parsed */ void parseChildren( TQDomElement e ); diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp index 967ace1f..5a89e560 100644 --- a/amarok/src/mediabrowser.cpp +++ b/amarok/src/mediabrowser.cpp @@ -122,7 +122,7 @@ class SpaceLabel : public TQLabel { void paintEvent(TQPaintEvent *e) { TQPainter p(this); - p.fillRect(e->rect(), tqcolorGroup().brush(TQColorGroup::Background)); + p.fillRect(e->rect(), colorGroup().brush(TQColorGroup::Background)); if(m_total > 0) { @@ -165,7 +165,7 @@ class SpaceLabel : public TQLabel { if(scheduled > left) left = scheduled; int right = e->rect().right(); - p.fillRect(left, e->rect().top(), right, e->rect().bottom()+1, tqcolorGroup().brush(TQColorGroup::Background)); + p.fillRect(left, e->rect().top(), right, e->rect().bottom()+1, colorGroup().brush(TQColorGroup::Background)); } } TQLabel::paintEvent(e); @@ -630,11 +630,11 @@ MediaBrowser::updateDevices() TQString name = (*it)->name(); if( !(*it)->deviceNode().isEmpty() ) { - name = i18n( "%1 at %2" ).tqarg( name, (*it)->deviceNode() ); + name = i18n( "%1 at %2" ).arg( name, (*it)->deviceNode() ); } if( (*it)->hasMountPoint() && !(*it)->mountPoint().isEmpty() ) { - name += i18n( " (mounted at %1)" ).tqarg( (*it)->mountPoint() ); + name += i18n( " (mounted at %1)" ).arg( (*it)->mountPoint() ); } m_deviceCombo->insertItem( name, i ); if( it == m_currentDevice ) @@ -721,7 +721,7 @@ MediaBrowser::transcode( const KURL &src, const TQString &filetype ) while( m_waitForTranscode && sm->transcodeScriptRunning() != TQString() ) { usleep( 10000 ); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); } return m_transcodedUrl; @@ -1090,10 +1090,10 @@ MediaItem::compare( TQListViewItem *i, int col, bool ascending ) const else if( item && item->type() == MediaItem::ARTIST ) { TQString key1 = key( col, ascending ); - if( key1.tqstartsWith( "the ", false ) ) + if( key1.startsWith( "the ", false ) ) key1 = key1.mid( 4 ); TQString key2 = i->key( col, ascending ); - if( key2.tqstartsWith( "the ", false ) ) + if( key2.startsWith( "the ", false ) ) key2 = key2.mid( 4 ); return key1.localeAwareCompare( key2 ); @@ -1127,13 +1127,13 @@ class MediaItemTip : public TQToolTip { if( b->track() ) text = TQString( "%1 - %2 (%3)" ) - .tqarg( TQString::number(b->track()), b->title(), b->prettyLength() ); + .arg( TQString::number(b->track()), b->title(), b->prettyLength() ); if( !b->genre().isEmpty() ) { if( !text.isEmpty() ) text += "<br>"; text += TQString( "<i>Genre: %1</i>" ) - .tqarg( b->genre() ); + .arg( b->genre() ); } } } @@ -1164,7 +1164,7 @@ class MediaItemTip : public TQToolTip } if( !text.isEmpty() && !text.isNull() ) - tip( m_view->tqitemRect( i ), text ); + tip( m_view->itemRect( i ), text ); } TQListView *m_view; @@ -1498,9 +1498,9 @@ MediaView::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() ); } MediaBrowser::instance()->updateButtons(); } @@ -1629,7 +1629,7 @@ MediaBrowser::mediumChanged( const Medium *medium, TQString /*name*/ ) Amarok::StatusBar::instance()->longMessage( i18n( "The device %1 was unmounted before it was synchronized. " "In order to avoid data loss, press the \"Disconnect\" button " - "before unmounting the device." ).tqarg( name ), + "before unmounting the device." ).arg( name ), KDE::StatusBar::Warning ); //(*it)->disconnectDevice(); } @@ -1658,7 +1658,7 @@ MediaBrowser::mediumRemoved( const Medium *medium, TQString name ) Amarok::StatusBar::instance()->longMessage( i18n( "The device %1 was removed before it was disconnected. " "In order to avoid possible data loss, press the \"Disconnect\" " - "button before disconnecting the device." ).tqarg( name ), + "button before disconnecting the device." ).arg( name ), KDE::StatusBar::Warning ); } else @@ -1678,7 +1678,7 @@ MediaBrowser::loadDevicePlugin( const TQString &deviceType ) return 0; TQString query = "[X-KDE-Amarok-plugintype] == 'mediadevice' and [X-KDE-Amarok-name] == '%1'"; - Amarok::Plugin *plugin = PluginManager::createFromQuery( query.tqarg( deviceType ) ); + Amarok::Plugin *plugin = PluginManager::createFromQuery( query.arg( deviceType ) ); if( plugin ) { @@ -1839,13 +1839,13 @@ MediaBrowser::updateStats() TQString text = i18n( "1 track in queue", "%n tracks in queue", m_queue->childCount() ); if(m_queue->childCount() > 0) { - text += i18n(" (%1)").tqarg( KIO::convertSize( queued ) ); + text += i18n(" (%1)").arg( KIO::convertSize( queued ) ); } KIO::filesize_t total, avail; if( currentDevice() && currentDevice()->getCapacity(&total, &avail) ) { - text += i18n( " - %1 of %2 available" ).tqarg( KIO::convertSize( avail ) ).tqarg( KIO::convertSize( total ) ); + text += i18n( " - %1 of %2 available" ).arg( KIO::convertSize( avail ) ).arg( KIO::convertSize( total ) ); m_stats->m_used = total-avail; m_stats->m_total = total; @@ -1884,7 +1884,7 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent ) it = dynamic_cast<MediaItem *>(parent->firstChild()); } - bool tqchildrenVisible = false; + bool childrenVisible = false; for( ; it; it = dynamic_cast<MediaItem *>(it->nextSibling())) { bool visible = true; @@ -1929,13 +1929,13 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent ) visible = true; it->setVisible( visible ); if(visible) - tqchildrenVisible = true; + childrenVisible = true; } if( root && m_device ) m_device->updateRootItems(); - return tqchildrenVisible; + return childrenVisible; } MediaDevice::MediaDevice() @@ -2110,7 +2110,7 @@ MediaDevice::bundlesToSync( const TQString &name, const KURL &url ) BundleList bundles; if( !PlaylistFile::isPlaylistFile( url ) ) { - Amarok::StatusBar::instance()->longMessage( i18n( "Not a playlist file: %1" ).tqarg( url.path() ), + Amarok::StatusBar::instance()->longMessage( i18n( "Not a playlist file: %1" ).arg( url.path() ), KDE::StatusBar::Sorry ); return bundles; } @@ -2118,7 +2118,7 @@ MediaDevice::bundlesToSync( const TQString &name, const KURL &url ) PlaylistFile playlist( url.path() ); if( playlist.isError() ) { - Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).tqarg( url.path() ), + Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).arg( url.path() ), KDE::StatusBar::Sorry ); return bundles; } @@ -2253,7 +2253,7 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli if( playlist.isError() ) { - Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).tqarg( url.path() ), + Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).arg( url.path() ), KDE::StatusBar::Sorry ); return; } @@ -2295,7 +2295,7 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli if( it->url() == url ) { Amarok::StatusBar::instance()->shortMessage( - i18n( "Track already queued for transfer: %1" ).tqarg( url.url() ) ); + i18n( "Track already queued for transfer: %1" ).arg( url.url() ) ); return; } } @@ -2453,7 +2453,7 @@ int MediaDevice::sysCall( const TQString &command ) sysProc->clearArguments(); (*sysProc) << command; if (!sysProc->start( KProcess::Block, KProcess::AllOutput )) - kdFatal() << i18n("could not execute %1").tqarg(command.local8Bit().data()) << endl; + kdFatal() << i18n("could not execute %1").arg(command.local8Bit().data()) << endl; return (sysProc->exitStatus()); } @@ -2490,7 +2490,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst ) else { usleep(10000); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); } } @@ -2501,7 +2501,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst ) tryToRemove = true; Amarok::StatusBar::instance()->longMessage( i18n( "Media Device: Copying %1 to %2 failed" ) - .tqarg( src.prettyURL(), dst.prettyURL() ), + .arg( src.prettyURL(), dst.prettyURL() ), KDE::StatusBar::Error ); } else @@ -2512,7 +2512,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst ) tryToRemove = true; // probably s.th. went wrong Amarok::StatusBar::instance()->longMessage( - i18n( "Media Device: Reading tags from %1 failed" ).tqarg( dst.prettyURL() ), + i18n( "Media Device: Reading tags from %1 failed" ).arg( dst.prettyURL() ), KDE::StatusBar::Error ); } } @@ -2783,7 +2783,7 @@ MediaDevice::syncStatsFromDevice( MediaItem *root ) it = static_cast<MediaItem *>( root->firstChild() ); } - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); for( ; it; it = static_cast<MediaItem *>( it->nextSibling() ) ) { @@ -2885,7 +2885,7 @@ MediaDevice::syncStatsToDevice( MediaItem *root ) it = static_cast<MediaItem *>( root->firstChild() ); } - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); for( ; it; it = static_cast<MediaItem *>( it->nextSibling() ) ) { @@ -2958,7 +2958,7 @@ MediaDevice::transferFiles() delete transferredItem; setProgress( progress() + 1 ); m_parent->m_queue->itemCountChanged(); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); continue; } @@ -3051,7 +3051,7 @@ MediaDevice::transferFiles() if( !isPlayable( *bundle ) ) { - Amarok::StatusBar::instance()->shortMessage( i18n( "Track not playable on media device: %1" ).tqarg( bundle->url().path() ), + Amarok::StatusBar::instance()->shortMessage( i18n( "Track not playable on media device: %1" ).arg( bundle->url().path() ), KDE::StatusBar::Sorry ); unplayable += (*it).url(); transferredItem->setFailed(); @@ -3071,7 +3071,7 @@ MediaDevice::transferFiles() if( !isCanceled() ) { Amarok::StatusBar::instance()->longMessage( - i18n( "Failed to copy track to media device: %1" ).tqarg( bundle->url().path() ), + i18n( "Failed to copy track to media device: %1" ).arg( bundle->url().path() ), KDE::StatusBar::Sorry ); transferredItem->setFailed(); } @@ -3132,7 +3132,7 @@ MediaDevice::transferFiles() } m_parent->updateStats(); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); } synchronizeDevice(); unlockDevice(); diff --git a/amarok/src/mediadevice/daap/addhostbase.ui b/amarok/src/mediadevice/daap/addhostbase.ui index 7d7489a0..3df6bb40 100644 --- a/amarok/src/mediadevice/daap/addhostbase.ui +++ b/amarok/src/mediadevice/daap/addhostbase.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>64</height> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> @@ -95,7 +95,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp index d73a1f89..df78bf80 100644 --- a/amarok/src/mediadevice/daap/daapclient.cpp +++ b/amarok/src/mediadevice/daap/daapclient.cpp @@ -483,7 +483,7 @@ DaapClient::customClicked() if( dialog.exec() == TQDialog::Accepted ) { TQString ip = resolve( dialog.m_base->m_hostName->text() ); if( ip == "0" ) - Amarok::StatusBar::instance()->shortMessage( i18n("Could not resolve %1.").tqarg( dialog.m_base->m_hostName->text() ) ); + Amarok::StatusBar::instance()->shortMessage( i18n("Could not resolve %1.").arg( dialog.m_base->m_hostName->text() ) ); else { TQString key = ServerItem::key( dialog.m_base->m_hostName->text(), dialog.m_base->m_portInput->value() ); @@ -735,7 +735,7 @@ ServerItem::setOpen( bool o ) startAnimation(); connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); - setText( 0, i18n( "Loading %1").tqarg( text( 0 ) ) ); + setText( 0, i18n( "Loading %1").arg( text( 0 ) ) ); Daap::Reader* reader = new Daap::Reader( m_ip, m_port, this, TQString(), m_daapClient, ( m_ip + ":3689" ).ascii() ); @@ -781,7 +781,7 @@ ServerItem::httpError( const TQString& errorString ) { stopAnimation(); resetTitle(); - Amarok::StatusBar::instance()->longMessage( i18n( "The following error occurred while trying to connect to the remote server:<br>%1").tqarg( errorString ) ); + Amarok::StatusBar::instance()->longMessage( i18n( "The following error occurred while trying to connect to the remote server:<br>%1").arg( errorString ) ); m_reader->deleteLater(); m_reader = 0; m_loaded = false; diff --git a/amarok/src/mediadevice/daap/daapreader/reader.cpp b/amarok/src/mediadevice/daap/daapreader/reader.cpp index b0629c9d..38848ec6 100644 --- a/amarok/src/mediadevice/daap/daapreader/reader.cpp +++ b/amarok/src/mediadevice/daap/daapreader/reader.cpp @@ -258,7 +258,7 @@ Reader::databaseIdFinished( int /*id*/, bool error ) m_databaseId = TQString::number( dbIdResults["avdb"].asList()[0].asMap()["mlcl"].asList()[0].asMap()["mlit"].asList()[0].asMap()["miid"].asList()[0].asInt() ); connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( songListFinished( int, bool ) ) ); http->getDaap( TQString("/databases/%1/items?type=music&meta=dmap.itemid,dmap.itemname,daap.songformat,daap.songartist,daap.songalbum,daap.songtime,daap.songtracknumber,daap.songcomment,daap.songyear,daap.songgenre&%2") - .tqarg( m_databaseId, m_loginString ) ); + .arg( m_databaseId, m_loginString ) ); } @@ -388,7 +388,7 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first ) TQ_INT8 patchLevel; raw >> major >> minor >> patchLevel; DEBUGTAG( patchLevel ) TQString version("%1.%2.%3"); - version.tqarg(major, minor, patchLevel); + version.arg(major, minor, patchLevel); addElement( childMap, tag, TQVariant(version) ); } break; diff --git a/amarok/src/mediadevice/daap/daapserver.cpp b/amarok/src/mediadevice/daap/daapserver.cpp index af0fe7f9..1c987c8e 100644 --- a/amarok/src/mediadevice/daap/daapserver.cpp +++ b/amarok/src/mediadevice/daap/daapserver.cpp @@ -71,7 +71,7 @@ DaapServer::readSql() #if DNSSD_SUPPORT KUser current; if( !m_service ) - m_service = new DNSSD::PublicService( i18n("%1's Amarok Share").tqarg( current.fullName() ), "_daap._tcp", line.toInt() ); + m_service = new DNSSD::PublicService( i18n("%1's Amarok Share").arg( current.fullName() ), "_daap._tcp", line.toInt() ); debug() << "port number: " << line.toInt() << endl; m_service->publishAsync(); #endif diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb index 3f7b7e85..fa5c9c4e 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb @@ -73,7 +73,7 @@ module Mongrel @head['Server'] = options['server'] || env_table['SERVER_SOFTWARE'] # remaining possible options they can give - @head['tqStatus'] = options['status'] if options['status'] + @head['Status'] = options['status'] if options['status'] @head['Content-Language'] = options['language'] if options['language'] @head['Expires'] = options['expires'] if options['expires'] @@ -117,7 +117,7 @@ module Mongrel # The dumb thing is people can call header or this or both and in any order. # So, we just reuse header and then finalize the HttpResponse the right way. - # tqStatus is taken from the various options and converted to what Mongrel needs + # Status is taken from the various options and converted to what Mongrel needs # via the CGIWrapper.status function. # # We also prevent Rails from actually doing the final send by adding a diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb index cce1f36a..be7860a9 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb @@ -399,7 +399,7 @@ module Mongrel def process(request, response) response.start do |head,out| out.write <<-END - <html><body><title>Mongrel Server tqStatus</title> + <html><body><title>Mongrel Server Status</title> #{describe_listener} </body></html> END diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb index 2778fc77..8067d1ef 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb @@ -395,11 +395,11 @@ class TarReader end def close - tqinvalidate + invalidate end private - def tqinvalidate + def invalidate extend InvalidEntry end end diff --git a/amarok/src/mediadevice/daap/proxy.cpp b/amarok/src/mediadevice/daap/proxy.cpp index 8bf5cc0f..b1095cd4 100644 --- a/amarok/src/mediadevice/daap/proxy.cpp +++ b/amarok/src/mediadevice/daap/proxy.cpp @@ -56,7 +56,7 @@ Proxy::Proxy(KURL stream, DaapClient* client, const char* name) const int port = socket->port(); debug() << "Proxy server using port: " << port << endl; delete socket; - m_proxyUrl = KURL( TQString("http://localhost:%1/daap.mp3").tqarg( port ) ); + m_proxyUrl = KURL( TQString("http://localhost:%1/daap.mp3").arg( port ) ); //start proxy m_proxy->setComm( KProcess::Communication( KProcess::AllOutput ) ); *m_proxy << "amarok_proxy.rb"; diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp index 7a13253a..04c7f018 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.cpp +++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp @@ -113,7 +113,7 @@ class GenericMediaFile , m_device( device ) { m_listed = false; - m_tqchildren = new MediaFileList(); + m_children = new MediaFileList(); if( m_parent ) { @@ -152,8 +152,8 @@ class GenericMediaFile m_parent->removeChild( this ); m_device->getItemMap().erase( m_viewItem ); m_device->getFileMap().erase( m_fullName ); - if ( m_tqchildren ) - delete m_tqchildren; + if ( m_children ) + delete m_children; if ( m_viewItem ) delete m_viewItem; } @@ -174,7 +174,7 @@ class GenericMediaFile } void - removeChild( GenericMediaFile* childToDelete ) { m_tqchildren->remove( childToDelete ); } + removeChild( GenericMediaFile* childToDelete ) { m_children->remove( childToDelete ); } GenericMediaItem* getViewItem() { return m_viewItem; } @@ -209,15 +209,15 @@ class GenericMediaFile } MediaFileList* - getChildren() { return m_tqchildren; } + getChildren() { return m_children; } void deleteAll( bool onlyChildren ) { GenericMediaFile *vmf; - if( m_tqchildren && !m_tqchildren->isEmpty() ) + if( m_children && !m_children->isEmpty() ) { - MediaFileListIterator it( *m_tqchildren ); + MediaFileListIterator it( *m_children ); while( ( vmf = it.current() ) != 0 ) { ++it; @@ -232,9 +232,9 @@ class GenericMediaFile renameAllChildren() { GenericMediaFile *vmf; - if( m_tqchildren && !m_tqchildren->isEmpty() ) + if( m_children && !m_children->isEmpty() ) { - for( vmf = m_tqchildren->first(); vmf; vmf = m_tqchildren->next() ) + for( vmf = m_children->first(); vmf; vmf = m_children->next() ) vmf->renameAllChildren(); } setNamesFromBase(); @@ -244,7 +244,7 @@ class GenericMediaFile TQString m_fullName; TQString m_baseName; GenericMediaFile *m_parent; - MediaFileList *m_tqchildren; + MediaFileList *m_children; GenericMediaItem *m_viewItem; GenericMediaDevice* m_device; bool m_listed; @@ -626,7 +626,7 @@ GenericMediaDevice::buildPodcastDestination( const PodcastEpisodeBundle *bundle TQString name; while ( parent > 0 ) { - values = CollectionDB::instance()->query( sql.tqarg( parent ) ); + values = CollectionDB::instance()->query( sql.arg( parent ) ); name = values.first(); parent = values.last().toInt(); location += cleanPath( name ) + '/'; @@ -653,7 +653,7 @@ GenericMediaDevice::copyTrackToDevice( const MetaBundle& bundle ) const KURL desturl = KURL::fromPathOrURL( path ); - //kapp->tqprocessEvents( 100 ); + //kapp->processEvents( 100 ); if( !kioCopyTrack( bundle.url(), desturl ) ) { @@ -667,7 +667,7 @@ GenericMediaDevice::copyTrackToDevice( const MetaBundle& bundle ) //other than to see if it is NULL or not //if we're here the transfer shouldn't have failed, so we shouldn't get into a loop by waiting... while( !m_view->firstChild() ) - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); return static_cast<MediaItem*>(m_view->firstChild()); } @@ -774,7 +774,7 @@ GenericMediaDevice::expandItem( TQListViewItem *item ) // SLOT while( !m_dirListerComplete ) { - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); usleep(10000); } } @@ -866,10 +866,10 @@ GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ ) //or just update the list in the plugin as appropriate else if( type == MediaItem::TRACK ) //file { - if( baseName.tqendsWith( "mp3", false ) || baseName.tqendsWith( "wma", false ) || - baseName.tqendsWith( "wav", false ) || baseName.tqendsWith( "ogg", false ) || - baseName.tqendsWith( "asf", false ) || baseName.tqendsWith( "flac", false ) || - baseName.tqendsWith( "aac", false ) || baseName.tqendsWith( "m4a", false ) ) + if( baseName.endsWith( "mp3", false ) || baseName.endsWith( "wma", false ) || + baseName.endsWith( "wav", false ) || baseName.endsWith( "ogg", false ) || + baseName.endsWith( "asf", false ) || baseName.endsWith( "flac", false ) || + baseName.endsWith( "aac", false ) || baseName.endsWith( "m4a", false ) ) newItem->getViewItem()->setType( MediaItem::TRACK ); @@ -898,7 +898,7 @@ GenericMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *availa while( m_kBSize == 0 && m_kBAvail == 0){ usleep( 10000 ); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); count++; if (count > 120){ debug() << "KDiskFreeSp taking too long. Returning false from getCapacity()" << endl; diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui index 8a305909..e3468e17 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout88</cstring> + <cstring>layout88</cstring> </property> <vbox> <property name="name"> @@ -88,7 +88,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -96,7 +96,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <vbox> <property name="name"> @@ -133,7 +133,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <vbox> <property name="name"> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>93</height> @@ -221,7 +221,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout120</cstring> + <cstring>layout120</cstring> </property> <vbox> <property name="name"> @@ -229,7 +229,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout119</cstring> + <cstring>layout119</cstring> </property> <grid> <property name="name"> @@ -277,7 +277,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout96</cstring> + <cstring>layout96</cstring> </property> <vbox> <property name="name"> @@ -293,7 +293,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout86</cstring> + <cstring>layout86</cstring> </property> <hbox> <property name="name"> diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h index 43a06603..64d1d0fe 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h @@ -255,10 +255,10 @@ GenericMediaDeviceConfigDialog::buildFormatTip() continue; args[MetaBundle::exactColumnName( i ).lower()] = MetaBundle::prettyColumnName( i ); } - args["albumartist"] = i18n( "%1 or %2" ).tqarg( "Album Artist, The" , "The Album Artist" ); + args["albumartist"] = i18n( "%1 or %2" ).arg( "Album Artist, The" , "The Album Artist" ); args["thealbumartist"] = "The Album Artist"; args["theartist"] = "The Artist"; - args["artist"] = i18n( "%1 or %2" ).tqarg( "Artist, The" , "The Artist" ); + args["artist"] = i18n( "%1 or %2" ).arg( "Artist, The" , "The Artist" ); args["initial"] = i18n( "Artist's Initial" ); args["filetype"] = i18n( "File Extension of Source" ); args["track"] = i18n( "Track Number" ); @@ -270,7 +270,7 @@ GenericMediaDeviceConfigDialog::buildFormatTip() it != args.end(); ++it ) { - tooltip += TQString( "<li>%1 - %2" ).tqarg( it.data(), "%" + it.key() ); + tooltip += TQString( "<li>%1 - %2" ).arg( it.data(), "%" + it.key() ); } tooltip += "</ul>"; diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp index f1df4e76..7a010f4f 100644 --- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp +++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp @@ -419,7 +419,7 @@ IfpMediaDevice::copyTrackToDevice( const MetaBundle& bundle ) const TQCString dest = TQFile::encodeName( cleanPath(directory + newFilename) ); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); int result = uploadTrack( src, dest ); if( !result ) //success @@ -486,7 +486,7 @@ IfpMediaDevice::filetransferCallback( void *pData, struct ifp_transfer_status *p { // will be called by 'ifp_upload_file' by callback - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); IfpMediaDevice *that = static_cast<IfpMediaDevice *>(pData); @@ -526,14 +526,14 @@ IfpMediaDevice::deleteItemFromDevice( MediaItem *item, int /*flags*/ ) case MediaItem::DIRECTORY: err = ifp_delete_dir_recursive( &m_ifpdev, encodedPath ); debug() << "Deleting folder: " << encodedPath << endl; - checkResult( err, i18n("Directory cannot be deleted: '%1'").tqarg(encodedPath.data()) ); + checkResult( err, i18n("Directory cannot be deleted: '%1'").arg(encodedPath.data()) ); break; default: err = ifp_delete( &m_ifpdev, encodedPath ); debug() << "Deleting file: " << encodedPath << endl; count += 1; - checkResult( err, i18n("File does not exist: '%1'").tqarg(encodedPath.data()) ); + checkResult( err, i18n("File does not exist: '%1'").arg(encodedPath.data()) ); break; } if( err == 0 ) //success @@ -564,7 +564,7 @@ void IfpMediaDevice::listDir( const TQString &dir ) { int err = ifp_list_dirs( &m_ifpdev, TQFile::encodeName( dir ), listDirCallback, this ); - checkResult( err, i18n("Cannot enter directory: '%1'").tqarg(dir) ); + checkResult( err, i18n("Cannot enter directory: '%1'").arg(dir) ); } // will be called by 'ifp_list_dirs' @@ -587,9 +587,9 @@ IfpMediaDevice::addTrackToList( int type, TQString name, int /*size*/ ) else if( type == IFP_FILE ) //file { - if( name.tqendsWith( "mp3", false ) || name.tqendsWith( "wma", false ) || - name.tqendsWith( "wav", false ) || name.tqendsWith( "ogg", false ) || - name.tqendsWith( "asf", false ) ) + if( name.endsWith( "mp3", false ) || name.endsWith( "wma", false ) || + name.endsWith( "wav", false ) || name.endsWith( "ogg", false ) || + name.endsWith( "asf", false ) ) m_last->setType( MediaItem::TRACK ); diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index 2dd6e8c5..b68e819c 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp @@ -316,13 +316,13 @@ IpodMediaDevice::IpodMediaDevice() } if( info->capacity > 0.f ) gen->insertItem( i18n( "%1 GB %2 (x%3)" ) - .tqarg( TQString::number( info->capacity ), + .arg( TQString::number( info->capacity ), itdb_info_get_ipod_model_name_string( info->ipod_model ), info->model_number ), index ); else gen->insertItem( i18n( "%1 (x%2)" ) - .tqarg( itdb_info_get_ipod_model_name_string( info->ipod_model ), + .arg( itdb_info_get_ipod_model_name_string( info->ipod_model ), info->model_number ), index ); } @@ -385,12 +385,12 @@ IpodMediaDevice::slotIpodAction( int id ) g_error_free(err); //FIXME: update i18n files for next message Amarok::StatusBar::instance()->longMessage( - i18n( "Could not write SysInfo file to iPod (check the permissions of the file \"%1\" on your iPod)" ).tqarg( itunesDir( "Device:SysInfo" ) ) ); + i18n( "Could not write SysInfo file to iPod (check the permissions of the file \"%1\" on your iPod)" ).arg( itunesDir( "Device:SysInfo" ) ) ); //FIXME: update i18n files for next message Amarok::StatusBar::instance()->shortMessage( i18n( "Unable to set iPod model to %1 GB %2 (x%3)" ) - .tqarg( TQString::number( table[index].capacity ), + .arg( TQString::number( table[index].capacity ), itdb_info_get_ipod_model_name_string( table[index].ipod_model ), table[index].model_number ) ); } @@ -398,7 +398,7 @@ IpodMediaDevice::slotIpodAction( int id ) { Amarok::StatusBar::instance()->shortMessage( i18n( "Setting iPod model to %1 GB %2 (x%3)" ) - .tqarg( TQString::number( table[index].capacity ), + .arg( TQString::number( table[index].capacity ), itdb_info_get_ipod_model_name_string( table[index].ipod_model ), table[index].model_number ) ); } @@ -515,7 +515,7 @@ IpodMediaDevice::updateTrackInDB( IpodMediaItem *item, const TQString &pathname, TQString genre = metaBundle.genre(); - if( genre.tqstartsWith("audiobook", false) ) + if( genre.startsWith("audiobook", false) ) audiobook = true; if( audiobook ) { @@ -684,7 +684,7 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle) if ( !dir.exists() ) { Amarok::StatusBar::instance()->longMessage( - i18n( "Media Device: Creating directory for file %1 failed" ).tqarg( url.path() ), + i18n( "Media Device: Creating directory for file %1 failed" ).arg( url.path() ), KDE::StatusBar::Error ); return NULL; } @@ -962,7 +962,7 @@ IpodMediaDevice::deleteItemFromDevice(MediaItem *mediaitem, int flags ) if(!(flags & OnlyPlayed) || item->played() > 0 || item->childCount() == 0) { if(item->childCount() > 0) - debug() << "recursive deletion should have removed all tqchildren from " << item << "(" << item->text(0) << ")" << endl; + debug() << "recursive deletion should have removed all children from " << item << "(" << item->text(0) << ")" << endl; else delete item; } @@ -992,9 +992,9 @@ IpodMediaDevice::createLockFile( bool silent ) if( m_lockFile->exists() ) { ok = false; - msg = i18n( "Media Device: iPod mounted at %1 already locked. " ).tqarg( mountPoint() ); + msg = i18n( "Media Device: iPod mounted at %1 already locked. " ).arg( mountPoint() ); msg += i18n( "If you are sure that this is an error, then remove the file %1 and try again." ) - .tqarg( lockFilePath ); + .arg( lockFilePath ); if( !silent ) { @@ -1003,7 +1003,7 @@ IpodMediaDevice::createLockFile( bool silent ) == KMessageBox::Continue ) { msg = i18n( "Media Device: removing lockfile %1 failed: %2. " ) - .tqarg( lockFilePath, m_lockFile->errorString() ); + .arg( lockFilePath, m_lockFile->errorString() ); ok = m_lockFile->remove(); } else @@ -1017,7 +1017,7 @@ IpodMediaDevice::createLockFile( bool silent ) { ok = false; msg = i18n( "Media Device: failed to create lockfile on iPod mounted at %1: %2" ) - .tqarg(mountPoint(), m_lockFile->errorString()); + .arg(mountPoint(), m_lockFile->errorString()); } if( ok ) @@ -1038,7 +1038,7 @@ IpodMediaDevice::initializeIpod() if( !dir.exists() ) { Amarok::StatusBar::instance()->longMessage( - i18n("Media device: Mount point %1 does not exist").tqarg(mountPoint()), + i18n("Media device: Mount point %1 does not exist").arg(mountPoint()), KDE::StatusBar::Error ); return false; } @@ -1091,7 +1091,7 @@ IpodMediaDevice::initializeIpod() return false; Amarok::StatusBar::instance()->longMessage( - i18n("Media Device: Initialized iPod mounted at %1").tqarg(mountPoint()), + i18n("Media Device: Initialized iPod mounted at %1").arg(mountPoint()), KDE::StatusBar::Information ); return true; @@ -1113,7 +1113,7 @@ IpodMediaDevice::openDevice( bool silent ) if( m_itdb ) { Amarok::StatusBar::instance()->longMessage( - i18n("Media Device: iPod at %1 already opened").tqarg(mountPoint()), + i18n("Media Device: iPod at %1 already opened").arg(mountPoint()), KDE::StatusBar::Sorry ); return false; } @@ -1185,7 +1185,7 @@ IpodMediaDevice::openDevice( bool silent ) if( !m_itdb && canInitialize ) { TQString msg = i18n( "Media Device: could not find iTunesDB on device mounted at %1. " - "Should I try to initialize your iPod?" ).tqarg( mountPoint() ); + "Should I try to initialize your iPod?" ).arg( mountPoint() ); if( !silent && KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Initialize iPod?" ), @@ -1200,7 +1200,7 @@ IpodMediaDevice::openDevice( bool silent ) } Amarok::StatusBar::instance()->longMessage( - i18n("Media Device: Failed to initialize iPod mounted at %1").tqarg(mountPoint()), + i18n("Media Device: Failed to initialize iPod mounted at %1").arg(mountPoint()), KDE::StatusBar::Sorry ); return false; @@ -1236,7 +1236,7 @@ IpodMediaDevice::openDevice( bool silent ) { debug() << "failed to create hash dir " << real << endl; Amarok::StatusBar::instance()->longMessage( - i18n("Media device: Failed to create directory %1").tqarg(real), + i18n("Media device: Failed to create directory %1").arg(real), KDE::StatusBar::Error ); return false; } @@ -1244,7 +1244,7 @@ IpodMediaDevice::openDevice( bool silent ) } if( !silent ) - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); initView(); GList *cur = m_itdb->playlists; @@ -1255,7 +1255,7 @@ IpodMediaDevice::openDevice( bool silent ) } if( !silent ) - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); for( cur = m_itdb->tracks; cur; cur = cur->next ) { @@ -1264,7 +1264,7 @@ IpodMediaDevice::openDevice( bool silent ) } if( !silent ) - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); updateRootItems(); m_customAction->setEnabled( true ); @@ -1364,7 +1364,7 @@ IpodMediaDevice::detectModel() #endif } if( modelString ) - m_name = TQString( "iPod %1" ).tqarg( TQString::fromUtf8( modelString ) ); + m_name = TQString( "iPod %1" ).arg( TQString::fromUtf8( modelString ) ); if( m_needsFirewireGuid ) { @@ -1372,7 +1372,7 @@ IpodMediaDevice::detectModel() if( !fwid ) { Amarok::StatusBar::instance()->longMessage( - i18n("Your iPod's Firewire GUID is required for correctly updating its music database, but it is not known. See %1 for more information.").tqarg( "http://amarok.kde.org/wiki/Media_Device:IPod" ) ); + i18n("Your iPod's Firewire GUID is required for correctly updating its music database, but it is not known. See %1 for more information.").arg( "http://amarok.kde.org/wiki/Media_Device:IPod" ) ); } else g_free( fwid ); @@ -2693,7 +2693,7 @@ IpodMediaDevice::deleteFile( const KURL &url ) this, TQT_SLOT( fileDeleted( KIO::Job * ) ) ); do { - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); if( isCanceled() ) break; usleep( 10000 ); diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp index 97952ce4..8e0fa969 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp @@ -139,7 +139,7 @@ MtpMediaDevice::progressCallback( uint64_t const sent, uint64_t const total, voi Q_UNUSED( sent ); Q_UNUSED( total ); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); MtpMediaDevice *dev = (MtpMediaDevice*)(data); @@ -321,7 +321,7 @@ MediaItem LIBMTP_destroy_track_t( trackmeta ); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); // add track to view and to new tracks list MediaItem *newItem = addTrackToView( taggedTrack ); @@ -436,7 +436,7 @@ MtpMediaDevice::updateAlbumArt( TQPtrList<MediaItem> *items ) setCanceled( false ); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); TQMap< TQString, TQPtrList<MediaItem> > albumList; for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it && !(m_canceled); it = dynamic_cast<MtpMediaItem*>(items->next()) ) @@ -453,14 +453,14 @@ MtpMediaDevice::updateAlbumArt( TQPtrList<MediaItem> *items ) } int i = 0; setProgress( i, albumList.count() ); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); TQMap< TQString, TQPtrList<MediaItem> >::Iterator it; for( it = albumList.begin(); it != albumList.end(); ++it ) { sendAlbumArt( &it.data() ); setProgress( ++i ); if( i % 20 == 0 ) - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); } hideProgress(); } @@ -756,7 +756,7 @@ MediaItem } } uint32_t folderId = checkFolderStructure( bundle, false ); - MediaItem *file = m_fileNameToItem[ TQString( "%1/%2" ).tqarg( folderId ).tqarg( bundle.filename() ) ]; + MediaItem *file = m_fileNameToItem[ TQString( "%1/%2" ).arg( folderId ).arg( bundle.filename() ) ]; if( file != 0 ) return file; return 0; @@ -1050,10 +1050,10 @@ MtpMediaDevice::deleteObject( MtpMediaItem *deleteItem ) // clear cached filename if( deleteItem->type() == MediaItem::TRACK ) - m_fileNameToItem.remove( TQString( "%1/%2" ).tqarg( deleteItem->track()->folderId() ).tqarg( deleteItem->bundle()->filename() ) ); + m_fileNameToItem.remove( TQString( "%1/%2" ).arg( deleteItem->track()->folderId() ).arg( deleteItem->bundle()->filename() ) ); // remove from the media view delete deleteItem; - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); return 1; } @@ -1454,7 +1454,7 @@ MtpMediaItem item->setType( MediaItem::TRACK ); item->setBundle( track->bundle() ); item->track()->setId( track->id() ); - m_fileNameToItem[ TQString( "%1/%2" ).tqarg( track->folderId() ).tqarg( track->bundle()->filename() ) ] = item; + m_fileNameToItem[ TQString( "%1/%2" ).arg( track->folderId() ).arg( track->bundle()->filename() ) ] = item; m_idToTrack[ track->id() ] = track; } return item; @@ -1478,7 +1478,7 @@ MtpMediaDevice::readMtpMusic() int progress = 0; setProgress( progress, total ); // we don't know how many tracks. fake progress bar. - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); LIBMTP_track_t *tracks = LIBMTP_Get_Tracklisting_With_Callback( m_device, progressCallback, this ); @@ -1512,7 +1512,7 @@ MtpMediaDevice::readMtpMusic() progress++; setProgress( progress ); if( progress % 50 == 0 ) - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); } } @@ -1562,7 +1562,7 @@ MtpMediaDevice::readPlaylists() tmp = playlists; playlists = playlists->next; LIBMTP_destroy_playlist_t( tmp ); - kapp->tqprocessEvents( 50 ); + kapp->processEvents( 50 ); } } } @@ -1585,7 +1585,7 @@ MtpMediaDevice::readAlbums() tmp = albums; albums = albums->next; LIBMTP_destroy_album_t( tmp ); - kapp->tqprocessEvents( 50 ); + kapp->processEvents( 50 ); } } } diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp index ea07df5f..04d4ce05 100644 --- a/amarok/src/mediadevice/njb/njbmediadevice.cpp +++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp @@ -452,7 +452,7 @@ NjbMediaDevice::copyTrackToDevice(const MetaBundle& bundle) njb_songid_t* songid = NJB_Songid_New(); taggedTrack->writeToSongid( songid ); m_busy = true; - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); if(NJB_Send_Track (m_njb, bundle.url().path().utf8(), songid, progressCallback, this, &id) != NJB_SUCCESS) { debug() << ": NJB_Send_Track failed\n"; @@ -687,7 +687,7 @@ NjbMediaDevice::runTransferDialog() int NjbMediaDevice::progressCallback( u_int64_t sent, u_int64_t total, const char* /*buf*/, unsigned /*len*/, void* data) { - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); NjbMediaDevice *njb_media = reinterpret_cast<NjbMediaDevice*>(data); @@ -733,7 +733,7 @@ NjbMediaDevice::readJukeboxMusic( void ) m_playlistItem->m_order = -5; m_playlistItem->setType( MediaItem::PLAYLISTSROOT );*/ - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); for( trackValueList::iterator it = trackList.begin(); it != trackList.end(); it++ ) { @@ -804,7 +804,7 @@ void NjbMediaDevice::expandItem( TQListViewItem *item ) { DEBUG_BLOCK - // First clear the item's tqchildren to repopulate. + // First clear the item's children to repopulate. while( item->firstChild() ) delete item->firstChild(); @@ -886,7 +886,7 @@ NjbMediaDevice::customClicked() { TQString Information; TQString tracksFound; - TQString powertqStatus; + TQString powerStatus; TQString batteryLevel; TQString batteryCharging; @@ -894,12 +894,12 @@ NjbMediaDevice::customClicked() { tracksFound = i18n( "1 track found on device", "%n tracks found on device ", trackList.size() ); - powertqStatus = ( (NJB_Get_Auxpower( m_njb ) == 1) ? i18n("On auxiliary power") : i18n("On main power") ); + powerStatus = ( (NJB_Get_Auxpower( m_njb ) == 1) ? i18n("On auxiliary power") : i18n("On main power") ); batteryCharging = ( (NJB_Get_Battery_Charging( m_njb ) == 1) ? i18n("Battery charging") : i18n("Battery not charging") ); batteryLevel = (i18n("Battery level: ") + TQString::number( NJB_Get_Battery_Level( m_njb ) ) ); Information = ( i18n("Player Information for ") + m_name +'\n' + - i18n("Power status: ") + powertqStatus + '\n' + + i18n("Power status: ") + powerStatus + '\n' + i18n("Battery status: ") + batteryLevel + " (" + batteryCharging + ')' ); } diff --git a/amarok/src/mediadevice/njb/playlist.cpp b/amarok/src/mediadevice/njb/playlist.cpp index 7afeffd6..6f82dd7f 100644 --- a/amarok/src/mediadevice/njb/playlist.cpp +++ b/amarok/src/mediadevice/njb/playlist.cpp @@ -295,7 +295,7 @@ playlistValueList::readFromDevice( void) NJB_Reset_Get_Playlist( NjbMediaDevice::theNjb()); while( njb_playlist_t* pl = NJB_Get_Playlist( NjbMediaDevice::theNjb()) ) { // FIXME (acejones) Make this a signal - // infoMessage( i18n( "Downloading playlist %1...").tqarg( ++playlists)); + // infoMessage( i18n( "Downloading playlist %1...").arg( ++playlists)); ++playlists; append( NjbPlaylist(pl)); NJB_Playlist_Destroy( pl); diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp index 7dc83c33..df55f032 100644 --- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp +++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp @@ -288,7 +288,7 @@ RioKarmaMediaDevice::openDevice( bool silent ) if( !dir.exists() ) { Amarok::StatusBar::instance()->longMessage( - i18n( "Media device: Mount point %1 does not exist" ).tqarg( mountPoint() ), + i18n( "Media device: Mount point %1 does not exist" ).arg( mountPoint() ), KDE::StatusBar::Error ); return false; } diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp index d2f3ba1a..3c83ede4 100644 --- a/amarok/src/mediumpluginmanager.cpp +++ b/amarok/src/mediumpluginmanager.cpp @@ -25,7 +25,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsignalmapper.h> #include <tqtooltip.h> #include <tqvbox.h> @@ -52,22 +52,22 @@ MediumPluginManagerDialog::MediumPluginManagerDialog() TQVBox* vbox = makeVBoxMainWidget(); vbox->setSpacing( KDialog::spacingHint() ); - vbox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + vbox->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); m_location = new TQGroupBox( 1, Qt::Vertical, i18n( "Devices" ), vbox ); - m_location->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + m_location->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); m_devicesBox = new TQVBox( m_location ); - m_devicesBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + m_devicesBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); m_manager = new MediumPluginManager( m_devicesBox ); TQHBox *hbox = new TQHBox( vbox ); KPushButton *detectDevices = new KPushButton( i18n( "Autodetect Devices" ), hbox); - detectDevices->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + detectDevices->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); connect( detectDevices, TQT_SIGNAL( clicked() ), m_manager, TQT_SLOT( redetectDevices() ) ); KPushButton *addButton = new KPushButton( i18n( "Add Device..." ), hbox ); - addButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + addButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); connect( addButton, TQT_SIGNAL( clicked() ), m_manager, TQT_SLOT( newDevice() ) ); } @@ -392,36 +392,36 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, if( !m_oldPlugin.isEmpty() ) m_new = false; - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); setSpacing( 5 ); const TQString labelTextNone = i18n( "(none)" ); TQString row = "<tr><td>%1</td><td>%2</td></tr>"; TQString table; - table += row.tqarg( escapeHTML( i18n( "Autodetected:" ) ), + table += row.arg( escapeHTML( i18n( "Autodetected:" ) ), escapeHTML( medium->isAutodetected() ? i18n("Yes") : i18n("No") ) ); - table += row.tqarg( escapeHTML( i18n( "ID:" ) ), + table += row.arg( escapeHTML( i18n( "ID:" ) ), escapeHTML( medium->id() ) ); - table += row.tqarg( escapeHTML( i18n( "Name:" ) ), + table += row.arg( escapeHTML( i18n( "Name:" ) ), escapeHTML( medium->name() ) ); - table += row.tqarg( escapeHTML( i18n( "Label:" ) ), + table += row.arg( escapeHTML( i18n( "Label:" ) ), escapeHTML( medium->label().isEmpty() ? labelTextNone : medium->label() ) ); - table += row.tqarg( escapeHTML( i18n( "User Label:" ) ), + table += row.arg( escapeHTML( i18n( "User Label:" ) ), escapeHTML( medium->userLabel().isEmpty() ? labelTextNone : medium->userLabel() ) ); - table += row.tqarg( escapeHTML( i18n( "Device Node:" ) ), + table += row.arg( escapeHTML( i18n( "Device Node:" ) ), escapeHTML( medium->deviceNode().isEmpty() ? labelTextNone : medium->deviceNode() ) ); - table += row.tqarg( escapeHTML( i18n( "Mount Point:" ) ), + table += row.arg( escapeHTML( i18n( "Mount Point:" ) ), escapeHTML( medium->mountPoint().isEmpty() ? labelTextNone : medium->mountPoint() ) ); - table += row.tqarg( escapeHTML( i18n( "Mime Type:" ) ), + table += row.arg( escapeHTML( i18n( "Mime Type:" ) ), escapeHTML( medium->mimeType().isEmpty() ? labelTextNone : medium->mimeType() ) ); - TQString title = escapeHTML( i18n( "Device information for %1").tqarg(medium->name() ) ); - TQString details = TQString( "<em>%1</em><br />" "<table>%2</table>" ).tqarg( title, table ); + TQString title = escapeHTML( i18n( "Device information for %1").arg(medium->name() ) ); + TQString details = TQString( "<em>%1</em><br />" "<table>%2</table>" ).arg( title, table ); (void)new TQLabel( i18n("Name: "), this ); (void)new TQLabel( medium->name(), this ); (void)new KActiveLabel( i18n( "(<a href='whatsthis:%1'>Details</a>)" ) - .tqarg( Amarok::escapeHTMLAttr( details ) ), this ); + .arg( Amarok::escapeHTMLAttr( details ) ), this ); (void)new TQLabel( i18n("Plugin:"), this ); m_pluginCombo = new KComboBox( false, this ); diff --git a/amarok/src/mediumpluginmanager.h b/amarok/src/mediumpluginmanager.h index 4e1461d8..152e90a4 100644 --- a/amarok/src/mediumpluginmanager.h +++ b/amarok/src/mediumpluginmanager.h @@ -16,7 +16,7 @@ #include "hintlineedit.h" #include "plugin/pluginconfig.h" -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqhbox.h> diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp index be64494b..8ac01799 100644 --- a/amarok/src/metabundle.cpp +++ b/amarok/src/metabundle.cpp @@ -1051,7 +1051,7 @@ MetaBundle::prettyTitle() const if( s.isEmpty() ) s = title(); else - s = i18n("%1 - %2").tqarg( artist(), title() ); + s = i18n("%1 - %2").arg( artist(), title() ); if( s.isEmpty() ) s = prettyTitle( filename() ); @@ -1067,7 +1067,7 @@ MetaBundle::veryNiceTitle() const if( !title().isEmpty() ) { if( !artist().isEmpty() ) - s = i18n( "%1 by %2" ).tqarg( title(), artist() ); + s = i18n( "%1 by %2" ).arg( title(), artist() ); else s = title(); } @@ -1146,10 +1146,10 @@ MetaBundle::veryPrettyTime( int time ) switch( s.count() ) { - case 1: return i18n( "seconds", "%1s" ).tqarg( s[0] ); - case 2: return i18n( "minutes, seconds", "%2m %1s" ).tqarg( s[0], s[1] ); - case 3: return i18n( "hours, minutes, seconds", "%3h %2m %1s" ).tqarg( s[0], s[1], s[2] ); - case 4: return i18n( "days, hours, minutes, seconds", "%4d %3h %2m %1s" ).tqarg( s[0], s[1], s[2], s[3] ); + case 1: return i18n( "seconds", "%1s" ).arg( s[0] ); + case 2: return i18n( "minutes, seconds", "%2m %1s" ).arg( s[0], s[1] ); + case 3: return i18n( "hours, minutes, seconds", "%3h %2m %1s" ).arg( s[0], s[1], s[2] ); + case 4: return i18n( "days, hours, minutes, seconds", "%4d %3h %2m %1s" ).arg( s[0], s[1], s[2], s[3] ); default: return "omg bug!"; } } @@ -1208,13 +1208,13 @@ MetaBundle::fuzzyTime( int time ) TQString hours = i18n( "1 hour", "%n hours", hr ); if( week ) - return weeks.tqarg( day ? days.tqarg("") : "" ).simplifyWhiteSpace(); + return weeks.arg( day ? days.arg("") : "" ).simplifyWhiteSpace(); else if ( day ) - return days.tqarg( hr ? hours : "" ).simplifyWhiteSpace(); + return days.arg( hr ? hours : "" ).simplifyWhiteSpace(); else if ( hr ) - return i18n( "%1:%2 hours" ).tqarg( hr ).tqarg( zeroPad( min ) ); + return i18n( "%1:%2 hours" ).arg( hr ).arg( zeroPad( min ) ); else - return i18n( "%1:%2").tqarg( min ).tqarg( zeroPad( secs ) ); + return i18n( "%1:%2").arg( min ).arg( zeroPad( secs ) ); } TQString @@ -1271,7 +1271,7 @@ MetaBundle::ratingList() TQStringList list; list += ratingDescription( 0 ); for ( int i = 1; i<=10; i++ ) - list += s.tqarg( prettyRating( i, true ) ).tqarg( ratingDescription( i ) ); + list += s.arg( prettyRating( i, true ) ).arg( ratingDescription( i ) ); return list; } @@ -1509,7 +1509,7 @@ MetaBundle::save( TagLib::FileRef* fileref ) // QT's version encodeAttr is 1) private to TQDom, and 2) a litte slow. This // one can be made public if needed. It happens to be on a critical path // (each char of playlist / undo save). TQStyleSheet::escape does not deal with -// tqunicode chars illegal for XML. There's a lot of junk in those tags +// unicode chars illegal for XML. There's a lot of junk in those tags static inline void xmlEncode(TQTextStream &stream, const TQString &str) { TQString tmp; @@ -1517,7 +1517,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str) uint i = 0; while ( i < cur->length() ) { - uint uc = (*cur)[i].tqunicode(); + uint uc = (*cur)[i].unicode(); // we try to accumulate unescaped chars before writing to stream const char *escaped; // careful about the order of tests, common before less common @@ -1530,7 +1530,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str) else if ( uc == '"' ) escaped = """; else { - // see if it's a XML-valid tqunicode char at all + // see if it's a XML-valid unicode char at all if ( (0x20 <= uc && uc <= 0xD7FF || 0xE000 <= uc && uc <= 0xFFFD || uc == 0x9 || uc == 0xA || uc == 0xD) ) // fairly common, other ascii chars diff --git a/amarok/src/metabundle.h b/amarok/src/metabundle.h index 5a8a9dbc..a6a217ce 100644 --- a/amarok/src/metabundle.h +++ b/amarok/src/metabundle.h @@ -420,7 +420,7 @@ private: static inline TQString prettyGeneric( const TQString &s, const int i ) { - return (i > 0) ? s.tqarg( i ) : (i == Undetermined) ? "?" : "-"; + return (i > 0) ? s.arg( i ) : (i == Undetermined) ? "?" : "-"; } void init( TagLib::AudioProperties *ap = 0 ); @@ -533,7 +533,7 @@ inline TQString MetaBundle::prettySampleRate( bool shortened ) const return prettyGeneric( i18n( "SampleRate", "%1 Hz" ), m_sampleRate ); } -inline TQString MetaBundle::zeroPad( uint i ) { return ( i < 10 ) ? TQString( "0%1" ).tqarg( i ) : TQString::number( i ); } +inline TQString MetaBundle::zeroPad( uint i ) { return ( i < 10 ) ? TQString( "0%1" ).arg( i ) : TQString::number( i ); } inline bool MetaBundle::hasExtendedMetaInformation() const { diff --git a/amarok/src/metadata/m4a/mp4file.h b/amarok/src/metadata/m4a/mp4file.h index c1da43d6..9e40dbc9 100644 --- a/amarok/src/metadata/m4a/mp4file.h +++ b/amarok/src/metadata/m4a/mp4file.h @@ -104,7 +104,7 @@ namespace TagLib { /*! * This will remove all tags. * - * \note This will also tqinvalidate pointers to the tags + * \note This will also invalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/amarok/src/metadata/m4a/mp4mvhdbox.cpp b/amarok/src/metadata/m4a/mp4mvhdbox.cpp index 894f7f89..36053e4b 100644 --- a/amarok/src/metadata/m4a/mp4mvhdbox.cpp +++ b/amarok/src/metadata/m4a/mp4mvhdbox.cpp @@ -39,7 +39,7 @@ public: TagLib::uint timescale; //! duration of presentation TagLib::ulonglong duration; - //! ptqlayout speed + //! playout speed TagLib::uint rate; //! volume for entire presentation TagLib::uint volume; diff --git a/amarok/src/metadata/m4a/mp4mvhdbox.h b/amarok/src/metadata/m4a/mp4mvhdbox.h index 31e3d740..b133485e 100644 --- a/amarok/src/metadata/m4a/mp4mvhdbox.h +++ b/amarok/src/metadata/m4a/mp4mvhdbox.h @@ -44,7 +44,7 @@ namespace TagLib uint timescale() const; //! function to get the presentation duration in the mp4 file ulonglong duration() const; - //! function to get the rate (ptqlayout speed) - typically 1.0; + //! function to get the rate (playout speed) - typically 1.0; uint rate() const; //! function to get volume level for presentation - typically 1.0; uint volume() const; diff --git a/amarok/src/metadata/trueaudio/ttafile.h b/amarok/src/metadata/trueaudio/ttafile.h index 3a97a9ef..2cb07856 100644 --- a/amarok/src/metadata/trueaudio/ttafile.h +++ b/amarok/src/metadata/trueaudio/ttafile.h @@ -154,7 +154,7 @@ namespace TagLib { * This will remove the tags that match the OR-ed together TagTypes from the * file. By default it removes all tags. * - * \note This will also tqinvalidate pointers to the tags + * \note This will also invalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/amarok/src/metadata/wavpack/wvfile.h b/amarok/src/metadata/wavpack/wvfile.h index 18f2316e..6c57f6d7 100644 --- a/amarok/src/metadata/wavpack/wvfile.h +++ b/amarok/src/metadata/wavpack/wvfile.h @@ -136,7 +136,7 @@ namespace TagLib { * This will remove the tags that match the OR-ed together TagTypes from the * file. By default it removes all tags. * - * \note This will also tqinvalidate pointers to the tags + * \note This will also invalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/amarok/src/moodbar.cpp b/amarok/src/moodbar.cpp index ac1d51f0..a67e31cc 100644 --- a/amarok/src/moodbar.cpp +++ b/amarok/src/moodbar.cpp @@ -514,11 +514,11 @@ MoodServer::slotJobCompleted( KProcess *proc ) if( proc != m_currentProcess ) warning() << "MoodServer::slotJobCompleted: proc != m_currentProcess!" << endl; - ReturntqStatus returnval; + ReturnStatus returnval; if( !m_currentProcess->normalExit() ) returnval = Crash; else - returnval = (ReturntqStatus) m_currentProcess->exitStatus(); + returnval = (ReturnStatus) m_currentProcess->exitStatus(); bool success = (returnval == Success); KURL url = m_currentData.m_url; @@ -972,7 +972,7 @@ Moodbar::draw( int width, int height ) m_mutex.lock(); - // Do we have to tqrepaint, or can we use the cache? + // Do we have to repaint, or can we use the cache? if( m_pixmap.width() == width && m_pixmap.height() == height ) { m_mutex.unlock(); diff --git a/amarok/src/moodbar.h b/amarok/src/moodbar.h index c71495b8..85ea4a63 100644 --- a/amarok/src/moodbar.h +++ b/amarok/src/moodbar.h @@ -166,7 +166,7 @@ private: NoPlugin = 1, NoFile = 2, CommandLine = 3 - } ReturntqStatus; + } ReturnStatus; MoodServer( void ); void setMoodbarBroken( void ); diff --git a/amarok/src/mountpointmanager.cpp b/amarok/src/mountpointmanager.cpp index 00a6e4d0..4520bf4a 100644 --- a/amarok/src/mountpointmanager.cpp +++ b/amarok/src/mountpointmanager.cpp @@ -210,7 +210,7 @@ MountPointManager::getAbsolutePath( const int deviceId, const KURL& relativePath m_handlerMapMutex.unlock(); TQStringList lastMountPoint = CollectionDB::instance()->query( TQString( "SELECT lastmountpoint FROM devices WHERE id = %1" ) - .tqarg( deviceId ) ); + .arg( deviceId ) ); if ( lastMountPoint.count() == 0 ) { //hmm, no device with that id in the DB...serious problem @@ -471,10 +471,10 @@ MountPointManager::migrateStatistics() int deviceid = getIdForUrl( *it ); TQString rpath = getRelativePath( deviceid, *it ); TQString update = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" ) - .tqarg( deviceid ) - .tqarg( CollectionDB::instance()->escapeString( rpath ) ); + .arg( deviceid ) + .arg( CollectionDB::instance()->escapeString( rpath ) ); update += TQString( " WHERE url = '%1' AND deviceid = -2;" ) - .tqarg( CollectionDB::instance()->escapeString( *it ) ); + .arg( CollectionDB::instance()->escapeString( *it ) ); CollectionDB::instance()->query( update ); } } @@ -539,15 +539,15 @@ void UrlUpdateJob::updateStatistics( ) int statCount = collDB->query( TQString( "SELECT COUNT( url ) FROM statistics WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( newDeviceid ) - .tqarg( collDB->escapeString( newRpath ) ) ).first().toInt(); + .arg( newDeviceid ) + .arg( collDB->escapeString( newRpath ) ) ).first().toInt(); if( statCount ) continue; //statistics row with new URL/deviceid values already exists TQString sql = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" ) - .tqarg( newDeviceid ).tqarg( collDB->escapeString( newRpath ) ); + .arg( newDeviceid ).arg( collDB->escapeString( newRpath ) ); sql += TQString( " WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( deviceid ).tqarg( collDB->escapeString( rpath ) ); + .arg( deviceid ).arg( collDB->escapeString( rpath ) ); collDB->query( sql ); } } @@ -576,7 +576,7 @@ void UrlUpdateJob::updateLabels( ) //only update rows if there is not already a row with the new deviceid/rpath and the same labelid TQStringList labelids = collDB->query( TQString( "SELECT labelid FROM tags_labels WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( TQString::number( newDeviceid ), collDB->escapeString( newRpath ) ) ); + .arg( TQString::number( newDeviceid ), collDB->escapeString( newRpath ) ) ); TQString existingLabelids; if( !labelids.isEmpty() ) { @@ -591,8 +591,8 @@ void UrlUpdateJob::updateLabels( ) } TQString sql = TQString( "UPDATE tags_labels SET deviceid = %1, url = '%2' " "WHERE deviceid = %3 AND url = '%4'%5;" ) - .tqarg( newDeviceid ) - .tqarg( collDB->escapeString( newRpath ), + .arg( newDeviceid ) + .arg( collDB->escapeString( newRpath ), TQString::number( deviceid ), collDB->escapeString( rpath ), existingLabelids ); diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp index b11b3a67..5e2bc629 100644 --- a/amarok/src/multitabbar.cpp +++ b/amarok/src/multitabbar.cpp @@ -33,7 +33,7 @@ #include <tqbutton.h> #include <tqfontmetrics.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpopupmenu.h> #include <tqstyle.h> @@ -124,7 +124,7 @@ void MultiTabBarInternal::setStyle( enum MultiTabBar::MultiTabBarStyle style ) mainLayout->setAutoAdd( true ); } - viewport() ->tqrepaint(); + viewport() ->repaint(); } void MultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) @@ -133,32 +133,32 @@ void MultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy if ( m_position == MultiTabBar::Right ) { - paint->setPen( tqcolorGroup().shadow() ); + paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, 0, 0, viewport() ->height() ); - paint->setPen( tqcolorGroup().background().dark( 120 ) ); + paint->setPen( colorGroup().background().dark( 120 ) ); paint->drawLine( 1, 0, 1, viewport() ->height() ); } else if ( m_position == MultiTabBar::Left ) { - paint->setPen( tqcolorGroup().light() ); + paint->setPen( colorGroup().light() ); paint->drawLine( 23, 0, 23, viewport() ->height() ); paint->drawLine( 22, 0, 22, viewport() ->height() ); - paint->setPen( tqcolorGroup().shadow() ); + paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, 0, 0, viewport() ->height() ); } else if ( m_position == MultiTabBar::Bottom ) { - paint->setPen( tqcolorGroup().shadow() ); + paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, 0, viewport() ->width(), 0 ); - paint->setPen( tqcolorGroup().background().dark( 120 ) ); + paint->setPen( colorGroup().background().dark( 120 ) ); paint->drawLine( 0, 1, viewport() ->width(), 1 ); } else { - paint->setPen( tqcolorGroup().light() ); + paint->setPen( colorGroup().light() ); paint->drawLine( 0, 23, viewport() ->width(), 23 ); paint->drawLine( 0, 22, viewport() ->width(), 22 ); - /* paint->setPen(tqcolorGroup().shadow()); + /* paint->setPen(colorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height());*/ } } @@ -219,8 +219,8 @@ void MultiTabBarInternal::mousePressEvent( TQMouseEvent *ev ) void MultiTabBarInternal::resizeEvent( TQResizeEvent *ev ) { /* kdDebug()<<"MultiTabBarInternal::resizeEvent"<<endl; - kdDebug()<<"MultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl; - kdDebug()<<"MultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/ + kdDebug()<<"MultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl; + kdDebug()<<"MultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/ if ( ev ) TQScrollView::resizeEvent( ev ); @@ -481,7 +481,7 @@ void MultiTabBarInternal::setPosition( enum MultiTabBar::MultiTabBarPosition pos m_position = pos; for ( uint i = 0;i < m_tabs.count();i++ ) m_tabs.at( i ) ->setTabsPosition( m_position ); - viewport() ->tqrepaint(); + viewport() ->repaint(); } @@ -584,13 +584,13 @@ void MultiTabBarButton::slotClicked() void MultiTabBarButton::setPosition( MultiTabBar::MultiTabBarPosition pos ) { m_position = pos; - tqrepaint(); + repaint(); } void MultiTabBarButton::setStyle( MultiTabBar::MultiTabBarStyle style ) { m_style = style; - tqrepaint(); + repaint(); } void MultiTabBarButton::hideEvent( TQHideEvent* he ) @@ -660,18 +660,18 @@ void MultiTabBarButton::slotAnimTimer() { if ( m_animEnter ) { m_animCount += 1; - tqrepaint( false ); + repaint( false ); if ( m_animCount >= ANIM_MAX ) m_animTimer->stop(); } else { m_animCount -= 1; - tqrepaint( false ); + repaint( false ); if ( m_animCount <= 0 ) m_animTimer->stop(); } } -TQSize MultiTabBarButton::tqsizeHint() const +TQSize MultiTabBarButton::sizeHint() const { constPolish(); @@ -687,7 +687,7 @@ TQSize MultiTabBarButton::tqsizeHint() const } #endif if ( isMenuButton() ) - w += tqstyle().tqpixelMetric( TQStyle::PM_MenuButtonIndicator, this ); + w += tqstyle().pixelMetric( TQStyle::PM_MenuButtonIndicator, this ); if ( pixmap() ) { TQPixmap * pm = const_cast< TQPixmap * >( pixmap() ); @@ -697,7 +697,7 @@ TQSize MultiTabBarButton::tqsizeHint() const TQString s( text() ); bool empty = s.isEmpty(); if ( empty ) - s = TQString::tqfromLatin1( "XXXX" ); + s = TQString::fromLatin1( "XXXX" ); TQFontMetrics fm = fontMetrics(); TQSize sz = fm.size( ShowPrefix, s ); if ( !empty || !w ) @@ -754,7 +754,7 @@ void MultiTabBarTab::setTabsPosition( MultiTabBar::MultiTabBarPosition pos ) } setPosition( pos ); - // tqrepaint(); + // repaint(); } void MultiTabBarTab::setIcon( const TQString& icon ) @@ -785,7 +785,7 @@ void MultiTabBarTab::slotClicked() if ( m_animTimer->isActive() ) { m_animCount = ANIM_MAX; m_animTimer->stop(); - tqrepaint(); + repaint(); } updateState(); @@ -812,12 +812,12 @@ void MultiTabBarTab::updateState() if ( ( m_position == MultiTabBar::Right || m_position == MultiTabBar::Left ) ) { setFixedWidth( 24 ); if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) { - setFixedHeight( MultiTabBarButton::tqsizeHint().width() ); + setFixedHeight( MultiTabBarButton::sizeHint().width() ); } else setFixedHeight( 36 ); } else { setFixedHeight( 24 ); if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) { - setFixedWidth( MultiTabBarButton::tqsizeHint().width() ); + setFixedWidth( MultiTabBarButton::sizeHint().width() ); } else setFixedWidth( 36 ); } } else { @@ -870,7 +870,7 @@ void MultiTabBarTab::drawButtonStyled( TQPainter *paint ) const int height = 24; if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) { if ( ( m_position == MultiTabBar::Left ) || ( m_position == MultiTabBar::Right ) ) - sh = TQSize( this->height(), this->width() ); //MultiTabBarButton::tqsizeHint(); + sh = TQSize( this->height(), this->width() ); //MultiTabBarButton::sizeHint(); else sh = TQSize( this->width(), this->height() ); } else @@ -887,8 +887,8 @@ void MultiTabBarTab::drawButtonStyled( TQPainter *paint ) if ( isOn() ) st |= TQStyle::Style_On; - tqstyle().tqdrawControl( TQStyle::CE_PushButton, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), tqcolorGroup(), st ); - tqstyle().tqdrawControl( TQStyle::CE_PushButtonLabel, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), tqcolorGroup(), st ); + tqstyle().drawControl( TQStyle::CE_PushButton, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st ); + tqstyle().drawControl( TQStyle::CE_PushButtonLabel, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st ); switch ( m_position ) { case MultiTabBar::Left: @@ -904,8 +904,8 @@ void MultiTabBarTab::drawButtonStyled( TQPainter *paint ) paint->drawPixmap( 0, 0, pixmap ); break; } - // style().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), - // tqcolorGroup(),TQStyle::Style_Enabled); + // style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), + // colorGroup(),TQStyle::Style_Enabled); } void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) @@ -913,52 +913,52 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) TQPixmap pixmap; if ( iconSet() ) pixmap = iconSet() ->pixmap( TQIconSet::Small, TQIconSet::Normal ); - paint->fillRect( 0, 0, 24, 24, tqcolorGroup().background() ); + paint->fillRect( 0, 0, 24, 24, colorGroup().background() ); if ( !isOn() ) { if ( m_position == MultiTabBar::Right ) { - paint->fillRect( 0, 0, 21, 21, TQBrush( tqcolorGroup().background() ) ); + paint->fillRect( 0, 0, 21, 21, TQBrush( colorGroup().background() ) ); - paint->setPen( tqcolorGroup().background().dark( 150 ) ); + paint->setPen( colorGroup().background().dark( 150 ) ); paint->drawLine( 0, 22, 23, 22 ); paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap ); - paint->setPen( tqcolorGroup().shadow() ); + paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, 0, 0, 23 ); - paint->setPen( tqcolorGroup().background().dark( 120 ) ); + paint->setPen( colorGroup().background().dark( 120 ) ); paint->drawLine( 1, 0, 1, 23 ); } else if ( ( m_position == MultiTabBar::Bottom ) || ( m_position == MultiTabBar::Top ) ) { - paint->fillRect( 0, 1, 23, 22, TQBrush( tqcolorGroup().background() ) ); + paint->fillRect( 0, 1, 23, 22, TQBrush( colorGroup().background() ) ); paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap ); - paint->setPen( tqcolorGroup().background().dark( 120 ) ); + paint->setPen( colorGroup().background().dark( 120 ) ); paint->drawLine( 23, 0, 23, 23 ); - paint->setPen( tqcolorGroup().light() ); + paint->setPen( colorGroup().light() ); paint->drawLine( 0, 22, 23, 22 ); paint->drawLine( 0, 23, 23, 23 ); - paint->setPen( tqcolorGroup().shadow() ); + paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, 0, 23, 0 ); - paint->setPen( tqcolorGroup().background().dark( 120 ) ); + paint->setPen( colorGroup().background().dark( 120 ) ); paint->drawLine( 0, 1, 23, 1 ); } else { - paint->setPen( tqcolorGroup().background().dark( 120 ) ); + paint->setPen( colorGroup().background().dark( 120 ) ); paint->drawLine( 0, 23, 23, 23 ); - paint->fillRect( 0, 0, 23, 21, TQBrush( tqcolorGroup().background() ) ); + paint->fillRect( 0, 0, 23, 21, TQBrush( colorGroup().background() ) ); paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap ); - paint->setPen( tqcolorGroup().light() ); + paint->setPen( colorGroup().light() ); paint->drawLine( 23, 0, 23, 23 ); paint->drawLine( 22, 0, 22, 23 ); - paint->setPen( tqcolorGroup().shadow() ); + paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, 0, 0, 23 ); } @@ -966,12 +966,12 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) } else { if ( m_position == MultiTabBar::Right ) { - paint->setPen( tqcolorGroup().shadow() ); + paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, height() - 1, 23, height() - 1 ); paint->drawLine( 0, height() - 2, 23, height() - 2 ); paint->drawLine( 23, 0, 23, height() - 1 ); paint->drawLine( 22, 0, 22, height() - 1 ); - paint->fillRect( 0, 0, 21, height() - 3, TQBrush( tqcolorGroup().light() ) ); + paint->fillRect( 0, 0, 21, height() - 3, TQBrush( colorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { @@ -980,9 +980,9 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) TQPixmap tpixmap( height() - 25 - 3, width() - 2 ); TQPainter painter( &tpixmap ); - painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( tqcolorGroup().light() ) ); + painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( colorGroup().light() ) ); - painter.setPen( tqcolorGroup().text() ); + painter.setPen( colorGroup().text() ); painter.drawText( 0, + width() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); paint->rotate( 90 ); @@ -992,31 +992,31 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) } else if ( m_position == MultiTabBar::Top ) { - paint->fillRect( 0, 0, width() - 1, 23, TQBrush( tqcolorGroup().light() ) ); + paint->fillRect( 0, 0, width() - 1, 23, TQBrush( colorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { - paint->setPen( tqcolorGroup().text() ); + paint->setPen( colorGroup().text() ); paint->drawText( 25, height() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); } } else if ( m_position == MultiTabBar::Bottom ) { - paint->setPen( tqcolorGroup().shadow() ); + paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, 23, width() - 1, 23 ); paint->drawLine( 0, 22, width() - 1, 22 ); - paint->fillRect( 0, 0, width() - 1, 21, TQBrush( tqcolorGroup().light() ) ); + paint->fillRect( 0, 0, width() - 1, 21, TQBrush( colorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { - paint->setPen( tqcolorGroup().text() ); + paint->setPen( colorGroup().text() ); paint->drawText( 25, height() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); } } else { - paint->setPen( tqcolorGroup().shadow() ); + paint->setPen( colorGroup().shadow() ); paint->drawLine( 0, height() - 1, 23, height() - 1 ); paint->drawLine( 0, height() - 2, 23, height() - 2 ); - paint->fillRect( 0, 0, 23, height() - 3, TQBrush( tqcolorGroup().light() ) ); + paint->fillRect( 0, 0, 23, height() - 3, TQBrush( colorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { @@ -1025,9 +1025,9 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) TQPixmap tpixmap( height() - 25 - 3, width() - 2 ); TQPainter painter( &tpixmap ); - painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( tqcolorGroup().light() ) ); + painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( colorGroup().light() ) ); - painter.setPen( tqcolorGroup().text() ); + painter.setPen( colorGroup().text() ); painter.drawText( tpixmap.width() - TQFontMetrics( TQFont() ).width( m_text ), + width() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); paint->rotate( -90 ); @@ -1046,14 +1046,14 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint ) { TQColor fillColor, textColor; if ( isOn() ) { - fillColor = blendColors( tqcolorGroup().highlight(), tqcolorGroup().background(), static_cast<int>( m_animCount * 3.5 ) ); - textColor = blendColors( tqcolorGroup().highlightedText(), tqcolorGroup().text(), static_cast<int>( m_animCount * 4.5 ) ); + fillColor = blendColors( colorGroup().highlight(), colorGroup().background(), static_cast<int>( m_animCount * 3.5 ) ); + textColor = blendColors( colorGroup().highlightedText(), colorGroup().text(), static_cast<int>( m_animCount * 4.5 ) ); } else if ( isEnabled() ) { - fillColor = blendColors( tqcolorGroup().background(), tqcolorGroup().highlight(), static_cast<int>( m_animCount * 3.5 ) ); - textColor = blendColors( tqcolorGroup().text(), tqcolorGroup().highlightedText(), static_cast<int>( m_animCount * 4.5 ) ); + fillColor = blendColors( colorGroup().background(), colorGroup().highlight(), static_cast<int>( m_animCount * 3.5 ) ); + textColor = blendColors( colorGroup().text(), colorGroup().highlightedText(), static_cast<int>( m_animCount * 4.5 ) ); } else { - fillColor = tqcolorGroup().background(); - textColor = tqcolorGroup().text(); + fillColor = colorGroup().background(); + textColor = colorGroup().text(); } #ifndef TQT_NO_ICONSET @@ -1071,7 +1071,7 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint ) TQPainter painter( &pixmap ); // Draw the frame - painter.setPen( tqcolorGroup().mid() ); + painter.setPen( colorGroup().mid() ); /*if ( m_id != bar->visibleTabCount() - 1 )*/ painter.drawLine( 0, 0, 0, pixmap.height() - 1 ); painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 ); @@ -1099,7 +1099,7 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint ) TQPainter painter( &pixmap ); // Draw the frame - painter.setPen( tqcolorGroup().mid() ); + painter.setPen( colorGroup().mid() ); /*if ( m_id != bar->visibleTabCount() - 1 )*/ painter.drawLine( 0, 0, 0, pixmap.height() - 1 ); painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 ); @@ -1147,11 +1147,11 @@ MultiTabBar::MultiTabBar( MultiTabBarMode bm, TQWidget *parent, const char *name m_buttons.setAutoDelete( false ); if ( bm == Vertical ) { m_l = new TQVBoxLayout( this ); - tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding, true ); + setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding, true ); // setFixedWidth(24); } else { m_l = new TQHBoxLayout( this ); - tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ); + setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ); // setFixedHeight(24); } m_l->setMargin( 0 ); @@ -1295,7 +1295,7 @@ void MultiTabBar::fontChange( const TQFont& /* oldFont */ ) { for ( uint i = 0;i < tabs() ->count();i++ ) tabs() ->at( i ) ->resize(); - tqrepaint(); + repaint(); } TQPtrList<MultiTabBarTab>* MultiTabBar::tabs() { return m_internal->tabs();} diff --git a/amarok/src/multitabbar.h b/amarok/src/multitabbar.h index b63d90ae..1689baf0 100644 --- a/amarok/src/multitabbar.h +++ b/amarok/src/multitabbar.h @@ -29,7 +29,7 @@ #include <tqscrollview.h> #include <tqvbox.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <tqptrlist.h> #include <tqpushbutton.h> @@ -205,7 +205,7 @@ class MultiTabBarButton: public TQPushButton */ void proxyDrops( DropProxyTarget *finalDropTarget ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: static const int ANIM_INTERVAL = 18; diff --git a/amarok/src/mydirlister.h b/amarok/src/mydirlister.h index 391e45e5..eeb8c55a 100644 --- a/amarok/src/mydirlister.h +++ b/amarok/src/mydirlister.h @@ -21,15 +21,15 @@ protected: EngineController::canDecode( item->url() ) || item->url().protocol() == "audiocd" || PlaylistFile::isPlaylistFile( item->name() ) || - item->name().tqendsWith( ".mp3", false ) || //for now this is less confusing for the user - item->name().tqendsWith( ".aa", false ) || //for adding to iPod - item->name().tqendsWith( ".mp4", false ) || //for adding to iPod - item->name().tqendsWith( ".m4v", false ) || //for adding to iPod - item->name().tqendsWith( ".m4b", false ) || //for adding to iPod - item->name().tqendsWith( ".ogg", false ) || - item->name().tqendsWith( ".flac", false ) || - item->name().tqendsWith( ".wma", false ) || - item->name().tqendsWith( ".asf", false ); + item->name().endsWith( ".mp3", false ) || //for now this is less confusing for the user + item->name().endsWith( ".aa", false ) || //for adding to iPod + item->name().endsWith( ".mp4", false ) || //for adding to iPod + item->name().endsWith( ".m4v", false ) || //for adding to iPod + item->name().endsWith( ".m4b", false ) || //for adding to iPod + item->name().endsWith( ".ogg", false ) || + item->name().endsWith( ".flac", false ) || + item->name().endsWith( ".wma", false ) || + item->name().endsWith( ".asf", false ); } }; diff --git a/amarok/src/mydiroperator.cpp b/amarok/src/mydiroperator.cpp index e00878d9..3e353f5b 100644 --- a/amarok/src/mydiroperator.cpp +++ b/amarok/src/mydiroperator.cpp @@ -24,7 +24,7 @@ void MyDirOperator::myCdUp() { KURL tmp( url() ); - tmp.cd( TQString::tqfromLatin1("..")); + tmp.cd( TQString::fromLatin1("..")); if( m_medium && !tmp.path().startsWith( m_medium->mountPoint() ) ) tmp.setPath( m_medium->mountPoint() ); setURL(tmp, true); diff --git a/amarok/src/newdynamic.ui b/amarok/src/newdynamic.ui index 7c49c2dd..af4ea8b1 100644 --- a/amarok/src/newdynamic.ui +++ b/amarok/src/newdynamic.ui @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>5</height> @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>21</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>21</height> @@ -165,7 +165,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>21</height> @@ -239,7 +239,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>250</height> @@ -302,7 +302,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> diff --git a/amarok/src/organizecollectiondialog.ui b/amarok/src/organizecollectiondialog.ui index c094a216..1f9548ef 100644 --- a/amarok/src/organizecollectiondialog.ui +++ b/amarok/src/organizecollectiondialog.ui @@ -81,7 +81,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -305,7 +305,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -357,7 +357,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -404,7 +404,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -420,7 +420,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>347</width> <height>20</height> @@ -450,7 +450,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/amarok/src/organizecollectiondialog.ui.h b/amarok/src/organizecollectiondialog.ui.h index 1d2f517b..a86a217b 100644 --- a/amarok/src/organizecollectiondialog.ui.h +++ b/amarok/src/organizecollectiondialog.ui.h @@ -65,10 +65,10 @@ TQString OrganizeCollectionDialog::buildFormatTip() continue; args[MetaBundle::exactColumnName( i ).lower()] = MetaBundle::prettyColumnName( i ); } - args["albumartist"] = i18n( "%1 or %2" ).tqarg( i18n("This feature only works with \"The\", so either don't translate it at all, or only translate artist and album", "Album Artist, The") , i18n("The Album Artist") ); + args["albumartist"] = i18n( "%1 or %2" ).arg( i18n("This feature only works with \"The\", so either don't translate it at all, or only translate artist and album", "Album Artist, The") , i18n("The Album Artist") ); args["thealbumartist"] = i18n( "The Album Artist" ); args["theartist"] = i18n( "The Artist" ); - args["artist"] = i18n( "%1 or %2" ).tqarg( i18n( "This feature only works with \"The\", so either don't translate it at all, or only translate Artist", "Artist, The") , i18n( "The Artist") ); + args["artist"] = i18n( "%1 or %2" ).arg( i18n( "This feature only works with \"The\", so either don't translate it at all, or only translate Artist", "Artist, The") , i18n( "The Artist") ); args["folder"] = i18n( "Collection Base Folder" ); args["initial"] = i18n( "Artist's Initial" ); args["filetype"] = i18n( "File Extension of Source" ); @@ -81,7 +81,7 @@ TQString OrganizeCollectionDialog::buildFormatTip() it != args.end(); ++it ) { - tooltip += TQString( "<li>%1 - %2" ).tqarg( it.data(), "%" + it.key() ); + tooltip += TQString( "<li>%1 - %2" ).arg( it.data(), "%" + it.key() ); } tooltip += "</ul>"; diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index 6e5bd7f7..a475f33a 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -52,7 +52,7 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ) , m_duration( 2000 ) , m_timer( new TQTimer( this ) ) - , m_tqalignment( Middle ) + , m_alignment( Middle ) , m_screen( 0 ) , m_y( MARGIN ) , m_drawShadow( false ) @@ -118,7 +118,7 @@ OSDWidget::volChanged( unsigned char volume ) { m_volume = true; m_newvolume = volume; - m_text = m_newvolume ? i18n("Volume: %1%").tqarg( m_newvolume ) : i18n("Mute"); + m_text = m_newvolume ? i18n("Volume: %1%").arg( m_newvolume ) : i18n("Mute"); show(); } @@ -247,7 +247,7 @@ OSDWidget::determineMetrics( const uint M ) const TQRect screen = TQApplication::desktop()->screenGeometry( m_screen ); TQPoint newPos( MARGIN, m_y ); - switch( m_tqalignment ) + switch( m_alignment ) { case Left: break; @@ -349,8 +349,8 @@ OSDWidget::render( const uint M, const TQSize &size ) const uint shadowSize = static_cast<uint>( m_scaledCover.width() / 100.0 * 6.0 ); const TQString folder = Amarok::saveLocation( "covershadow-cache/" ); - const TQString file = TQString( "shadow_albumcover%1x%2.png" ).tqarg( m_scaledCover.width() + shadowSize ) - .tqarg( m_scaledCover.height() + shadowSize ); + const TQString file = TQString( "shadow_albumcover%1x%2.png" ).arg( m_scaledCover.width() + shadowSize ) + .arg( m_scaledCover.height() + shadowSize ); if ( TQFile::exists( folder + file ) ) shadow.load( folder + file ); else { @@ -395,8 +395,8 @@ OSDWidget::render( const uint M, const TQSize &size ) p.end(); pixmapGradient = TQPixmap( vol.size() ); - KPixmapEffect::gradient( pixmapGradient, tqcolorGroup().background(), - tqcolorGroup().highlight(), KPixmapEffect::EllipticGradient ); + KPixmapEffect::gradient( pixmapGradient, colorGroup().background(), + colorGroup().highlight(), KPixmapEffect::EllipticGradient ); pixmapGradient.setMask( mask ); } @@ -580,7 +580,7 @@ OSDWidget::mousePressEvent( TQMouseEvent* ) void OSDWidget::unsetColors() { - const TQColorGroup c = TQApplication::tqpalette().active(); + const TQColorGroup c = TQApplication::palette().active(); setPaletteForegroundColor( c.highlightedText() ); setPaletteBackgroundColor( c.highlight() ); @@ -670,11 +670,11 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) if( destination.y() > maxY ) destination.ry() = maxY; if( eGlobalPosX < (hcenter-snapZone) ) { - m_tqalignment = Left; + m_alignment = Left; destination.rx() = MARGIN; } else if( eGlobalPosX > (hcenter+snapZone) ) { - m_tqalignment = Right; + m_alignment = Right; destination.rx() = screen.width() - MARGIN - width(); } else { @@ -685,10 +685,10 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) if( eGlobalPosY >= (vcenter-snapZone) && eGlobalPosY <= (vcenter+snapZone) ) { - m_tqalignment = Center; + m_alignment = Center; destination.ry() = vcenter - height()/2; } - else m_tqalignment = Middle; + else m_alignment = Middle; } destination += screen.topLeft(); @@ -760,7 +760,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot : ( parens.contains( column ) || parens.contains( availableTags.at( i - 1 ) ) ) ? " " : i18n(" - "); append += ( parens.contains( column ) ? "(%1)" : "%1" ); - text += append.tqarg( tags.at( column + 1 ) ); + text += append.arg( tags.at( column + 1 ) ); } } else @@ -849,7 +849,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot void Amarok::OSD::applySettings() { - tqsetAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) ); + setAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) ); setDuration( AmarokConfig::osdDuration() ); #ifdef TQ_WS_X11 setEnabled( AmarokConfig::osdEnabled() ); diff --git a/amarok/src/osd.h b/amarok/src/osd.h index 625145d3..c79b419e 100644 --- a/amarok/src/osd.h +++ b/amarok/src/osd.h @@ -57,7 +57,7 @@ class OSDWidget : public TQWidget void setTextColor( const TQColor &color ) { setPaletteForegroundColor( color ); } void setBackgroundColor(const TQColor &color ) { setPaletteBackgroundColor( color ); } void setOffset( int y ) { m_y = y; } - void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; } + void setAlignment( Alignment alignment ) { m_alignment = alignment; } void setImage( const TQImage &image ) { m_cover = image; } void setScreen( int screen ); void setText( const TQString &text ) { m_text = text; } @@ -88,7 +88,7 @@ class OSDWidget : public TQWidget int m_duration; TQTimer *m_timer; - Alignment m_tqalignment; + Alignment m_alignment; int m_screen; uint m_y; bool m_drawShadow; @@ -116,7 +116,7 @@ public: OSDPreviewWidget( TQWidget *parent ); int screen() { return m_screen; } - int tqalignment() { return m_tqalignment; } + int alignment() { return m_alignment; } int y() { return m_y; } public slots: diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index 63ebd843..9c061cbd 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -54,10 +54,10 @@ namespace Amarok TQPixmap getPNG( const TQString &filename ) { - TQString file = !filename.tqendsWith( ".png", false ) ? "amarok/images/%1.png" : "amarok/images/%1"; + TQString file = !filename.endsWith( ".png", false ) ? "amarok/images/%1.png" : "amarok/images/%1"; TQPixmap pix; - TQImage img( locate( "data", file.tqarg( filename ) ), "PNG" ); + TQImage img( locate( "data", file.arg( filename ) ), "PNG" ); if (TQPaintDevice::x11AppDepth() == 32) pix.convertFromImage(KImageEffect::convertToPremultipliedAlpha( img )); else pix.convertFromImage( img ); return pix; @@ -65,10 +65,10 @@ namespace Amarok TQPixmap getJPG( const TQString &filename ) { - TQString file = !filename.tqendsWith( ".jpg", false ) ? "amarok/images/%1.jpg" : "amarok/images/%1"; + TQString file = !filename.endsWith( ".jpg", false ) ? "amarok/images/%1.jpg" : "amarok/images/%1"; TQPixmap pix; - TQImage img( locate( "data", TQString( "amarok/images/%1.jpg" ).tqarg( filename ) ), "JPEG" ); + TQImage img( locate( "data", TQString( "amarok/images/%1.jpg" ).arg( filename ) ), "JPEG" ); if (TQPaintDevice::x11AppDepth() == 32) pix.convertFromImage(KImageEffect::convertToPremultipliedAlpha( img )); else pix.convertFromImage( img ); return pix; @@ -100,7 +100,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl , m_pAnalyzer( 0 ) { //the createWidget template function is used here - //createWidget just creates a widget which has it's tqgeometry set too + //createWidget just creates a widget which has it's geometry set too // Sets caption and icon correctly (needed e.g. for GNOME) kapp->setTopWidget( this ); @@ -127,7 +127,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl setFont( font ); { //<NavButtons> - //NOTE we use a tqlayout for the buttons so resizing will be possible + //NOTE we use a layout for the buttons so resizing will be possible m_pFrameButtons = createWidget<TQHBox>( TQRect(0, 118, 311, 22), this ); KActionCollection *ac =Amarok::actionCollection(); @@ -140,7 +140,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl new NavButton( m_pFrameButtons, "next", ac->action( "next" ) ); KPushButton *switchView = new KPushButton( KGuiItem( "", "mini_dock" ), m_pFrameButtons ); - switchView->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big! + switchView->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big! switchView->setFocusPolicy( TQ_NoFocus ); connect( switchView, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleView() ) ); @@ -381,7 +381,7 @@ void PlayerWidget::engineNewMetaData( const MetaBundle &bundle, bool ) if( m_rateString.isEmpty() ) m_rateString = Hz; else - m_rateString = i18n("%1 kBit - %2").tqarg( m_rateString, Hz ); + m_rateString = i18n("%1 kBit - %2").arg( m_rateString, Hz ); } TQStringList list( bundle.prettyTitle() ); @@ -774,15 +774,15 @@ void PlayerWidget::mousePressEvent( TQMouseEvent *e ) { //Amarok::Menu::instance()->exec( e->globalPos() ); } - else if ( m_pAnalyzer->tqgeometry().contains( e->pos() ) ) + else if ( m_pAnalyzer->geometry().contains( e->pos() ) ) { createAnalyzer( e->state() & TQt::ControlButton ? -1 : +1 ); } else { TQRect - rect = m_pTimeLabel->tqgeometry(); - rect |= m_pTimeSign->tqgeometry(); + rect = m_pTimeLabel->geometry(); + rect |= m_pTimeSign->geometry(); if ( rect.contains( e->pos() ) ) { diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp index 42b6bd4a..cbc29f26 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -48,7 +48,7 @@ #include <cmath> //for pow() in playNextTrack() #include <tqbuffer.h> -#include <tqclipboard.h> //copyToClipboard(), slotMouseButtonPressed() +#include <clipboard.h> //copyToClipboard(), slotMouseButtonPressed() #include <tqcolor.h> #include <tqevent.h> #include <tqfile.h> //undo system @@ -62,7 +62,7 @@ #include <tqtooltip.h> #include <tqvaluelist.h> //addHybridTracks() #include <tqvaluevector.h> //playNextTrack() -#include <tqlayout.h> +#include <layout.h> #include <kaction.h> #include <kapplication.h> @@ -166,7 +166,7 @@ Playlist *Playlist::s_instance = 0; Playlist::Playlist( TQWidget *parent ) : KListView( parent, "ThePlaylist" ) , EngineObserver( EngineController::instance() ) - , m_startupTime_t( TQDateTime::tqcurrentDateTime().toTime_t() ) + , m_startupTime_t( TQDateTime::currentDateTime().toTime_t() ) , m_oldestTime_t( CollectionDB::instance()->query( "SELECT MIN( createdate ) FROM statistics;" ).first().toInt() ) , m_currentTrack( 0 ) , m_marker( 0 ) @@ -958,7 +958,7 @@ Playlist::playNextTrack( bool forceNext ) if( !AmarokConfig::randomMode() ) { item = MyIt::nextVisible( item ); - while( item && ( !checkFiletqStatus( item ) || !item->exists() ) ) + while( item && ( !checkFileStatus( item ) || !item->exists() ) ) item = MyIt::nextVisible( item ); setCurrentTrack( item ); } @@ -1002,7 +1002,7 @@ Playlist::playNextTrack( bool forceNext ) } else for( MyIt it( this ); *it; ++it ) - if ( !m_prevTracks.containsRef( *it ) && checkFiletqStatus( *it ) && (*it)->exists() ) + if ( !m_prevTracks.containsRef( *it ) && checkFileStatus( *it ) && (*it)->exists() ) tracks.push_back( *it ); if( tracks.isEmpty() ) { @@ -1082,7 +1082,7 @@ Playlist::playNextTrack( bool forceNext ) item = tracks.at( KApplication::random() % tracks.count() ); //is O(1) else { - const uint currenttime_t = TQDateTime::tqcurrentDateTime().toTime_t(); + const uint currenttime_t = TQDateTime::currentDateTime().toTime_t(); TQValueVector<int> weights( tracks.size() ); TQ_INT64 total = m_total; if( Amarok::randomAlbums() ) @@ -1131,13 +1131,13 @@ Playlist::playNextTrack( bool forceNext ) else if( item ) { item = MyIt::nextVisible( item ); - while( item && ( !checkFiletqStatus( item ) || !item->exists() ) ) + while( item && ( !checkFileStatus( item ) || !item->exists() ) ) item = MyIt::nextVisible( item ); } else { item = *MyIt( this ); //ie. first visible item - while( item && ( !checkFiletqStatus( item ) || !item->exists() ) ) + while( item && ( !checkFileStatus( item ) || !item->exists() ) ) item = item->nextSibling(); } @@ -1227,7 +1227,7 @@ Playlist::playPrevTrack() if( !item ) { item = *static_cast<MyIt&>(--MyIt( item )); - while( item && !checkFiletqStatus( item ) ) + while( item && !checkFileStatus( item ) ) item = *static_cast<MyIt&>(--MyIt( item )); } } @@ -1241,13 +1241,13 @@ Playlist::playPrevTrack() if( item ) { item = MyIt::prevVisible( item ); - while( item && ( !checkFiletqStatus( item ) || !item->isEnabled() ) ) + while( item && ( !checkFileStatus( item ) || !item->isEnabled() ) ) item = MyIt::prevVisible( item ); } else { item = *MyIt( this ); //ie. first visible item - while( item && ( !checkFiletqStatus( item ) || !item->isEnabled() ) ) + while( item && ( !checkFileStatus( item ) || !item->isEnabled() ) ) item = item->nextSibling(); } } @@ -1562,7 +1562,7 @@ Playlist::slotCountChanged() } bool -Playlist::checkFiletqStatus( PlaylistItem * item ) +Playlist::checkFileStatus( PlaylistItem * item ) { //DEBUG_BLOCK //debug() << "uniqueid of item = " << item->uniqueId() << ", url = " << item->url().path() << endl; @@ -1622,7 +1622,7 @@ Playlist::activate( TQListViewItem *item ) #define item static_cast<PlaylistItem*>(item) - if ( !checkFiletqStatus( item ) ) + if ( !checkFileStatus( item ) ) { Amarok::StatusBar::instance()->shortMessage( i18n("Local file does not exist.") ); return; @@ -1712,7 +1712,7 @@ TQPair<TQString, TQRect> Playlist::toolTipText( TQWidget*, const TQPoint &pos ) else text = item->text( col ); - TQRect irect = tqitemRect( item ); + TQRect irect = itemRect( item ); const int headerPos = header()->sectionPos( col ); irect.setLeft( headerPos - 1 ); irect.setRight( headerPos + header()->sectionSize( col ) ); @@ -1755,7 +1755,7 @@ TQPair<TQString, TQRect> Playlist::toolTipText( TQWidget*, const TQPoint &pos ) text = text.replace( "&", "&" ).replace( "<", "<" ).replace( ">", ">" ); if( item->isCurrent() ) { - text = TQString("<i>%1</i>").tqarg( text ); + text = TQString("<i>%1</i>").arg( text ); Amarok::ToolTip::s_hack = 1; //HACK for precise positioning } return TQPair<TQString, TQRect>( text, globalRect ); @@ -2277,7 +2277,7 @@ Playlist::writeTag( TQListViewItem *qitem, const TQString &, int column ) //SLOT for( PlaylistItem *item = m_itemsToChangeTagsFor.first(); item; item = m_itemsToChangeTagsFor.next() ) { - if( !checkFiletqStatus( item ) ) + if( !checkFileStatus( item ) ) continue; const TQString oldTag = item == qitem ? m_editOldTag : item->exactText(column); @@ -2340,8 +2340,8 @@ Playlist::paletteChange( const TQPalette &p ) const uint steps = STEPS+5+5; //so we don't fade all the way to base, and all the way up to highlight either - fg = tqcolorGroup().highlight(); - bg = tqcolorGroup().base(); + fg = colorGroup().highlight(); + bg = colorGroup().base(); dr = double(bg.red() - fg.red()) / steps; dg = double(bg.green() - fg.green()) / steps; @@ -2357,8 +2357,8 @@ Playlist::paletteChange( const TQPalette &p ) const uint steps = STEPS + 5; //so we don't fade all the way to base - fg = tqcolorGroup().highlightedText(); - bg = tqcolorGroup().text(); + fg = colorGroup().highlightedText(); + bg = colorGroup().text(); dr = double(bg.red() - fg.red()) / steps; dg = double(bg.green() - fg.green()) / steps; @@ -2372,7 +2372,7 @@ Playlist::paletteChange( const TQPalette &p ) KListView::paletteChange( p ); counter = 0; // reset the counter or apparently the text lacks contrast - slotGlowTimer(); // tqrepaint currentTrack marker + slotGlowTimer(); // repaint currentTrack marker } void @@ -2404,7 +2404,7 @@ Playlist::contentsDragMoveEvent( TQDragMoveEvent* e ) const TQPoint p = contentsToViewport( e->pos() ); TQListViewItem *item = itemAt( p ); if( !item || ctrlPressed ) item = lastItem(); - else if( p.y() - tqitemRect( item ).top() < (item->height()/2) ) item = item->itemAbove(); + else if( p.y() - itemRect( item ).top() < (item->height()/2) ) item = item->itemAbove(); if( item != m_marker ) { //NOTE this if block prevents flicker @@ -2532,7 +2532,7 @@ Playlist::viewportPaintEvent( TQPaintEvent *e ) TQPainter p( viewport() ); p.fillRect( drawDropVisualizer( 0, 0, m_marker ), - TQBrush( tqcolorGroup().highlight().dark(), TQBrush::Dense4Pattern ) ); + TQBrush( colorGroup().highlight().dark(), TQBrush::Dense4Pattern ) ); } else if( m_showHelp && isEmpty() ) { TQPainter p( viewport() ); @@ -2569,9 +2569,9 @@ Playlist::viewportPaintEvent( TQPaintEvent *e ) const uint x = (viewport()->width() - w - 30) / 2 ; const uint y = (viewport()->height() - h - 30) / 2 ; - p.setBrush( tqcolorGroup().background() ); + p.setBrush( colorGroup().background() ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); - t->draw( &p, x+15, y+15, TQRect(), tqcolorGroup() ); + t->draw( &p, x+15, y+15, TQRect(), colorGroup() ); delete t; } } @@ -2737,7 +2737,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) KPopupMenu popup; if( mouseOverColumn >= 0 ) - popup.insertItem( i18n("&Hide %1").tqarg( columnText( mouseOverColumn ) ), HIDE ); //TODO + popup.insertItem( i18n("&Hide %1").arg( columnText( mouseOverColumn ) ), HIDE ); //TODO KPopupMenu sub; for( int i = 0; i < columns(); ++i ) //columns() references a property @@ -3124,10 +3124,10 @@ Playlist::saveXML( const TQString &path ) const TQString title = ( dynamicMode()->title() ).replace( "&", "&" ) .replace( "<", "<" ) .replace( ">", ">" ); - dynamic = TQString(" dynamicMode=\"%1\"").tqarg( title ); + dynamic = TQString(" dynamicMode=\"%1\"").arg( title ); } stream << TQString( "<playlist product=\"%1\" version=\"%2\"%3>\n" ) - .tqarg( "Amarok" ).tqarg( Amarok::xmlVersion() ).tqarg( dynamic ); + .arg( "Amarok" ).arg( Amarok::xmlVersion() ).arg( dynamic ); for( MyIt it( this, MyIt::All ); *it; ++it ) { @@ -3526,10 +3526,10 @@ Playlist::copyToClipboard( const TQListViewItem *item ) const //SLOT text.append( " :: " + playlistItem->url().url() ); // Copy both to clipboard and X11-selection - TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); + TQApplication::clipboard()->setText( text, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( text, TQClipboard::Selection ); - Amarok::OSD::instance()->OSDWidget::show( i18n( "Copied: %1" ).tqarg( text ), + Amarok::OSD::instance()->OSDWidget::show( i18n( "Copied: %1" ).arg( text ), TQImage(CollectionDB::instance()->albumImage(*playlistItem )) ); } } @@ -3594,7 +3594,7 @@ Playlist::changeFromQueueManager(TQPtrList<PlaylistItem> list) m_nextTracks = list; PLItemList in, out; - // make sure we tqrepaint items no longer queued + // make sure we repaint items no longer queued for( PlaylistItem* item = oldQueue.first(); item; item = oldQueue.next() ) if( !m_nextTracks.containsRef( item ) ) out << item; @@ -3604,7 +3604,7 @@ Playlist::changeFromQueueManager(TQPtrList<PlaylistItem> list) emit queueChanged( in, out ); - // tqrepaint newly queued or altered queue items + // repaint newly queued or altered queue items if( dynamicMode() ) sortQueuedItems(); else @@ -3777,7 +3777,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S Amarok::actionCollection()->action("playlist_shuffle")->plug( &popup ); m = PlaylistBrowser::instance()->findDynamicModeByTitle( AmarokConfig::lastDynamicMode() ); if( m ) - popup.insertItem( SmallIconSet( Amarok::icon( "dynamic" ) ), i18n("L&oad %1").tqarg( m->title().replace( '&', "&&" ) ), ENABLEDYNAMIC); + popup.insertItem( SmallIconSet( Amarok::icon( "dynamic" ) ), i18n("L&oad %1").arg( m->title().replace( '&', "&&" ) ), ENABLEDYNAMIC); } switch(popup.exec(p)) { @@ -3915,11 +3915,11 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S popup.insertItem( trackColumn ? i18n("Iteratively Assign Track &Numbers") : i18n("&Write '%1' for Selected Tracks") - .tqarg( KStringHandler::rsqueeze( tag, 30 ).replace( "&", "&&" ) ), FILL_DOWN ); + .arg( KStringHandler::rsqueeze( tag, 30 ).replace( "&", "&&" ) ), FILL_DOWN ); popup.insertItem( SmallIconSet( Amarok::icon( "edit" ) ), (itemCount == 1 ? i18n( "&Edit Tag '%1'" ) - : i18n( "&Edit '%1' Tag for Selected Tracks" )).tqarg( tagName ), EDIT ); + : i18n( "&Edit '%1' Tag for Selected Tracks" )).arg( tagName ), EDIT ); popup.insertItem( SmallIconSet( Amarok::icon( "info" ) ) , item->url().isLocalFile() ? @@ -4579,7 +4579,7 @@ Playlist::slotMouseButtonPressed( int button, TQListViewItem *after, const TQPoi { case Qt::MidButton: { - const TQString path = TQApplication::tqclipboard()->text( TQClipboard::Selection ); + const TQString path = TQApplication::clipboard()->text( TQClipboard::Selection ); const KURL url = KURL::fromPathOrURL( path ); if( url.isValid() ) @@ -4646,7 +4646,7 @@ Playlist::slotMoodbarPrefs( bool show, bool moodier, int alter, bool withMusic ) { // No need to call moodbar().load(), since that will happen // automatically next time it's displayed. We do have to - // tqrepaint so that they get displayed though. + // repaint so that they get displayed though. for( PlaylistIterator it( this, PlaylistIterator::All ) ; *it ; ++it ) { @@ -4700,7 +4700,7 @@ Playlist::slotEraseMarker() //SLOT { const TQRect spot = drawDropVisualizer( 0, 0, m_marker ); m_marker = 0; - viewport()->tqrepaint( spot, false ); + viewport()->repaint( spot, false ); } } @@ -4734,7 +4734,7 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) TagDialog *dialog = new TagDialog( *item, item, instance() ); dialog->show(); } - else if ( checkFiletqStatus( item ) ) + else if ( checkFileStatus( item ) ) { TagDialog *dialog = new TagDialog( *item, item, instance() ); dialog->show(); @@ -4761,7 +4761,7 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) #include <kpushbutton.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqprocess.h> #include <unistd.h> //usleep() @@ -4790,7 +4790,7 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) lineEdit2 = new TQLineEdit( this, "Command" ); groupBox1 = new TQGroupBox( 1, Qt::Vertical, i18n( "Examples" ), this ); - groupBox1->tqlayout()->setMargin( 11 ); + groupBox1->layout()->setMargin( 11 ); new KActiveLabel( i18n( "file --brief %f\n" "ls -sh %f\n" "basename %f\n" "dirname %f" ), groupBox1 ); // buddies @@ -4798,22 +4798,22 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) textLabel3->setBuddy( lineEdit2 ); // layouts - TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 ); - tqlayout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); - tqlayout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) ); - tqlayout1->addWidget( new KPushButton( KStdGuiItem::cancel(), this, "CancelButton" ) ); + TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6 ); + layout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); + layout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) ); + layout1->addWidget( new KPushButton( KStdGuiItem::cancel(), this, "CancelButton" ) ); - TQGridLayout *tqlayout2 = new TQGridLayout( 0, 2, 2, 0, 6 ); - tqlayout2->TQLayout::add( textLabel2 ); - tqlayout2->TQLayout::add( lineEdit1 ); - tqlayout2->TQLayout::add( textLabel3 ); - tqlayout2->TQLayout::add( lineEdit2 ); + TQGridLayout *layout2 = new TQGridLayout( 0, 2, 2, 0, 6 ); + layout2->TQLayout::add( textLabel2 ); + layout2->TQLayout::add( lineEdit1 ); + layout2->TQLayout::add( textLabel3 ); + layout2->TQLayout::add( lineEdit2 ); TQVBoxLayout *Form1Layout = new TQVBoxLayout( this, 11, 6, "Form1Layout"); Form1Layout->addWidget( textLabel1 ); Form1Layout->addWidget( groupBox1 ); - Form1Layout->addLayout( tqlayout2 ); - Form1Layout->addLayout( tqlayout1 ); + Form1Layout->addLayout( layout2 ); + Form1Layout->addLayout( layout1 ); Form1Layout->addItem( new TQSpacerItem( 20, 231, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); // properties @@ -4960,7 +4960,7 @@ TagWriter::completeJob() // we write a space for some reason I cannot recall m_item->setExactText( m_tagType, m_oldTagString.isEmpty() ? " " : m_oldTagString ); Amarok::StatusBar::instance()->longMessage( i18n( - "Sorry, the tag for %1 could not be changed." ).tqarg( m_item->url().fileName() ), KDE::StatusBar::Sorry ); + "Sorry, the tag for %1 could not be changed." ).arg( m_item->url().fileName() ), KDE::StatusBar::Sorry ); break; case false: diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h index 66ad6aa0..75321957 100644 --- a/amarok/src/playlist.h +++ b/amarok/src/playlist.h @@ -175,7 +175,7 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi void restoreLayout(KConfig *config, const TQString &group); //AFT-related functions - bool checkFiletqStatus( PlaylistItem * item ); + bool checkFileStatus( PlaylistItem * item ); void addToUniqueMap( const TQString uniqueid, PlaylistItem* item ); void removeFromUniqueMap( const TQString uniqueid, PlaylistItem* item ); @@ -351,7 +351,7 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi typedef TQMap<AtomicString, PlaylistAlbum*> AlbumMap; typedef TQMap<AtomicString, AlbumMap> ArtistAlbumMap; ArtistAlbumMap m_albums; - uint m_startupTime_t; //TQDateTime::tqcurrentDateTime().toTime_t as of startup + uint m_startupTime_t; //TQDateTime::currentDateTime().toTime_t as of startup uint m_oldestTime_t; //the createdate of the oldest song in the collection diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp index 279f0c89..06546390 100644 --- a/amarok/src/playlistbrowser.cpp +++ b/amarok/src/playlistbrowser.cpp @@ -39,7 +39,7 @@ #include <tqlabel.h> #include <tqpainter.h> //paintCell() #include <tqpixmap.h> //paintCell() -#include <tqtextstream.h> //loadPlaylists(), saveM3U(), savePLS() +#include <textstream.h> //loadPlaylists(), saveM3U(), savePLS() #include <kaction.h> #include <kactionclasses.h> @@ -213,7 +213,7 @@ PlaylistBrowser::PlaylistBrowser( const char *name ) this, TQT_SLOT( currentItemChanged( TQListViewItem * ) ) ); connect( CollectionDB::instance(), TQT_SIGNAL( scanDone( bool ) ), TQT_SLOT( collectionScanDone() ) ); - setMinimumWidth( m_toolbar->tqsizeHint().width() ); + setMinimumWidth( m_toolbar->sizeHint().width() ); m_infoPane = new InfoPane( m_splitter ); @@ -562,21 +562,21 @@ void PlaylistBrowser::loadLastfmStreams( const bool subscriber /*false*/ ) } TQString user = AmarokConfig::scrobblerUsername(); - KURL url( TQString("lastfm://user/%1/neighbours").tqarg( user ) ); + KURL url( TQString("lastfm://user/%1/neighbours").arg( user ) ); last = new LastFmEntry( m_lastfmCategory, tagsFolder, url, i18n( "Neighbor Radio" ) ); last->setKept( false ); - url = KURL::fromPathOrURL( TQString("lastfm://user/%1/recommended/100").tqarg( user ) ); + url = KURL::fromPathOrURL( TQString("lastfm://user/%1/recommended/100").arg( user ) ); last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Recommended Radio" ) ); last->setKept( false ); if( subscriber ) { - url = KURL::fromPathOrURL( TQString("lastfm://user/%1/personal").tqarg( user ) ); + url = KURL::fromPathOrURL( TQString("lastfm://user/%1/personal").arg( user ) ); last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Personal Radio" ) ); last->setKept( false ); - url = KURL::fromPathOrURL( TQString("lastfm://user/%1/loved").tqarg( user ) ); + url = KURL::fromPathOrURL( TQString("lastfm://user/%1/loved").arg( user ) ); last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Loved Radio" ) ); last->setKept( false ); } @@ -668,7 +668,7 @@ void PlaylistBrowser::addSmartPlaylist( TQListViewItem *parent ) //SLOT if ( sp && sp->title() == dialog.name() ) { if( KMessageBox::warningContinueCancel( PlaylistWindow::self(), - i18n( "A Smart Playlist named \"%1\" already exists. Do you want to overwrite it?" ).tqarg( dialog.name() ), + i18n( "A Smart Playlist named \"%1\" already exists. Do you want to overwrite it?" ).arg( dialog.name() ), i18n( "Overwrite Playlist?" ), i18n( "Overwrite" ) ) == KMessageBox::Continue ) { delete item; @@ -773,7 +773,7 @@ void PlaylistBrowser::updateSmartPlaylistElement( TQDomElement& query ) sql.replace( selectFromSearch, "SELECT (*ListOfFields*) FROM" ); if ( limitSearch.search( sql ) != -1 ) sql.replace( limitSearch, - TQString( "LIMIT %1 OFFSET %2").tqarg( limitSearch.capturedTexts()[2].toInt() ).tqarg( limitSearch.capturedTexts()[1].toInt() ) ); + TQString( "LIMIT %1 OFFSET %2").arg( limitSearch.capturedTexts()[2].toInt() ).arg( limitSearch.capturedTexts()[1].toInt() ) ); text.setData( sql ); break; @@ -817,7 +817,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabArtist, *it ); - last = new SmartPlaylist( item, last, i18n( "By %1" ).tqarg( *it ), qbTemp.query() ); + last = new SmartPlaylist( item, last, i18n( "By %1" ).arg( *it ), qbTemp.query() ); last->setKept( false ); } @@ -837,7 +837,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabArtist, *it ); - last = new SmartPlaylist( item, last, i18n( "By %1" ).tqarg( *it ), qbTemp.query() ); + last = new SmartPlaylist( item, last, i18n( "By %1" ).arg( *it ), qbTemp.query() ); last->setKept( false ); } @@ -857,7 +857,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabArtist, *it ); - last = new SmartPlaylist( item, last, i18n( "By %1" ).tqarg( *it ), qbTemp.query( true ) ); + last = new SmartPlaylist( item, last, i18n( "By %1" ).arg( *it ), qbTemp.query( true ) ); last->setKept( false ); } @@ -903,7 +903,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabGenre, *it ); - last = new SmartPlaylist( item, last, i18n( "%1" ).tqarg( *it ), qbTemp.query( true ) ); + last = new SmartPlaylist( item, last, i18n( "%1" ).arg( *it ), qbTemp.query( true ) ); last->setKept( false ); } @@ -1179,7 +1179,7 @@ DEBUG_BLOCK channel = new PodcastChannel( parent, channel, *it ); bool hasNew = CollectionDB::instance()->query( TQString("SELECT COUNT(parent) FROM podcastepisodes WHERE ( parent='%1' AND isNew=%2 ) LIMIT 1" ) - .tqarg( (*it).url().url(), CollectionDB::instance()->boolT() ) ) + .arg( (*it).url().url(), CollectionDB::instance()->boolT() ) ) .first().toInt() > 0; channel->setNew( hasNew ); @@ -1241,7 +1241,7 @@ void PlaylistBrowser::savePodcastFolderStates( PlaylistCategory *folder ) if( folder != m_podcastCategory ) { if( folder->id() < 0 ) // probably due to a 1.3->1.4 migration - { // we add the folder to the db, set the id and then update all the tqchildren + { // we add the folder to the db, set the id and then update all the children int parentId = static_cast<PlaylistCategory*>(folder->parent())->id(); int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), parentId, folder->isOpen() ); folder->setId( newId ); @@ -1314,7 +1314,7 @@ void PlaylistBrowser::configurePodcasts( TQListViewItem *parent ) } } if( !podcastChannelList.isEmpty() ) - configurePodcasts( podcastChannelList, i18n( "Podcasts contained in %1", "All in %1").tqarg( parent->text( 0 ) ) ); + configurePodcasts( podcastChannelList, i18n( "Podcasts contained in %1", "All in %1").arg( parent->text( 0 ) ) ); } void PlaylistBrowser::configureSelectedPodcasts() @@ -1438,7 +1438,7 @@ void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *parent ) { Amarok::StatusBar::instance()->longMessage( i18n( "Already subscribed to feed %1 as %2" ) - .tqarg( url.prettyURL(), channel->title() ), + .arg( url.prettyURL(), channel->title() ), KDE::StatusBar::Sorry ); return; } @@ -1540,7 +1540,7 @@ bool PlaylistBrowser::deletePodcasts( TQPtrList<PodcastChannel> items ) } #undef ch /// we don't need to delete from the database, because removing the channel from the database - /// automatically removes the tqchildren as well. + /// automatically removes the children as well. m_podcastItemsToScan.remove( static_cast<PodcastChannel*>(*it) ); } CollectionDB::instance()->removePodcastChannel( static_cast<PodcastChannel*>(*it)->url() ); @@ -1789,7 +1789,7 @@ bool PlaylistBrowser::savePlaylist( const TQString &path, const TQValueList<KURL if( !file.open( IO_WriteOnly ) ) { - KMessageBox::sorry( PlaylistWindow::self(), i18n( "Cannot write playlist (%1).").tqarg(path) ); + KMessageBox::sorry( PlaylistWindow::self(), i18n( "Cannot write playlist (%1).").arg(path) ); return false; } @@ -2108,7 +2108,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT // it will be deleted from the parent TQListViewItem *parent = it.current()->parent(); - if( parent && parent->isSelected() ) //parent will remove tqchildren + if( parent && parent->isSelected() ) //parent will remove children continue; if (parent) { @@ -2278,7 +2278,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT if( lastfmCount ) saveLastFm(); } -// remove podcast folders. we need to do this recursively to ensure all tqchildren are removed from the db +// remove podcast folders. we need to do this recursively to ensure all children are removed from the db void PlaylistBrowser::removePodcastFolder( PlaylistCategory *item ) { if( !item ) return; @@ -2744,7 +2744,7 @@ void PlaylistBrowserView::eraseMarker() //SLOT spot = drawDropVisualizer( 0, 0, m_marker ); m_marker = 0; - viewport()->tqrepaint( spot, false ); + viewport()->repaint( spot, false ); } } @@ -2759,7 +2759,7 @@ void PlaylistBrowserView::viewportPaintEvent( TQPaintEvent *e ) drawItemHighlighter( &painter, m_marker ); else //when dragging on a track we draw a line marker painter.fillRect( drawDropVisualizer( 0, 0, m_marker ), - TQBrush( tqcolorGroup().highlight(), TQBrush::Dense4Pattern ) ); + TQBrush( colorGroup().highlight(), TQBrush::Dense4Pattern ) ); } } @@ -2775,7 +2775,7 @@ void PlaylistBrowserView::mousePressed( int button, TQListViewItem *item, const TQPoint p = mapFromGlobal( pnt ); p.setY( p.y() - header()->height() ); - TQRect itemrect = tqitemRect( item ); + TQRect itemrect = itemRect( item ); TQRect expandRect = TQRect( 4, itemrect.y() + (item->height()/2) - 5, 15, 15 ); if( expandRect.contains( p ) ) { //expand symbol clicked @@ -2876,7 +2876,7 @@ void PlaylistBrowserView::rename( TQListViewItem *item, int c ) { KListView::rename( item, c ); - TQRect rect( tqitemRect( item ) ); + TQRect rect( itemRect( item ) ); int fieldX = rect.x() + treeStepSize() + 2; int fieldW = rect.width() - treeStepSize() - 2; @@ -3006,7 +3006,7 @@ void PlaylistBrowserView::startDrag() textdrag->setSubtype( "amarok-sql" ); drag->addDragObject( textdrag ); } - itemList += KURL::fromPathOrURL( TQString("smartplaylist://%1").tqarg( item->text(0) ) ); + itemList += KURL::fromPathOrURL( TQString("smartplaylist://%1").arg( item->text(0) ) ); pixText = (*it)->text(0); } @@ -3020,7 +3020,7 @@ void PlaylistBrowserView::startDrag() TQTextDrag *textdrag = new TQTextDrag( str, 0 ); textdrag->setSubtype( "dynamic" ); drag->addDragObject( textdrag ); - itemList += KURL::fromPathOrURL( TQString("dynamic://%1").tqarg( item->text(0) ) ); + itemList += KURL::fromPathOrURL( TQString("dynamic://%1").arg( item->text(0) ) ); pixText = (*it)->text(0); } @@ -3054,12 +3054,12 @@ TQString PlaylistDialog::getSaveFileName( const TQString &suggestion, bool propo if( !suggestion.isEmpty() ) { TQString path = Amarok::saveLocation("playlists/") + "%1" + ".m3u"; - if( TQFileInfo( path.tqarg( suggestion ) ).exists() && !proposeOverwriting ) + if( TQFileInfo( path.arg( suggestion ) ).exists() && !proposeOverwriting ) { int n = 2; - while( TQFileInfo( path.tqarg( i18n( "%1 (%2)" ).tqarg( suggestion, TQString::number( n ) ) ) ).exists() ) + while( TQFileInfo( path.arg( i18n( "%1 (%2)" ).arg( suggestion, TQString::number( n ) ) ) ).exists() ) n++; - dialog.edit->setText( i18n( "%1 (%2)" ).tqarg( suggestion, TQString::number( n ) ) ); + dialog.edit->setText( i18n( "%1 (%2)" ).arg( suggestion, TQString::number( n ) ) ); } else dialog.edit->setText( suggestion ); @@ -3099,7 +3099,7 @@ void PlaylistDialog::slotOk() if( !TQFileInfo( result ).exists() || KMessageBox::warningContinueCancel( PlaylistWindow::self(), - i18n( "A playlist named \"%1\" already exists. Do you want to overwrite it?" ).tqarg( edit->text() ), + i18n( "A playlist named \"%1\" already exists. Do you want to overwrite it?" ).arg( edit->text() ), i18n( "Overwrite Playlist?" ), i18n( "Overwrite" ) ) == KMessageBox::Continue ) { KDialogBase::slotOk(); @@ -3151,7 +3151,7 @@ InfoPane::InfoPane( TQWidget *parent ) connect( m_pushButton, TQT_SIGNAL(toggled( bool )), TQT_SLOT(toggle( bool )) ); //Set the height to fixed. The button shouldn't be resized. - setFixedHeight( m_pushButton->tqsizeHint().height() ); + setFixedHeight( m_pushButton->sizeHint().height() ); } InfoPane::~InfoPane() @@ -3190,7 +3190,7 @@ InfoPane::toggle( bool toggled ) setStoredHeight( splitter->sizes().last() ); //Set the height to fixed. The button shouldn't be resized. - setFixedHeight( m_pushButton->tqsizeHint().height() ); + setFixedHeight( m_pushButton->sizeHint().height() ); //Now the info pane is not shown, we can disable the button if necessary m_pushButton->setEnabled( m_enable ); @@ -3243,7 +3243,7 @@ InfoPane::setInfo( const TQString &title, const TQString &info ) "</td>" "</tr>" "</table>" - "</div>" ).tqarg( title, info_ ) : + "</div>" ).arg( title, info_ ) : TQString() ); } diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index b0370ab8..41a05329 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -514,7 +514,7 @@ PlaylistCategory::showContextMenu( const TQPoint &position ) break; } name = i18n("Folder"); - if( c ) name = i18n("Folder %1").tqarg(c); + if( c ) name = i18n("Folder %1").arg(c); if( tracker == firstChild() && !isCategory( tracker ) ) tracker = 0; newFolder = new PlaylistCategory( this, tracker, name, true ); @@ -642,7 +642,7 @@ void PlaylistEntry::load() startAnimation(); connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); - //delete all tqchildren, so that we don't duplicate things + //delete all children, so that we don't duplicate things while( firstChild() ) delete firstChild(); @@ -791,7 +791,7 @@ void PlaylistEntry::customEvent( TQCustomEvent *e ) /** * We destroy the tracks on collapsing the entry. However, if we are using dynamic mode, then we leave them - * because adding from a custom list is problematic if the entry has no tqchildren. Using load() is not effective + * because adding from a custom list is problematic if the entry has no children. Using load() is not effective * since this is a threaded operation and would require pulling apart the entire class to make it work. */ @@ -814,7 +814,7 @@ void PlaylistEntry::setOpen( bool open ) } else if( !isDynamic() || !m_dynamic ) { //collapse - //delete all tqchildren + //delete all children while( firstChild() ) delete firstChild(); @@ -855,10 +855,10 @@ void PlaylistEntry::updateInfo() TQString str = "<html><body><table width=\"100%\" border=\"0\">"; - str += body.tqarg( i18n( "Playlist" ), text(0) ); - str += body.tqarg( i18n( "Number of tracks" ), TQString::number(m_trackCount) ); - str += body.tqarg( i18n( "Length" ), MetaBundle::prettyTime( m_length ) ); - str += body.tqarg( i18n( "Location" ), m_url.prettyURL() ); + str += body.arg( i18n( "Playlist" ), text(0) ); + str += body.arg( i18n( "Number of tracks" ), TQString::number(m_trackCount) ); + str += body.arg( i18n( "Length" ), MetaBundle::prettyTime( m_length ) ); + str += body.arg( i18n( "Location" ), m_url.prettyURL() ); str += "</table></body></html>"; PlaylistBrowser::instance()->setInfo( text(0), str ); @@ -1065,7 +1065,7 @@ PlaylistTrackItem::PlaylistTrackItem( TQListViewItem *parent, TQListViewItem *af if( p && p->text( 0 ).contains( info->artist() ) ) setText( 0, info->title() ); else - setText( 0, i18n("%1 - %2").tqarg( info->artist(), info->title() ) ); + setText( 0, i18n("%1 - %2").arg( info->artist(), info->title() ) ); } const KURL &PlaylistTrackItem::url() @@ -1121,7 +1121,7 @@ void PlaylistTrackItem::showContextMenu( const TQPoint &position ) TagDialog* dialog = new TagDialog( url() ); dialog->show(); } - else KMessageBox::sorry( PlaylistBrowser::instance(), i18n( "This file does not exist: %1" ).tqarg( url().path() ) ); + else KMessageBox::sorry( PlaylistBrowser::instance(), i18n( "This file does not exist: %1" ).arg( url().path() ) ); } } @@ -1212,7 +1212,7 @@ void StreamEntry::updateInfo() TQString str = "<html><body><table width=\"100%\" border=\"0\">"; - str += body.tqarg( i18n( "URL" ), m_url.prettyURL() ); + str += body.arg( i18n( "URL" ), m_url.prettyURL() ); str += "</table></body></html>"; PlaylistBrowser::instance()->setInfo( text(0), str ); @@ -2057,7 +2057,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) if( !guid.isEmpty() ) { command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND guid='%2';") - .tqarg( CollectionDB::instance()->escapeString( url().url() ), + .arg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( guid ) ); TQStringList values = CollectionDB::instance()->query( command ); return !values.isEmpty(); @@ -2066,7 +2066,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) TQString episodeTitle = xml.namedItem( "title" ).toElement().text(); KURL episodeURL = xml.namedItem( "enclosure" ).toElement().attribute( "url" ); command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND url='%2' AND title='%3';") - .tqarg( CollectionDB::instance()->escapeString( url().url() ), + .arg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( episodeURL.url() ), CollectionDB::instance()->escapeString( episodeTitle ) ); TQStringList values = CollectionDB::instance()->query( command ); @@ -2080,7 +2080,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) if( !guid.isEmpty() ) { command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND guid='%2';") - .tqarg( CollectionDB::instance()->escapeString( url().url() ), + .arg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( guid ) ); TQStringList values = CollectionDB::instance()->query( command ); return !values.isEmpty(); @@ -2099,7 +2099,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) } command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND url='%2' AND title='%3';") - .tqarg( CollectionDB::instance()->escapeString( url().url() ), + .arg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( episodeURL ), CollectionDB::instance()->escapeString( episodeTitle ) ); TQStringList values = CollectionDB::instance()->query( command ); @@ -2136,15 +2136,15 @@ PodcastChannel::updateInfo() TQString str = "<html><body><table width=\"100%\" border=\"0\">"; - str += body.tqarg( i18n( "Description" ), description() ); - str += body.tqarg( i18n( "Website" ), link().prettyURL() ); - str += body.tqarg( i18n( "Copyright" ), copyright() ); - str += body.tqarg( i18n( "URL" ), m_url.prettyURL() ); + str += body.arg( i18n( "Description" ), description() ); + str += body.arg( i18n( "Website" ), link().prettyURL() ); + str += body.arg( i18n( "Copyright" ), copyright() ); + str += body.arg( i18n( "URL" ), m_url.prettyURL() ); str += "</table>"; str += i18n( "<p> <b>Episodes</b></p><ul>" ); for( TQListViewItem *c = firstChild(); c; c = c->nextSibling() ) { - str += TQString("<li>%1</li>").tqarg( static_cast<PodcastEpisode*>(c)->title() ); + str += TQString("<li>%1</li>").arg( static_cast<PodcastEpisode*>(c)->title() ); } str += "</ul></body></html>"; @@ -2565,7 +2565,7 @@ PodcastEpisode::downloadMedia() Amarok::StatusBar::instance()->newProgressOperation( m_podcastEpisodeJob ) .setDescription( title().isEmpty() ? i18n( "Downloading Podcast Media" ) - : i18n( "Downloading Podcast \"%1\"" ).tqarg( title() ) ) + : i18n( "Downloading Podcast \"%1\"" ).arg( title() ) ) .setAbortSlot( this, TQT_SLOT( abortDownload()) ) .setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ) ); @@ -2794,13 +2794,13 @@ PodcastEpisode::updateInfo() TQString str = "<html><body><table width=\"100%\" border=\"0\">"; - //str += body.tqarg( i18n( "Title" ), m_bundle.title() ); - str += body.tqarg( i18n( "Description" ), m_bundle.description() ); - str += body.tqarg( i18n( "Date" ), m_bundle.date() ); - str += body.tqarg( i18n( "Author" ), m_bundle.author() ); - str += body.tqarg( i18n( "Type" ), m_bundle.type() ); - str += body.tqarg( i18n( "URL" ), m_bundle.url().prettyURL() ); - str += body.tqarg( i18n( "Local URL" ), isOnDisk() ? localUrl().prettyURL() : i18n( "n/a" ) ); + //str += body.arg( i18n( "Title" ), m_bundle.title() ); + str += body.arg( i18n( "Description" ), m_bundle.description() ); + str += body.arg( i18n( "Date" ), m_bundle.date() ); + str += body.arg( i18n( "Author" ), m_bundle.author() ); + str += body.arg( i18n( "Type" ), m_bundle.type() ); + str += body.arg( i18n( "URL" ), m_bundle.url().prettyURL() ); + str += body.arg( i18n( "Local URL" ), isOnDisk() ? localUrl().prettyURL() : i18n( "n/a" ) ); str += "</table></body></html>"; PlaylistBrowser::instance()->setInfo( text(0), str ); @@ -2977,7 +2977,7 @@ class AssociatePodcastDialog : public KDialogBase public: AssociatePodcastDialog( PodcastEpisode *item ) - : KDialogBase( Amarok::mainWindow(), "associatepodcastdialog", true, i18n("Select Local File for %1").tqarg(item->title()), Ok|Cancel, Ok, false ) + : KDialogBase( Amarok::mainWindow(), "associatepodcastdialog", true, i18n("Select Local File for %1").arg(item->title()), Ok|Cancel, Ok, false ) { TQVBox* vbox = makeVBoxMainWidget(); vbox->setSpacing( KDialog::spacingHint() ); @@ -3069,7 +3069,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) static TQStringList years; static TQStringList labels; - //Delete all tqchildren before + //Delete all children before while( firstChild() ) delete firstChild(); @@ -3086,7 +3086,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) genres = CollectionDB::instance()->genreList(); } foreach( genres ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), TQString(queryChildren).replace( "(*ExpandString*)", *it) ); } @@ -3096,7 +3096,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) artists = CollectionDB::instance()->artistList(); } foreach( artists ) { - m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).tqarg( *it ), + m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).arg( *it ), TQString(queryChildren).replace( "(*ExpandString*)", *it) ); } @@ -3106,7 +3106,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) composers = CollectionDB::instance()->composerList(); } foreach( composers ) { - m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).tqarg( *it ), + m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).arg( *it ), TQString(queryChildren).replace( "(*ExpandString*)", *it) ); } @@ -3116,7 +3116,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) albums = CollectionDB::instance()->albumList(); } foreach( albums ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), TQString(queryChildren).replace( "(*ExpandString*)", *it) ); } @@ -3126,7 +3126,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) years = CollectionDB::instance()->yearList(); } foreach( years ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), TQString(queryChildren).replace( "(*ExpandString*)", *it) ); } @@ -3136,7 +3136,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) labels = CollectionDB::instance()->labelList(); } foreach( labels ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), TQString(queryChildren).replace("(*ExpandString*)", *it) ); + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), TQString(queryChildren).replace("(*ExpandString*)", *it) ); } } } @@ -3147,9 +3147,9 @@ TQString SmartPlaylist::query() { if ( m_sqlForTags.isEmpty() ) m_sqlForTags = xmlToQuery( m_xml ); // duplicate string, thread-safely (TQDeepCopy is not thread-safe) - return TQString( m_sqlForTags.tqunicode(), m_sqlForTags.length() ) + return TQString( m_sqlForTags.unicode(), m_sqlForTags.length() ) .replace( "(*CurrentTimeT*)" , - TQString::number(TQDateTime::tqcurrentDateTime().toTime_t()) ) + TQString::number(TQDateTime::currentDateTime().toTime_t()) ) .replace( "(*ListOfFields*)" , QueryBuilder::dragSQLFields() ) .replace( "(*MountedDeviceSelection*)" , CollectionDB::instance()->deviceidSelection() ); @@ -3328,8 +3328,8 @@ SmartPlaylist::xmlToQuery(const TQDomElement &xml, bool forExpand /* = false */) // expand by, if needed if ( forExpand ) { - // TODO: The most efficient way would be to pass the tqchildren the XML - // and what to expand by, then have the tqchildren compute the query as needed. + // TODO: The most efficient way would be to pass the children the XML + // and what to expand by, then have the children compute the query as needed. // This could save a few megs of RAM for queries, but this patch is getting // too big already, right now. Ovy TQDomNodeList expandbyList = xml.elementsByTagName( "expandby" ); diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h index 3f0ae8db..6a711625 100644 --- a/amarok/src/playlistbrowseritem.h +++ b/amarok/src/playlistbrowseritem.h @@ -163,7 +163,7 @@ class PlaylistEntry : public PlaylistBrowserEntry PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ); ~PlaylistEntry(); - void sortChildItems ( int /*column*/, bool /*ascending*/ ) { /* Don't sort its tqchildren */ }; //reimplemented + void sortChildItems ( int /*column*/, bool /*ascending*/ ) { /* Don't sort its children */ }; //reimplemented void load(); @@ -361,13 +361,13 @@ class PodcastChannel : public PlaylistBrowserEntry void setNew( const bool n = true ); bool hasNew() const { return m_new; } - // iterate over all tqchildren and explicitly check if there are any episodes which have not been listened + // iterate over all children and explicitly check if there are any episodes which have not been listened // to. Mark the channel as new/listened after doing this. void checkAndSetNew(); void setListened( const bool n = true ); // over rides each child so it has been listened - void setOpen( bool open ); // if !m_polished, load the tqchildren. Lazy loading to improve start times + void setOpen( bool open ); // if !m_polished, load the children. Lazy loading to improve start times void load(); const bool isPolished() const { return m_polished; } @@ -555,7 +555,7 @@ class SmartPlaylist : public PlaylistBrowserEntry bool m_dynamic; // Build the query for a given xml object. If \p for expand is true, - // insert (*ExpandString*) as placeholders for tqchildrens' filters + // insert (*ExpandString*) as placeholders for childrens' filters static TQString xmlToQuery( const TQDomElement &xml, bool forExpand = false ); }; diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp index a494dc1d..75edfbb1 100644 --- a/amarok/src/playlistitem.cpp +++ b/amarok/src/playlistitem.cpp @@ -384,7 +384,7 @@ void PlaylistItem::update() const void PlaylistItem::updateColumn( int column ) const { - const TQRect r = listView()->tqitemRect( this ); + const TQRect r = listView()->itemRect( this ); if( !r.isValid() ) return; @@ -507,9 +507,9 @@ PlaylistItem::compare( TQListViewItem *i, int col, bool ascending ) const return compare( i, Album, ascending ); else { - if( a.tqstartsWith( "the ", false ) ) + if( a.startsWith( "the ", false ) ) a = a.mid( 4 ); - if( b.tqstartsWith( "the ", false ) ) + if( b.startsWith( "the ", false ) ) b = b.mid( 4 ); } break; @@ -575,7 +575,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co s_pixmapChanged = false; } - // Determine if we need to tqrepaint the pixmap, or paint from cache + // Determine if we need to repaint the pixmap, or paint from cache if ( paintCache[column].map.find( colorKey ) == paintCache[column].map.end() ) { // Update painting cache @@ -588,7 +588,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co TQColor bg; if( isSelected() ) - bg = listView()->tqcolorGroup().highlight(); + bg = listView()->colorGroup().highlight(); else bg = isAlternate() ? listView()->alternateBackground() : listView()->viewport()->backgroundColor(); @@ -596,7 +596,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co buf.fill( bg ); // Draw column divider line - p.setPen( listView()->viewport()->tqcolorGroup().mid() ); + p.setPen( listView()->viewport()->colorGroup().mid() ); p.drawLine( width - 1, 0, width - 1, height() - 1 ); // Here we draw the background bar graphics for the current track: @@ -690,8 +690,8 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co else { const TQColorGroup _cg = ( !exists() || !isEnabled() ) - ? listView()->tqpalette().disabled() - : listView()->tqpalette().active(); + ? listView()->palette().disabled() + : listView()->palette().active(); TQColor bg = isSelected() ? _cg.highlight() : isAlternate() ? listView()->alternateBackground() @@ -724,7 +724,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co // Draw column divider line if( !isSelected() ) { - p.setPen( listView()->viewport()->tqcolorGroup().mid() ); + p.setPen( listView()->viewport()->colorGroup().mid() ); p.drawLine( width - 1, 0, width - 1, height() - 1 ); } @@ -934,7 +934,7 @@ void PlaylistItem::moodbarJobEvent( int newState ) { (void) newState; // want to redraw nomatter what the new state is if( AmarokConfig::showMoodbar() ) - tqrepaint(); + repaint(); // Don't automatically resort because it's annoying } diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp index c9e5d00d..3440cba6 100644 --- a/amarok/src/playlistloader.cpp +++ b/amarok/src/playlistloader.cpp @@ -34,7 +34,7 @@ #include <tqlistview.h> #include <tqregexp.h> #include <tqstringlist.h> -#include <tqtextstream.h> //::loadPlaylist() +#include <textstream.h> //::loadPlaylist() #include <dcopref.h> #include <kapplication.h> @@ -94,7 +94,7 @@ UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options Amarok::StatusBar::instance()->newProgressOperation( this ) .setDescription( m_description ) - .settqStatus( i18n("Preparing") ) + .setStatus( i18n("Preparing") ) .setAbortSlot( this, TQT_SLOT(abort()) ) .setTotalSteps( 100 ); @@ -324,9 +324,9 @@ UrlLoader::completeJob() for ( uint it = 0; it < m_badURLs.count(); it++ ) { if( it < 5 ) - text += TQString("<br>%1").tqarg( m_badURLs[it].prettyURL() ); + text += TQString("<br>%1").arg( m_badURLs[it].prettyURL() ); else if( it == 5 ) - text += TQString("<br>Plus %1 more").tqarg( m_badURLs.count() - it ); + text += TQString("<br>Plus %1 more").arg( m_badURLs.count() - it ); debug() << "\t" << m_badURLs[it] << endl; } diff --git a/amarok/src/playlistselection.cpp b/amarok/src/playlistselection.cpp index 881667b0..60454aa7 100644 --- a/amarok/src/playlistselection.cpp +++ b/amarok/src/playlistselection.cpp @@ -20,7 +20,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqsizepolicy.h> #include <tqstringlist.h> @@ -82,7 +82,7 @@ namespace ConfigDynamic NewDynamic* nd = new NewDynamic( dialog, "new dynamic"); //TQSizePolicy policy; //policy.setHorData(TQSizePolicy::Maximum); - //dialog->tqsetSizePolicy(policy); + //dialog->setSizePolicy(policy); dialog->setMainWidget( nd ); return dialog; } @@ -123,7 +123,7 @@ namespace ConfigDynamic else //if its a suggested song or a random mix... { nd->selectPlaylist->hide(); - nd->tqlayout()->remove( nd->selectPlaylist ); + nd->layout()->remove( nd->selectPlaylist ); // don't allow editing the name of the default random and suggested dynamics nd->m_name->hide(); nd->m_playlistName_label->hide(); @@ -138,7 +138,7 @@ namespace ConfigDynamic } nd->updateGeometry(); - dialog->resize( nd->tqminimumSizeHint() ); + dialog->resize( nd->minimumSizeHint() ); if( dialog->exec() == TQDialog::Accepted ) { diff --git a/amarok/src/playlistselection.h b/amarok/src/playlistselection.h index da65d54d..31f755fc 100644 --- a/amarok/src/playlistselection.h +++ b/amarok/src/playlistselection.h @@ -23,9 +23,9 @@ class PlaylistSelection : public KListView TQ_OBJECT public: PlaylistSelection(TQWidget* parent, const char* name); - virtual TQSize tqsizeHint() const + virtual TQSize sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } private: diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp index c62053f6..2ab9aff6 100644 --- a/amarok/src/playlistwindow.cpp +++ b/amarok/src/playlistwindow.cpp @@ -44,7 +44,7 @@ #include <tqevent.h> //eventFilter() #include <tqfont.h> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> //search filter label #include <tqpainter.h> //dynamic title @@ -227,7 +227,7 @@ PlaylistWindow::PlaylistWindow() new Amarok::BurnMenuAction( ac ); if( AmarokConfig::playlistWindowSize().isValid() ) { - // if first ever run, use tqsizeHint(), and let + // if first ever run, use sizeHint(), and let // KWin place us otherwise use the stored values resize( AmarokConfig::playlistWindowSize() ); move( AmarokConfig::playlistWindowPos() ); @@ -258,7 +258,7 @@ void PlaylistWindow::init() m_browsers = new BrowserBar( this ); - //<Dynamic Mode tqStatus Bar /> + //<Dynamic Mode Status Bar /> DynamicBar *dynamicBar = new DynamicBar( m_browsers->container()); TQFrame *playlist; @@ -282,7 +282,7 @@ void PlaylistWindow::init() filter_label->setBuddy( m_lineEdit ); bar->setStretchableWidget( m_lineEdit ); KPushButton *filterButton = new KPushButton("...", bar, "filter"); - filterButton->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); + filterButton->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); m_lineEdit->setFrame( TQFrame::Sunken ); m_lineEdit->installEventFilter( this ); //we intercept keyEvents @@ -562,7 +562,7 @@ void PlaylistWindow::createGUI() //TEXT ON RIGHT HACK //KToolBarButtons have independent settings for their appearance. //KToolBarButton::modeChange() causes that button to set its mode to that of its parent KToolBar - //KToolBar::setIconText() calls modeChange() for tqchildren, unless 2nd param is false + //KToolBar::setIconText() calls modeChange() for children, unless 2nd param is false TQStringList list; list << "toolbutton_playlist_add" @@ -819,7 +819,7 @@ void PlaylistWindow::showEvent( TQShowEvent* ) } #include <tqdesktopwidget.h> -TQSize PlaylistWindow::tqsizeHint() const +TQSize PlaylistWindow::sizeHint() const { return TQApplication::desktop()->screenGeometry( (TQWidget*)this ).size() / 1.5; } @@ -856,7 +856,7 @@ void PlaylistWindow::savePlaylist() const //SLOT } if( useArtist && useAlbum ) - title = i18n("%1 - %2").tqarg( artist, album ); + title = i18n("%1 - %2").arg( artist, album ); else if( useArtist ) title = artist; else if( useAlbum ) @@ -922,7 +922,7 @@ void PlaylistWindow::playLastfmPersonal() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/personal" ) - .tqarg( AmarokConfig::scrobblerUsername() ) ); + .arg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay ); } @@ -933,7 +933,7 @@ void PlaylistWindow::addLastfmPersonal() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/personal" ) - .tqarg( AmarokConfig::scrobblerUsername() ) ); + .arg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url ); } @@ -944,7 +944,7 @@ void PlaylistWindow::playLastfmNeighbor() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/neighbours" ) - .tqarg( AmarokConfig::scrobblerUsername() ) ); + .arg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay ); } @@ -955,7 +955,7 @@ void PlaylistWindow::addLastfmNeighbor() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/neighbours" ) - .tqarg( AmarokConfig::scrobblerUsername() ) ); + .arg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url ); } @@ -1248,10 +1248,10 @@ void DynamicTitle::setTitle(const TQString& newTitle) void DynamicTitle::paintEvent(TQPaintEvent* /*e*/) { TQPainter p; - p.tqbegin( this, false ); - TQPen pen( tqcolorGroup().highlightedText(), 0, TQt::NoPen ); + p.begin( this, false ); + TQPen pen( colorGroup().highlightedText(), 0, TQt::NoPen ); p.setPen( pen ); - p.setBrush( tqcolorGroup().highlight() ); + p.setBrush( colorGroup().highlight() ); p.setFont(m_font); TQFontMetrics fm(m_font); @@ -1266,7 +1266,7 @@ void DynamicTitle::paintEvent(TQPaintEvent* /*e*/) p.drawEllipse( 0, yStart, s_curveWidth * 2, textHeight); p.drawEllipse( s_curveWidth + textWidth + s_imageSize, yStart, s_curveWidth*2, textHeight); p.fillRect( s_curveWidth, yStart, textWidth + s_imageSize + s_curveWidth, textHeight - , TQBrush( tqcolorGroup().highlight()) ); + , TQBrush( colorGroup().highlight()) ); p.drawPixmap( s_curveWidth, yStart + ((textHeight - s_imageSize) /2), SmallIcon("dynamic") ); //not sure why first arg of Rect shouldn't add @curveWidth p.drawText( TQRect(s_imageSize, yStart, s_curveWidth + textWidth +s_imageSize, textHeight), TQt::AlignCenter, m_title); diff --git a/amarok/src/playlistwindow.h b/amarok/src/playlistwindow.h index 83d4d816..6e03df2b 100644 --- a/amarok/src/playlistwindow.h +++ b/amarok/src/playlistwindow.h @@ -100,7 +100,7 @@ class PlaylistWindow : public TQWidget, public KXMLGUIClient protected: virtual void closeEvent( TQCloseEvent* ); virtual void showEvent( TQShowEvent* ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: enum MenuId { ID_SHOW_TOOLBAR = 2000, ID_SHOW_PLAYERWINDOW }; diff --git a/amarok/src/pluginmanager.cpp b/amarok/src/pluginmanager.cpp index 9164bc12..fbbce323 100644 --- a/amarok/src/pluginmanager.cpp +++ b/amarok/src/pluginmanager.cpp @@ -95,8 +95,8 @@ PluginManager::createFromService( const KService::Ptr service ) if ( !lib ) { KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>" "<p>Error message:<br/><i>%2</i></p>" ) - .tqarg( service->library() ) - .tqarg( loader->lastErrorMessage() ) ); + .arg( service->library() ) + .arg( loader->lastErrorMessage() ) ); return 0; } //look up address of init function and cast it to pointer-to-function @@ -174,12 +174,12 @@ PluginManager::showAbout( const TQString &constraint ) TQString str = "<html><body><table width=\"100%\" border=\"1\">"; - str += body.tqarg( i18n( "Name" ), s->name() ); - str += body.tqarg( i18n( "Library" ), s->library() ); - str += body.tqarg( i18n( "Authors" ), s->property( "X-KDE-Amarok-authors" ).toStringList().join( "\n" ) ); - str += body.tqarg( i18n( "Email" ), s->property( "X-KDE-Amarok-email" ).toStringList().join( "\n" ) ); - str += body.tqarg( i18n( "Version" ), s->property( "X-KDE-Amarok-version" ).toString() ); - str += body.tqarg( i18n( "Framework Version" ), s->property( "X-KDE-Amarok-framework-version" ).toString() ); + str += body.arg( i18n( "Name" ), s->name() ); + str += body.arg( i18n( "Library" ), s->library() ); + str += body.arg( i18n( "Authors" ), s->property( "X-KDE-Amarok-authors" ).toStringList().join( "\n" ) ); + str += body.arg( i18n( "Email" ), s->property( "X-KDE-Amarok-email" ).toStringList().join( "\n" ) ); + str += body.arg( i18n( "Version" ), s->property( "X-KDE-Amarok-version" ).toString() ); + str += body.arg( i18n( "Framework Version" ), s->property( "X-KDE-Amarok-framework-version" ).toString() ); str += "</table></body></html>"; diff --git a/amarok/src/podcastsettings.cpp b/amarok/src/podcastsettings.cpp index 84f8f1f2..700ce186 100644 --- a/amarok/src/podcastsettings.cpp +++ b/amarok/src/podcastsettings.cpp @@ -63,7 +63,7 @@ PodcastSettings::PodcastSettings( const TQString &title, const TQString &save, c } PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidget* parent ) - : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").tqarg( settings->m_title ) + : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").arg( settings->m_title ) , KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel , KDialogBase::Ok, true , KGuiItem(i18n("Reset"), "reset" ) ) @@ -74,7 +74,7 @@ PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidge } PodcastSettingsDialog::PodcastSettingsDialog( const TQPtrList<PodcastSettings> &list, const TQString &caption, TQWidget* parent ) - : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").tqarg( caption ) + : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").arg( caption ) , KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel , KDialogBase::Ok, true , KGuiItem(i18n("Reset"), "reset" ) ) diff --git a/amarok/src/podcastsettingsbase.ui b/amarok/src/podcastsettingsbase.ui index 8027f273..c503b4e7 100644 --- a/amarok/src/podcastsettingsbase.ui +++ b/amarok/src/podcastsettingsbase.ui @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>21</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>5</height> diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp index 5fe1bbe4..9137182c 100644 --- a/amarok/src/prettypopupmenu.cpp +++ b/amarok/src/prettypopupmenu.cpp @@ -65,7 +65,7 @@ PrettyPopupMenu::generateSidePixmap() TQRect PrettyPopupMenu::sideImageRect() const { - return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), s_sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), s_sidePixmap.width(), height() - 2*frameWidth() ), this ); } @@ -74,9 +74,9 @@ PrettyPopupMenu::calcPixmapColor() { KConfig *config = KGlobal::config(); config->setGroup("WM"); - TQColor color = TQApplication::tqpalette().active().highlight(); -// TQColor activeTitle = TQApplication::tqpalette().active().background(); -// TQColor inactiveTitle = TQApplication::tqpalette().inactive().background(); + TQColor color = TQApplication::palette().active().highlight(); +// TQColor activeTitle = TQApplication::palette().active().background(); +// TQColor inactiveTitle = TQApplication::palette().inactive().background(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); @@ -84,7 +84,7 @@ PrettyPopupMenu::calcPixmapColor() int h1, s1, v1, h2, s2, v2, h3, s3, v3; activeTitle.hsv(&h1, &s1, &v1); inactiveTitle.hsv(&h2, &s2, &v2); - TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3); + TQApplication::palette().active().background().hsv(&h3, &s3, &v3); if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) && ((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1)) @@ -138,14 +138,14 @@ void PrettyPopupMenu::resizeEvent(TQResizeEvent * e) { KPopupMenu::resizeEvent( e ); - setFrameRect( TQStyle::tqvisualRect( TQRect( s_sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( s_sidePixmap.width(), 0, width() - s_sidePixmap.width(), height() ), this ) ); } //Workaround TQt3.3.x sizing bug, by ensuring we're always wide enough. void PrettyPopupMenu::resize( int width, int height ) { - width = kMax(width, tqmaximumSize().width()); + width = kMax(width, maximumSize().width()); KPopupMenu::resize(width, height); } @@ -176,7 +176,7 @@ PrettyPopupMenu::paintEvent( TQPaintEvent* e ) tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default, + colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); } diff --git a/amarok/src/qstringx.h b/amarok/src/qstringx.h index ac5dca63..76c6389b 100644 --- a/amarok/src/qstringx.h +++ b/amarok/src/qstringx.h @@ -21,7 +21,7 @@ public: QStringx( TQChar ch ) : TQString( ch ) {}; QStringx( const TQString& s ) : TQString( s ) {}; QStringx( const TQByteArray& ba ) : TQString( ba ) {}; - QStringx( const TQChar* tqunicode, uint length ) : TQString( tqunicode, length ) {}; + QStringx( const TQChar* unicode, uint length ) : TQString( unicode, length ) {}; QStringx( const char* str ) : TQString( str ) {}; virtual ~QStringx() {}; diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp index 39510bb8..cec41390 100644 --- a/amarok/src/queuemanager.cpp +++ b/amarok/src/queuemanager.cpp @@ -105,9 +105,9 @@ QueueList::viewportPaintEvent( TQPaintEvent *e ) const uint x = (viewport()->width() - w - 30) / 2 ; const uint y = (viewport()->height() - h - 30) / 2 ; - p.setBrush( tqcolorGroup().background() ); + p.setBrush( colorGroup().background() ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); - t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() ); + t.draw( &p, x+15, y+15, TQRect(), colorGroup() ); } } @@ -373,7 +373,7 @@ QueueManager::addItems( TQListViewItem *after ) if( current.find( item ) == current.end() ) //avoid duplication { - TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); after = new QueueItem( m_listview, after, title ); m_map[ after ] = item; @@ -416,7 +416,7 @@ QueueManager::addQueuedItem( PlaylistItem *item ) TQValueList<PlaylistItem*> current = m_map.values(); TQValueListIterator<PlaylistItem*> newItem = current.find( item ); - TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); if( newItem == current.end() ) //avoid duplication { @@ -434,7 +434,7 @@ QueueManager::removeQueuedItem( PlaylistItem *item ) TQValueList<PlaylistItem*> current = m_map.values(); TQValueListIterator<PlaylistItem*> newItem = current.find( item ); - TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); TQListViewItem *removableItem = m_listview->findItem( title, 0 ); @@ -478,7 +478,7 @@ QueueManager::insertItems() for( PlaylistItem *item = list.first(); item; item = list.next() ) { - TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); last = new QueueItem( m_listview, last, title ); m_map[ last ] = item; diff --git a/amarok/src/refreshimages.cpp b/amarok/src/refreshimages.cpp index 8967f978..cc81b341 100644 --- a/amarok/src/refreshimages.cpp +++ b/amarok/src/refreshimages.cpp @@ -52,9 +52,9 @@ RefreshImages::RefreshImages() TQString url = TQString("http://webservices.amazon.%1/onca/xml?Service=AWSECommerceService&SubscriptionId=%2&Operation=ItemLookup&ItemId=%3&ResponseGroup=Small,Images") - .tqarg(localeToTLD(locale)) - .tqarg("0RTQSQ0B8CRY7VX2VF3G2") //Ian Monroe - .tqarg(asin); + .arg(localeToTLD(locale)) + .arg("0RTQSQ0B8CRY7VX2VF3G2") //Ian Monroe + .arg(asin); debug() << url << endl; diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp index cb68dc58..eb934f83 100644 --- a/amarok/src/scancontroller.cpp +++ b/amarok/src/scancontroller.cpp @@ -32,7 +32,7 @@ #include <tqdeepcopy.h> #include <tqfileinfo.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <dcopref.h> #include <kapplication.h> @@ -189,7 +189,7 @@ ScanController::initIncremental() const TQStringList values = CollectionDB::instance()->query( TQString( "SELECT deviceid, dir, changedate FROM directories WHERE deviceid IN (%1);" ) - .tqarg( deviceIds ) ); + .arg( deviceIds ) ); foreach( values ) { diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp index 90ae357a..f94f8d0f 100644 --- a/amarok/src/scriptmanager.cpp +++ b/amarok/src/scriptmanager.cpp @@ -40,7 +40,7 @@ #include <tqfileinfo.h> #include <tqfont.h> #include <tqlabel.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqtimer.h> #include <kaboutdialog.h> @@ -88,7 +88,7 @@ namespace Amarok { TQString proxy; if ( KProtocolManager::proxyForURL( kurl ) != - TQString::tqfromLatin1( "DIRECT" ) ) { + TQString::fromLatin1( "DIRECT" ) ) { KProtocolManager::slaveProtocol ( kurl, proxy ); } @@ -199,9 +199,9 @@ ScriptManager::ScriptManager( TQWidget *parent, const char *name ) m_gui->configureButton->setIconSet( SmallIconSet( Amarok::icon( "configure" ) ) ); m_gui->aboutButton ->setIconSet( SmallIconSet( Amarok::icon( "info" ) ) ); - TQSize sz = tqsizeHint(); + TQSize sz = sizeHint(); setMinimumSize( kMax( 350, sz.width() ), kMax( 250, sz.height() ) ); - resize( tqsizeHint() ); + resize( sizeHint() ); connect( this, TQT_SIGNAL(lyricsScriptChanged()), ContextBrowser::instance(), TQT_SLOT( lyricsScriptChanged() ) ); @@ -339,12 +339,12 @@ ScriptManager::requestNewScore( const TQString &url, double prevscore, int playc m_scripts[script].process->writeStdin( TQString( "requestNewScore %6 %1 %2 %3 %4 %5" ) - .tqarg( prevscore ) - .tqarg( playcount ) - .tqarg( length ) - .tqarg( percentage ) - .tqarg( reason ) - .tqarg( KURL::encode_string( url ) ) ); //last because it might have %s + .arg( prevscore ) + .arg( playcount ) + .arg( length ) + .arg( percentage ) + .arg( reason ) + .arg( KURL::encode_string( url ) ) ); //last because it might have %s } //////////////////////////////////////////////////////////////////////////////// @@ -435,7 +435,7 @@ ScriptManager::slotInstallScript( const TQString& path ) const TQString scriptFolder = destination + archiveDir->entries().first(); if( TQFile::exists( scriptFolder ) ) { KMessageBox::error( 0, i18n( "A script with the name '%1' is already installed. " - "Please uninstall it first." ).tqarg( archiveDir->entries().first() ) ); + "Please uninstall it first." ).arg( archiveDir->entries().first() ) ); return false; } @@ -512,7 +512,7 @@ ScriptManager::slotUninstallScript() { const TQString name = m_gui->listView->currentItem()->text( 0 ); - if( KMessageBox::warningContinueCancel( 0, i18n( "Are you sure you want to uninstall the script '%1'?" ).tqarg( name ), i18n("Uninstall Script"), i18n("Uninstall") ) == KMessageBox::Cancel ) + if( KMessageBox::warningContinueCancel( 0, i18n( "Are you sure you want to uninstall the script '%1'?" ).arg( name ), i18n("Uninstall Script"), i18n("Uninstall") ) == KMessageBox::Cancel ) return; if( m_scripts.find( name ) == m_scripts.end() ) @@ -610,7 +610,7 @@ ScriptManager::slotRunScript( bool silent ) { if( !silent ) KMessageBox::sorry( 0, i18n( "<p>Could not start the script <i>%1</i>.</p>" - "<p>Please make sure that the file has execute (+x) permissions.</p>" ).tqarg( name ) ); + "<p>Please make sure that the file has execute (+x) permissions.</p>" ).arg( name ) ); delete script; return false; } @@ -674,11 +674,11 @@ ScriptManager::slotAboutScript() TQString(), KDialogBase::Ok, KDialogBase::Ok, this ); kapp->setTopWidget( about ); - about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).tqarg( name ) ) ); + about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).arg( name ) ) ); about->setProduct( "", "", "", "" ); // Get rid of the confusing KDE version text TQLabel* product = static_cast<TQLabel*>( TQT_TQWIDGET(about->mainWidget()->child( "version" )) ); - if( product ) product->setText( i18n( "%1 Amarok Script" ).tqarg( name ) ); + if( product ) product->setText( i18n( "%1 Amarok Script" ).arg( name ) ); about->addTextPage( i18n( "About" ), readme.readAll(), true ); if( license.open( IO_ReadOnly ) ) @@ -726,7 +726,7 @@ ScriptManager::slotShowContextMenu( TQListViewItem* item, const TQPoint& pos ) KTextEdit* editor = new KTextEdit( it.data().log ); kapp->setTopWidget( editor ); - editor->setCaption( kapp->makeStdCaption( i18n( "Output Log for %1" ).tqarg( it.key() ) ) ); + editor->setCaption( kapp->makeStdCaption( i18n( "Output Log for %1" ).arg( it.key() ) ) ); editor->setReadOnly( true ); TQFont font( "fixed" ); @@ -746,7 +746,7 @@ ScriptManager::slotShowContextMenu( TQListViewItem* item, const TQPoint& pos ) void ScriptManager::slotReceivedStdout( KProcess*, char* buf, int len ) { - debug() << TQString::tqfromLatin1( buf, len ) << endl; + debug() << TQString::fromLatin1( buf, len ) << endl; } @@ -759,7 +759,7 @@ ScriptManager::slotReceivedStderr( KProcess* process, char* buf, int len ) for( it = m_scripts.begin(); it != end; ++it ) if( it.data().process == process ) break; - const TQString text = TQString::tqfromLatin1( buf, len ); + const TQString text = TQString::fromLatin1( buf, len ); error() << it.key() << ":\n" << text << endl; if( it.data().log.length() > 20000 ) @@ -780,7 +780,7 @@ ScriptManager::scriptFinished( KProcess* process ) //SLOT // Check if there was an error on exit if( process->normalExit() && process->exitStatus() != 0 ) KMessageBox::detailedError( 0, i18n( "The script '%1' exited with error code: %2" ) - .tqarg( it.key() ).tqarg( process->exitStatus() ) + .arg( it.key() ).arg( process->exitStatus() ) ,it.data().log ); // Destroy script process diff --git a/amarok/src/scriptmanagerbase.ui b/amarok/src/scriptmanagerbase.ui index 4fe50c2f..52a5b4b3 100644 --- a/amarok/src/scriptmanagerbase.ui +++ b/amarok/src/scriptmanagerbase.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/amarok/src/scripts/databasescripts/databaseScripts.rb b/amarok/src/scripts/databasescripts/databaseScripts.rb index 18db654f..de541510 100644 --- a/amarok/src/scripts/databasescripts/databaseScripts.rb +++ b/amarok/src/scripts/databasescripts/databaseScripts.rb @@ -38,36 +38,36 @@ class DatabaseScriptChooser < Qt::Dialog @Form1Layout = Qt::GridLayout.new(self, 1, 1, 2, 2, 'Form1Layout') - @tqlayout3 = Qt::VBoxLayout.new(nil, 0, 2, 'tqlayout3') + @layout3 = Qt::VBoxLayout.new(nil, 0, 2, 'layout3') @m_optionCombo = Qt::ComboBox.new(false, self, "m_optionCombo") - @tqlayout3.addWidget(@m_optionCombo) + @layout3.addWidget(@m_optionCombo) - @tqlayout1 = Qt::HBoxLayout.new(nil, 0, 2, 'tqlayout1') + @layout1 = Qt::HBoxLayout.new(nil, 0, 2, 'layout1') @m_saveText = Qt::Label.new(self, "m_saveText") - @tqlayout1.addWidget(@m_saveText) + @layout1.addWidget(@m_saveText) @m_saveDir = KDE::URLRequester.new(self, "m_saveDir") @m_saveDir.setMode( KDE::File::Directory | KDE::File::ExistingOnly ); @m_saveDir.setURL( ENV["HOME"] ) - @tqlayout1.addWidget(@m_saveDir) - @tqlayout3.addLayout(@tqlayout1) + @layout1.addWidget(@m_saveDir) + @layout3.addLayout(@layout1) @spacer1 = Qt::SpacerItem.new(20, 21, Qt::SizePolicy::Minimum, Qt::SizePolicy::Expanding) - @tqlayout3.addItem(@spacer1) + @layout3.addItem(@spacer1) - @tqlayout2 = Qt::HBoxLayout.new(nil, 0, 2, 'tqlayout2') + @layout2 = Qt::HBoxLayout.new(nil, 0, 2, 'layout2') @m_cancelButton = Qt::PushButton.new(self, "@m_cancelButton") - @tqlayout2.addWidget(@m_cancelButton) + @layout2.addWidget(@m_cancelButton) @spacer2 = Qt::SpacerItem.new(61, 20, Qt::SizePolicy::Expanding, Qt::SizePolicy::Minimum) - @tqlayout2.addItem(@spacer2) + @layout2.addItem(@spacer2) @m_okayButton = Qt::PushButton.new(self, "m_okayButton") - @tqlayout2.addWidget(@m_okayButton) - @tqlayout3.addLayout(@tqlayout2) + @layout2.addWidget(@m_okayButton) + @layout3.addLayout(@layout2) connect( @m_optionCombo, SIGNAL( "activated(int)" ), self, SLOT( "optionChanged(int)" ) ); connect( @m_okayButton, SIGNAL( "clicked()" ), self, SLOT( "accept()" ) ) @@ -76,10 +76,10 @@ class DatabaseScriptChooser < Qt::Dialog connect( @m_saveDir, SIGNAL( "textChanged(const QString &)" ), self, SLOT( "textChanged(const QString &)" ) ); - @Form1Layout.addLayout(@tqlayout3, 0, 0) + @Form1Layout.addLayout(@layout3, 0, 0) languageChange() - resize( Qt::Size.new(356, 137).expandedTo(tqminimumSizeHint()) ) + resize( Qt::Size.new(356, 137).expandedTo(minimumSizeHint()) ) clearWState( WState_Polished ) end diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui b/amarok/src/scripts/graphequalizer/eqdialog.ui index af027a99..ef2e1b16 100644 --- a/amarok/src/scripts/graphequalizer/eqdialog.ui +++ b/amarok/src/scripts/graphequalizer/eqdialog.ui @@ -54,7 +54,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <property name="geometry"> <rect> @@ -70,7 +70,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -78,7 +78,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -148,13 +148,13 @@ <property name="name"> <cstring>canvasView</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>404</width> <height>200</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>404</width> <height>200</height> diff --git a/amarok/src/scripts/graphequalizer/equalizerdialog.cpp b/amarok/src/scripts/graphequalizer/equalizerdialog.cpp index 6cf5348a..a3240a7c 100644 --- a/amarok/src/scripts/graphequalizer/equalizerdialog.cpp +++ b/amarok/src/scripts/graphequalizer/equalizerdialog.cpp @@ -21,7 +21,7 @@ #include "equalizercanvasview.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqslider.h> EqualizerDialog::EqualizerDialog() diff --git a/amarok/src/scripts/graphequalizer/main.cpp b/amarok/src/scripts/graphequalizer/main.cpp index 05c00232..b7c2986e 100644 --- a/amarok/src/scripts/graphequalizer/main.cpp +++ b/amarok/src/scripts/graphequalizer/main.cpp @@ -14,10 +14,10 @@ #include <tqcanvas.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsocketnotifier.h> -#include <tqtextstream.h> +#include <textstream.h> static const char description[] = diff --git a/amarok/src/scripts/graphequalizer/stdinreader.h b/amarok/src/scripts/graphequalizer/stdinreader.h index 95a0adc1..0f0171fe 100644 --- a/amarok/src/scripts/graphequalizer/stdinreader.h +++ b/amarok/src/scripts/graphequalizer/stdinreader.h @@ -6,7 +6,7 @@ * Released under GPL 2 or later, see COPYING */ #include <tqsocketnotifier.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> class StdinReader : public TQObject diff --git a/amarok/src/scripts/webcontrol/RequestHandler.py b/amarok/src/scripts/webcontrol/RequestHandler.py index cf6e87fe..8519ef35 100644 --- a/amarok/src/scripts/webcontrol/RequestHandler.py +++ b/amarok/src/scripts/webcontrol/RequestHandler.py @@ -28,11 +28,11 @@ PLIST = None REQ_IDS = {} # -# Holding current AmaroktqStatus. A bunch of init_XXX functions in +# Holding current AmarokStatus. A bunch of init_XXX functions in # order to begin dcop requests as early as possible to avoid too # much latency # -class AmaroktqStatus: +class AmarokStatus: EngineEmpty = 1 EngineIdle = 2 @@ -90,19 +90,19 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): our server.""" def _amarokPlay(self): - AmaroktqStatus.playState = AmaroktqStatus.EnginePlay + AmarokStatus.playState = AmarokStatus.EnginePlay Globals._dcopCallPlayer("play") def _amarokPause(self): - AmaroktqStatus.playState = AmaroktqStatus.EnginePause + AmarokStatus.playState = AmarokStatus.EnginePause Globals._dcopCallPlayer("pause") def _amarokNext(self): Globals._dcopCallPlayer("next") def _amarokGoto(self,index): - AmaroktqStatus.playState = AmaroktqStatus.EnginePlay - AmaroktqStatus.currentTrackIndex = int(index) + AmarokStatus.playState = AmarokStatus.EnginePlay + AmarokStatus.currentTrackIndex = int(index) Globals._dcopCallPlaylistArg("playByIndex",index) def _amarokPrev(self): @@ -110,7 +110,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): def _amarokStop(self): Globals._dcopCallPlayer("stop") - AmaroktqStatus.playState = AmaroktqStatus.EngineStop + AmarokStatus.playState = AmarokStatus.EngineStop def _amarokSetVolume(self, val): Globals._dcopCallPlayerArg("setVolume",val) @@ -165,8 +165,8 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): self._amarokSetVolume(qmap["value"]) return 1 - def _amaroktqStatus(self): - status = AmaroktqStatus() + def _amarokStatus(self): + status = AmarokStatus() return status def _sendFile(self, path): @@ -219,7 +219,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): qmap = self._parseQueryVars() session_id, last_req_id = self._getSessionInfo(qmap) - if AmaroktqStatus.allowControl and self._handleAction(qmap): + if AmarokStatus.allowControl and self._handleAction(qmap): last_req_id = last_req_id + 1 REQ_IDS[session_id] = last_req_id @@ -242,7 +242,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): self.end_headers() self._sendFile(self.path) else: - status = self._amaroktqStatus() + status = self._amarokStatus() status.dcop_volume.init() status.dcop_trackcurrenttime.init() status.dcop_tracktotaltime.init() diff --git a/amarok/src/scripts/webcontrol/WebControl.py b/amarok/src/scripts/webcontrol/WebControl.py index a6eb91cc..e172a157 100755 --- a/amarok/src/scripts/webcontrol/WebControl.py +++ b/amarok/src/scripts/webcontrol/WebControl.py @@ -60,8 +60,8 @@ class ConfigDialog( QDialog ): self.config = ConfigParser.ConfigParser() - allowControl = RequestHandler.AmaroktqStatus.allowControl - publish = RequestHandler.AmaroktqStatus.publish + allowControl = RequestHandler.AmarokStatus.allowControl + publish = RequestHandler.AmarokStatus.publish try: config = ConfigParser.ConfigParser() config.read( "webcontrolrc" ) @@ -159,8 +159,8 @@ class WebControl( QApplication ): config.read( "webcontrolrc" ) try: - RequestHandler.AmaroktqStatus.allowControl = string.find(config.get( "General", "allowcontrol" ), "True") >= 0 - RequestHandler.AmaroktqStatus.publish = string.find(config.get( "General", "publish" ), "True") >= 0 + RequestHandler.AmarokStatus.allowControl = string.find(config.get( "General", "allowcontrol" ), "True") >= 0 + RequestHandler.AmarokStatus.publish = string.find(config.get( "General", "publish" ), "True") >= 0 except: debug( "No config file found, using defaults." ) @@ -170,7 +170,7 @@ class WebControl( QApplication ): self.zeroconfPublishing() def zeroconfPublishing( self ): - if RequestHandler.AmaroktqStatus.publish: + if RequestHandler.AmarokStatus.publish: if not publisher.active: threading.Thread(target = publisher.run).start() else: @@ -234,32 +234,32 @@ class WebControl( QApplication ): def engineStatePlay( self ): """ Called when Engine state changes to Play """ - RequestHandler.AmaroktqStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime") - RequestHandler.AmaroktqStatus.dcop_trackcurrenttime.result() - RequestHandler.AmaroktqStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime") - RequestHandler.AmaroktqStatus.dcop_tracktotaltime.result() - RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EnginePlay + RequestHandler.AmarokStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime") + RequestHandler.AmarokStatus.dcop_trackcurrenttime.result() + RequestHandler.AmarokStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime") + RequestHandler.AmarokStatus.dcop_tracktotaltime.result() + RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EnginePlay def engineStateIdle( self ): """ Called when Engine state changes to Idle """ - RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EngineIdle + RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EngineIdle def engineStatePause( self ): """ Called when Engine state changes to Pause """ - RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EnginePause + RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EnginePause def engineStateEmpty( self ): """ Called when Engine state changes to Empty """ - RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EngineEmpty + RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EngineEmpty def trackChange( self ): """ Called when a new track starts """ - RequestHandler.AmaroktqStatus.dcop_trackcurrentindex = Globals.PlaylistDcop("getActiveIndex") - RequestHandler.AmaroktqStatus.dcop_trackcurrentindex.result() - RequestHandler.AmaroktqStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime") - RequestHandler.AmaroktqStatus.dcop_trackcurrenttime.result() - RequestHandler.AmaroktqStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime") - RequestHandler.AmaroktqStatus.dcop_tracktotaltime.result() + RequestHandler.AmarokStatus.dcop_trackcurrentindex = Globals.PlaylistDcop("getActiveIndex") + RequestHandler.AmarokStatus.dcop_trackcurrentindex.result() + RequestHandler.AmarokStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime") + RequestHandler.AmarokStatus.dcop_trackcurrenttime.result() + RequestHandler.AmarokStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime") + RequestHandler.AmarokStatus.dcop_tracktotaltime.result() diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp index 3edcdaf0..131ac63b 100644 --- a/amarok/src/scrobbler.cpp +++ b/amarok/src/scrobbler.cpp @@ -270,7 +270,7 @@ SubmitItem::SubmitItem( m_album = album; m_title = title; m_length = length; - m_playStartTime = now ? TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t() : 0; + m_playStartTime = now ? TQDateTime::currentDateTime( Qt::UTC ).toTime_t() : 0; } @@ -422,7 +422,7 @@ ScrobblerSubmitter::~ScrobblerSubmitter() void ScrobblerSubmitter::performHandshake() { TQString handshakeUrl = TQString(); - uint currentTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); + uint currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); if ( PROTOCOL_VERSION == "1.1" ) { @@ -439,10 +439,10 @@ void ScrobblerSubmitter::performHandshake() "&c=%2" "&v=%3" "&u=%4" ) - .tqarg( PROTOCOL_VERSION ) - .tqarg( CLIENT_ID ) - .tqarg( CLIENT_VERSION ) - .tqarg( m_username ); + .arg( PROTOCOL_VERSION ) + .arg( CLIENT_ID ) + .arg( CLIENT_VERSION ) + .arg( m_username ); } else if ( PROTOCOL_VERSION == "1.2" ) @@ -464,12 +464,12 @@ void ScrobblerSubmitter::performHandshake() "&u=%4" "&t=%5" "&a=%6" ) - .tqarg( PROTOCOL_VERSION ) - .tqarg( CLIENT_ID ) - .tqarg( CLIENT_VERSION ) - .tqarg( m_username ) - .tqarg( currentTime ) - .tqarg( KMD5( KMD5( m_password.utf8() ).hexDigest() + + .arg( PROTOCOL_VERSION ) + .arg( CLIENT_ID ) + .arg( CLIENT_VERSION ) + .arg( m_username ) + .arg( currentTime ) + .arg( KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest().data() ); } @@ -665,7 +665,7 @@ void ScrobblerSubmitter::scheduledTimeReached() */ void ScrobblerSubmitter::audioScrobblerHandshakeResult( KIO::Job* job ) //SLOT { - m_prevSubmitTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); + m_prevSubmitTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); m_inProgress = false; if ( job->error() ) { @@ -745,7 +745,7 @@ void ScrobblerSubmitter::audioScrobblerHandshakeResult( KIO::Job* job ) //SLOT */ void ScrobblerSubmitter::audioScrobblerSubmitResult( KIO::Job* job ) //SLOT { - m_prevSubmitTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); + m_prevSubmitTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); m_inProgress = false; if ( job->error() ) { @@ -891,7 +891,7 @@ SubmitItem* ScrobblerSubmitter::dequeueItem() SubmitItem* item = 0; if( m_lastSubmissionFinishTime > 0 && !m_holdFakeQueue && m_fakeQueue.getFirst() ) { - uint limit = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); + uint limit = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); if ( m_submitQueue.getFirst() ) if ( m_submitQueue.getFirst()->playStartTime() <= limit ) @@ -1000,7 +1000,7 @@ void ScrobblerSubmitter::announceSubmit( SubmitItem *item, int tracks, bool succ if ( success ) { if ( tracks == 1 ) - _short = i18n( "'%1' submitted to last.fm" ).tqarg( item->title() ); + _short = i18n( "'%1' submitted to last.fm" ).arg( item->title() ); else { _short = i18n( "Several tracks submitted to last.fm" ); @@ -1008,20 +1008,20 @@ void ScrobblerSubmitter::announceSubmit( SubmitItem *item, int tracks, bool succ _long = "<p>"; _long = i18n( "'%1' and one other track submitted", "'%1' and %n other tracks submitted", tracks-1 ) - .tqarg( item->title() ); + .arg( item->title() ); } } else { if ( tracks == 1 ) - _short = i18n( "Failed to submit '%1' to last.fm" ).tqarg( item->title() ); + _short = i18n( "Failed to submit '%1' to last.fm" ).arg( item->title() ); else { _short = i18n( "Failed to submit several tracks to last.fm" ); _long = "<p>"; _long = i18n( "Failed to submit '%1' and one other track", "Failed to submit '%1' and %n other tracks", tracks-1 ) - .tqarg( item->title() ); + .arg( item->title() ); } } @@ -1047,7 +1047,7 @@ void ScrobblerSubmitter::saveSubmitQueue() } if ( m_lastSubmissionFinishTime == 0 ) - m_lastSubmissionFinishTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); + m_lastSubmissionFinishTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); TQDomDocument newdoc; TQDomElement submitQueue = newdoc.createElement( "submit" ); @@ -1127,7 +1127,7 @@ bool ScrobblerSubmitter::schedule( bool failure ) if ( m_inProgress || !canSubmit() ) return false; - uint when, currentTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); + uint when, currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); if ( currentTime - m_prevSubmitTime > m_interval ) when = 0; else diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp index f0b347ad..d03cfc68 100644 --- a/amarok/src/sliderwidget.cpp +++ b/amarok/src/sliderwidget.cpp @@ -28,7 +28,7 @@ #include <tqapplication.h> #include <tqbitmap.h> -#include <tqbrush.h> +#include <brush.h> #include <tqimage.h> #include <tqpainter.h> #include <tqsize.h> @@ -330,13 +330,13 @@ Amarok::PrettySlider::newBundle( const MetaBundle &bundle ) but they may become useful one day **/ TQSize -Amarok::PrettySlider::tqminimumSizeHint() const +Amarok::PrettySlider::minimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } TQSize -Amarok::PrettySlider::tqsizeHint() const +Amarok::PrettySlider::sizeHint() const { constPolish(); @@ -390,13 +390,13 @@ void Amarok::VolumeSlider::generateGradient() { //TQImage temp( locate( "data","amarok/images/volumeslider-gradient.png" ) ); - //KIconEffect::colorize( temp, tqcolorGroup().highlight(), 1.0 ); + //KIconEffect::colorize( temp, colorGroup().highlight(), 1.0 ); const TQPixmap temp( locate( "data","amarok/images/volumeslider-gradient.png" ) ); const TQBitmap mask( temp.createHeuristicMask() ); m_pixmapGradient = TQPixmap( m_pixmapInset.size() ); - KPixmapEffect::gradient( m_pixmapGradient, tqcolorGroup().background(), tqcolorGroup().highlight(), + KPixmapEffect::gradient( m_pixmapGradient, colorGroup().background(), colorGroup().highlight(), KPixmapEffect::HorizontalGradient ); m_pixmapGradient.setMask( mask ); } @@ -406,12 +406,12 @@ Amarok::VolumeSlider::slotAnimTimer() //SLOT { if ( m_animEnter ) { m_animCount++; - tqrepaint( false ); + repaint( false ); if ( m_animCount == ANIM_MAX - 1 ) m_animTimer->stop(); } else { m_animCount--; - tqrepaint( false ); + repaint( false ); if ( m_animCount == 0 ) m_animTimer->stop(); } @@ -477,7 +477,7 @@ Amarok::VolumeSlider::paintEvent( TQPaintEvent * ) if( parentWidget()->backgroundPixmap() ) buf.fill( parentWidget(), pos() ); else { - buf.fill( tqcolorGroup().background() ); + buf.fill( colorGroup().background() ); // TQPainter p( &buf ); // p.fillRect( rect(), tqApp->palette().brush( TQPalette::Active, TQColorGroup::Background ) ); } diff --git a/amarok/src/smartplaylisteditor.cpp b/amarok/src/smartplaylisteditor.cpp index 5ca0242f..3e753037 100644 --- a/amarok/src/smartplaylisteditor.cpp +++ b/amarok/src/smartplaylisteditor.cpp @@ -25,7 +25,7 @@ #include <tqframe.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqstringlist.h> #include <tqtoolbutton.h> @@ -290,7 +290,7 @@ void SmartPlaylistEditor::removeCriteriaAny( CriteriaEditor *criteria ) { m_criteriaEditorAnyList.remove( criteria ); criteria->deleteLater(); - resize( size().width(), tqsizeHint().height() ); + resize( size().width(), sizeHint().height() ); if( m_criteriaEditorAnyList.count() == 1 ) m_criteriaEditorAnyList.first()->enableRemove( false ); @@ -300,7 +300,7 @@ void SmartPlaylistEditor::removeCriteriaAll( CriteriaEditor *criteria ) { m_criteriaEditorAllList.remove( criteria ); criteria->deleteLater(); - resize( size().width(), tqsizeHint().height() ); + resize( size().width(), sizeHint().height() ); if( m_criteriaEditorAllList.count() == 1 ) m_criteriaEditorAllList.first()->enableRemove( false ); @@ -322,7 +322,7 @@ void SmartPlaylistEditor::updateOrderTypes( int index ) } if( currentOrderType < m_orderTypeCombo->count() ) m_orderTypeCombo->setCurrentItem( currentOrderType ); - m_orderTypeCombo->setFont(m_orderTypeCombo->font()); // tqinvalidate size hint + m_orderTypeCombo->setFont(m_orderTypeCombo->font()); // invalidate size hint m_orderTypeCombo->updateGeometry(); } @@ -641,7 +641,7 @@ TQString CriteriaEditor::getSearchCriteria() else if( m_dateCombo->currentItem() == 1 ) //months time=86400*30*n; else time=86400*365*n; //years - value += "(*CurrentTimeT*)" + TQString(" - %1 AND ").tqarg(time) + "(*CurrentTimeT*)"; + value += "(*CurrentTimeT*)" + TQString(" - %1 AND ").arg(time) + "(*CurrentTimeT*)"; } else { TQDateTime datetime1( m_dateEdit1->date() ); @@ -896,7 +896,7 @@ void CriteriaEditor::loadEditWidgets() m_intSpinBox1 = new KIntSpinBox( m_editBox ); int maxValue = 1000; if( yearField ) { - maxValue = TQDate::tqcurrentDate().year(); + maxValue = TQDate::currentDate().year(); m_intSpinBox1->setValue( maxValue ); } m_intSpinBox1->setMaxValue( maxValue ); @@ -905,11 +905,11 @@ void CriteriaEditor::loadEditWidgets() if( m_criteriaCombo->currentText() == i18n("is between") ) { m_rangeLabel = new TQLabel( i18n("and"), m_editBox ); - m_rangeLabel->tqsetAlignment( AlignCenter ); + m_rangeLabel->setAlignment( AlignCenter ); m_rangeLabel->show(); m_intSpinBox2 = new KIntSpinBox( m_editBox ); if( yearField ) { - maxValue = TQDate::tqcurrentDate().year(); + maxValue = TQDate::currentDate().year(); m_intSpinBox2->setValue( maxValue ); } m_intSpinBox2->setMaxValue( maxValue ); @@ -927,7 +927,7 @@ void CriteriaEditor::loadEditWidgets() if( m_criteriaCombo->currentText() == i18n("is between") ) { m_rangeLabel = new TQLabel( i18n("and"), m_editBox ); - m_rangeLabel->tqsetAlignment( AlignCenter ); + m_rangeLabel->setAlignment( AlignCenter ); m_rangeLabel->show(); m_comboBox2 = new KComboBox( false, m_editBox ); m_comboBox2->insertStringList( list ); @@ -950,14 +950,14 @@ void CriteriaEditor::loadEditWidgets() m_dateCombo->show(); } else { - m_dateEdit1 = new TQDateEdit( TQDate::tqcurrentDate(), m_editBox); + m_dateEdit1 = new TQDateEdit( TQDate::currentDate(), m_editBox); m_dateEdit1->setFocus(); m_dateEdit1->show(); if( m_criteriaCombo->currentText() == i18n("is between") ) { m_rangeLabel = new TQLabel( i18n("and"), m_editBox ); - m_rangeLabel->tqsetAlignment( AlignCenter ); + m_rangeLabel->setAlignment( AlignCenter ); m_rangeLabel->show(); - m_dateEdit2 = new TQDateEdit( TQDate::tqcurrentDate(), m_editBox); + m_dateEdit2 = new TQDateEdit( TQDate::currentDate(), m_editBox); m_dateEdit2->show(); } } @@ -974,7 +974,7 @@ void CriteriaEditor::loadEditWidgets() m_intSpinBox1->show(); if( m_criteriaCombo->currentText() == i18n("is between") ) { m_rangeLabel = new TQLabel( i18n("and"), m_editBox ); - m_rangeLabel->tqsetAlignment( AlignCenter ); + m_rangeLabel->setAlignment( AlignCenter ); m_rangeLabel->show(); m_intSpinBox2 = new KIntSpinBox( m_editBox ); m_intSpinBox2->setMaxValue( maxValue ); diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp index 9b7d2ede..98e98c27 100644 --- a/amarok/src/socketserver.cpp +++ b/amarok/src/socketserver.cpp @@ -187,7 +187,7 @@ Vis::Selector::Selector( TQWidget *parent ) for( TQStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it ) new Item( this, "amarok_libvisual", *it, "libvisual" ); - resize( tqsizeHint() + TQSize(20,0) ); + resize( sizeHint() + TQSize(20,0) ); // Center the widget on screen move( parentWidget()->width()/2 - width()/2, parentWidget()->height()/2 - height()/2 ); } @@ -204,7 +204,7 @@ Vis::Selector::processExited( KProcess *proc ) void Vis::Selector::receivedStdout( KProcess */*proc*/, char* buffer, int length ) { - debug() << TQString::tqfromLatin1( buffer, length ) << endl; + debug() << TQString::fromLatin1( buffer, length ) << endl; } void diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c index aa85d2ed..1d55403b 100644 --- a/amarok/src/sqlite/sqlite3.c +++ b/amarok/src/sqlite/sqlite3.c @@ -1551,7 +1551,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** </ul> ** ** Conversions between UTF-16be and UTF-16le are always done in place and do -** not tqinvalidate a prior pointer, though of course the content of the buffer +** not invalidate a prior pointer, though of course the content of the buffer ** that the prior pointer points to will have been modified. Other kinds ** of conversion are done in place when it is possible, but sometime it is ** not possible and in those cases prior pointers are invalidated. @@ -2045,7 +2045,7 @@ SQLITE_API int sqlite3_sleep(int); ** file directory. ** ** Once [sqlite3_open()] has been called, changing this variable will -** tqinvalidate the current temporary database, if any. Generally speaking, +** invalidate the current temporary database, if any. Generally speaking, ** it is not safe to invoke this routine after [sqlite3_open()] has ** been called. */ @@ -5956,7 +5956,7 @@ extern const unsigned char sqlite3UtfTrans1[]; ** invalid characters. ** ** * These routines accept an infinite number of different UTF8 encodings -** for tqunicode values 0x80 and greater. They do not change over-length +** for unicode values 0x80 and greater. They do not change over-length ** encodings to 0xfffd as some systems recommend. ** */ @@ -9412,7 +9412,7 @@ struct Cursor { ** aRow might point to (ephemeral) data for the current row, or it might ** be NULL. */ - int cachetqStatus; /* Cache is valid if this matches Vdbe.cacheCtr */ + int cacheStatus; /* Cache is valid if this matches Vdbe.cacheCtr */ int payloadSize; /* Total number of bytes in the record */ u32 *aType; /* Type values for all entries in the record */ u32 *aOffset; /* Cached offsets to the start of each columns data */ @@ -9466,7 +9466,7 @@ typedef struct Mem Mem; ** No other flags may be set in this case. ** ** If the MEM_Str flag is set then Mem.z points at a string representation. -** Usually this is encoded in the same tqunicode encoding as the main +** Usually this is encoded in the same unicode encoding as the main ** database (see below for exceptions). If the MEM_Term flag is also ** set, then the string is nul terminated. The MEM_Int and MEM_Real ** flags may coexist with the MEM_Str flag. @@ -10100,10 +10100,10 @@ SQLITE_PRIVATE int sqlite3VdbeMemHandleBom(Mem *pMem){ #endif /* SQLITE_OMIT_UTF16 */ /* -** pZ is a UTF-8 encoded tqunicode string. If nByte is less than zero, -** return the number of tqunicode characters in pZ up to (but not including) +** pZ is a UTF-8 encoded unicode string. If nByte is less than zero, +** return the number of unicode characters in pZ up to (but not including) ** the first 0x00 byte. If nByte is not less than zero, return the -** number of tqunicode characters in the first nByte of pZ (or up to +** number of unicode characters in the first nByte of pZ (or up to ** the first 0x00, whichever comes first). */ SQLITE_PRIVATE int sqlite3Utf8CharLen(const char *zIn, int nByte){ @@ -10142,10 +10142,10 @@ SQLITE_PRIVATE char *sqlite3Utf16to8(const void *z, int nByte){ } /* -** pZ is a UTF-16 encoded tqunicode string. If nChar is less than zero, +** pZ is a UTF-16 encoded unicode string. If nChar is less than zero, ** return the number of bytes up to (but not including), the first pair ** of consecutive 0x00 bytes in pZ. If nChar is not less than zero, -** then return the number of bytes in the first nChar tqunicode characters +** then return the number of bytes in the first nChar unicode characters ** in pZ (or up until the first pair of 0x00 bytes, whichever comes first). */ SQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *zIn, int nChar){ @@ -16229,7 +16229,7 @@ int sqlite3_os_type = 0; #endif /* OS_WINCE */ /* -** Convert a UTF-8 string to microsoft tqunicode (UTF-16?). +** Convert a UTF-8 string to microsoft unicode (UTF-16?). ** ** Space to hold the returned string is obtained from sqliteMalloc. */ @@ -16251,10 +16251,10 @@ static WCHAR *utf8ToUnicode(const char *zFilename){ } /* -** Convert microsoft tqunicode to UTF-8. Space to hold the returned string is +** Convert microsoft unicode to UTF-8. Space to hold the returned string is ** obtained from sqliteMalloc(). */ -static char *tqunicodeToUtf8(const WCHAR *zWideFilename){ +static char *unicodeToUtf8(const WCHAR *zWideFilename){ int nByte; char *zFilename; @@ -16273,7 +16273,7 @@ static char *tqunicodeToUtf8(const WCHAR *zWideFilename){ } /* -** Convert an ansi string to microsoft tqunicode, based on the +** Convert an ansi string to microsoft unicode, based on the ** current codepage settings for file apis. ** ** Space to hold the returned string is obtained @@ -16298,13 +16298,13 @@ static WCHAR *mbcsToUnicode(const char *zFilename){ } /* -** Convert microsoft tqunicode to multibyte character string, based on the +** Convert microsoft unicode to multibyte character string, based on the ** user's Ansi codepage. ** ** Space to hold the returned string is obtained from ** sqliteMalloc(). */ -static char *tqunicodeToMbcs(const WCHAR *zWideFilename){ +static char *unicodeToMbcs(const WCHAR *zWideFilename){ int nByte; char *zFilename; int codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP; @@ -16335,7 +16335,7 @@ static char *mbcsToUtf8(const char *zFilename){ if( zTmpWide==0 ){ return 0; } - zFilenameUtf8 = tqunicodeToUtf8(zTmpWide); + zFilenameUtf8 = unicodeToUtf8(zTmpWide); sqliteFree(zTmpWide); return zFilenameUtf8; } @@ -16352,7 +16352,7 @@ static char *utf8ToMbcs(const char *zFilename){ if( zTmpWide==0 ){ return 0; } - zFilenameMbcs = tqunicodeToMbcs(zTmpWide); + zFilenameMbcs = unicodeToMbcs(zTmpWide); sqliteFree(zTmpWide); return zFilenameMbcs; } @@ -17025,7 +17025,7 @@ SQLITE_PRIVATE int sqlite3WinTempFileName(char *zBuf){ char *zMulti; WCHAR zWidePath[SQLITE_TEMPNAME_SIZE]; GetTempPathW(SQLITE_TEMPNAME_SIZE-30, zWidePath); - zMulti = tqunicodeToUtf8(zWidePath); + zMulti = unicodeToUtf8(zWidePath); if( zMulti ){ strncpy(zTempPath, zMulti, SQLITE_TEMPNAME_SIZE-30); zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0; @@ -17513,7 +17513,7 @@ SQLITE_PRIVATE char *sqlite3WinFullPathname(const char *zRelative){ } GetFullPathNameW((WCHAR*)zConverted, nByte, zTemp, 0); sqliteFree(zConverted); - zFull = tqunicodeToUtf8(zTemp); + zFull = unicodeToUtf8(zTemp); sqliteFree(zTemp); }else{ char *zTemp; @@ -19084,7 +19084,7 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){ ** ** The master journal file contains the names of all child journals. ** To tell if a master journal can be deleted, check to each of the -** tqchildren. If all tqchildren are either missing or do not refer to +** children. If all children are either missing or do not refer to ** a different master journal, then this master journal can be deleted. */ static int pager_delmaster(const char *zMaster){ @@ -22474,7 +22474,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){ ** 8 4 Right child (the Ptr(N) value). Omitted on leaves. ** ** The flags define the format of this btree page. The leaf flag means that -** this page has no tqchildren. The zerodata flag means that this page carries +** this page has no children. The zerodata flag means that this page carries ** only keys and no data. The intkey flag means that the key is a integer ** which is stored in the key size entry of the cell header rather than in ** the payload area. @@ -22555,7 +22555,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){ */ /* Round up a number to the next larger multiple of 8. This is used -** to force 8-byte tqalignment on 64-bit architectures. +** to force 8-byte alignment on 64-bit architectures. */ #define ROUND8(x) ((x+7)&~7) @@ -24060,7 +24060,7 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( #endif } pBt->usableSize = pBt->pageSize - nReserve; - assert( (pBt->pageSize & 7)==0 ); /* 8-byte tqalignment of pageSize */ + assert( (pBt->pageSize & 7)==0 ); /* 8-byte alignment of pageSize */ sqlite3PagerSetPagesize(pBt->pPager, pBt->pageSize); #if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO) @@ -24090,7 +24090,7 @@ btree_open_out: } /* -** Close an open database and tqinvalidate all cursors. +** Close an open database and invalidate all cursors. */ SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p){ BtShared *pBt = p->pBt; @@ -24571,7 +24571,7 @@ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){ #ifndef SQLITE_OMIT_AUTOVACUUM /* -** Set the pointer-map entries for all tqchildren of page pPage. Also, if +** Set the pointer-map entries for all children of page pPage. Also, if ** pPage contains cells that point to overflow pages, set the pointer ** map entries for the overflow pages as well. */ @@ -25611,7 +25611,7 @@ static int copyPayload( ** Once an overflow page-list cache has been allocated, it may be ** invalidated if some other cursor writes to the same table, or if ** the cursor is moved to a different row. Additionally, in auto-vacuum -** mode, the following events may tqinvalidate an overflow page-list cache. +** mode, the following events may invalidate an overflow page-list cache. ** ** * An incremental vacuum, ** * A commit in auto_vacuum="full" mode, @@ -26888,7 +26888,7 @@ static int reparentPage(BtShared *pBt, Pgno pgno, MemPage *pNewParent, int idx){ /* -** Change the pParent pointer of all tqchildren of pPage to point back +** Change the pParent pointer of all children of pPage to point back ** to pPage. ** ** In other words, for every child of pPage, invoke reparentPage() @@ -27331,7 +27331,7 @@ static int balance_nonroot(MemPage *pPage){ ** the siblings. An attempt is made to find NN siblings on either ** side of pPage. More siblings are taken from one side, however, if ** pPage there are fewer than NN siblings on the other side. If pParent - ** has NB or fewer tqchildren then all tqchildren of pParent are taken. + ** has NB or fewer children then all children of pParent are taken. */ nxDiv = idx - NN; if( nxDiv + NB > pParent->nCell ){ @@ -27362,7 +27362,7 @@ static int balance_nonroot(MemPage *pPage){ } /* Make nMaxCells a multiple of 2 in order to preserve 8-byte - ** tqalignment */ + ** alignment */ nMaxCells = (nMaxCells + 1)&~1; /* @@ -27381,13 +27381,13 @@ static int balance_nonroot(MemPage *pPage){ } szCell = (int*)&apCell[nMaxCells]; aCopy[0] = (u8*)&szCell[nMaxCells]; - assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ + assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ for(i=1; i<NB; i++){ aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; - assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ + assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ } aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; - assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ + assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ #ifndef SQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ aFrom = &aSpace[5*pBt->pageSize]; @@ -27656,7 +27656,7 @@ static int balance_nonroot(MemPage *pPage){ #ifndef SQLITE_OMIT_AUTOVACUUM /* If this is an auto-vacuum database, update the pointer map entries ** that point to the siblings that were rearranged. These can be: left - ** tqchildren of cells, the right-child of the page, or overflow pages + ** children of cells, the right-child of the page, or overflow pages ** pointed to by cells. */ if( pBt->autoVacuum ){ @@ -27758,7 +27758,7 @@ static int balance_nonroot(MemPage *pPage){ } /* - ** Reparent tqchildren of all cells. + ** Reparent children of all cells. */ for(i=0; i<nNew; i++){ rc = reparentChildPages(apNew[i]); @@ -28351,7 +28351,7 @@ SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){ } /* -** Erase the given database page and all its tqchildren. Return +** Erase the given database page and all its children. Return ** the page to the freelist. */ static int clearDatabasePage( @@ -28811,8 +28811,8 @@ static void checkList( ** NO 3. Make sure no key is less than or equal to zLowerBound. ** NO 4. Make sure no key is greater than or equal to zUpperBound. ** 5. Check the integrity of overflow pages. -** 6. Recursively call checkTreePage on all tqchildren. -** 7. Verify that the depth of all tqchildren is the same. +** 6. Recursively call checkTreePage on all children. +** 7. Verify that the depth of all children is the same. ** 8. Make sure this page is at least 33% full or else it is ** the root of the tree. */ @@ -32090,7 +32090,7 @@ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(Cursor *p){ sqlite3_search_count++; #endif p->deferredMoveto = 0; - p->cachetqStatus = CACHE_STALE; + p->cacheStatus = CACHE_STALE; } return SQLITE_OK; } @@ -35529,7 +35529,7 @@ case OP_Column: { pCrsr = pC->pCursor; if( pC->nullRow ){ payloadSize = 0; - }else if( pC->cachetqStatus==p->cacheCtr ){ + }else if( pC->cacheStatus==p->cacheCtr ){ payloadSize = pC->payloadSize; zRec = (char*)pC->aRow; }else if( pC->isIndex ){ @@ -35544,7 +35544,7 @@ case OP_Column: { /* The record is the sole entry of a pseudo-table */ payloadSize = pC->nData; zRec = pC->pData; - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; assert( payloadSize==0 || zRec!=0 ); nField = pC->nField; pCrsr = 0; @@ -35569,7 +35569,7 @@ case OP_Column: { /* Read and parse the table header. Store the results of the parse ** into the record header cache fields of the cursor. */ - if( pC && pC->cachetqStatus==p->cacheCtr ){ + if( pC && pC->cacheStatus==p->cacheCtr ){ aType = pC->aType; aOffset = pC->aOffset; }else{ @@ -35588,7 +35588,7 @@ case OP_Column: { } pC->aOffset = aOffset = &aType[nField]; pC->payloadSize = payloadSize; - pC->cachetqStatus = p->cacheCtr; + pC->cacheStatus = p->cacheCtr; /* Figure out how many bytes are in the header */ if( zRec ){ @@ -36485,7 +36485,7 @@ case OP_MoveGt: { /* no-push */ pC->rowidIsValid = 0; } pC->deferredMoveto = 0; - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; *pC->pIncrKey = 0; #ifdef SQLITE_TEST sqlite3_search_count++; @@ -36589,7 +36589,7 @@ case OP_Found: { /* no-push */ rx = sqlite3BtreeMoveto(pC->pCursor, pTos->z, pTos->n, 0, &res); alreadyExists = rx==SQLITE_OK && res==0; pC->deferredMoveto = 0; - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; } if( pOp->opcode==OP_Found ){ if( alreadyExists ) pc = pOp->p2 - 1; @@ -36664,7 +36664,7 @@ case OP_IsUnique: { /* no-push */ ** If there is no such entry, jump immediately to P2. */ assert( pCx->deferredMoveto==0 ); - pCx->cachetqStatus = CACHE_STALE; + pCx->cacheStatus = CACHE_STALE; rc = sqlite3BtreeMoveto(pCrsr, zKey, len, 0, &res); if( rc!=SQLITE_OK ){ goto abort_due_to_error; @@ -36739,7 +36739,7 @@ case OP_NotExists: { /* no-push */ pC->lastRowid = pTos->u.i; pC->rowidIsValid = res==0; pC->nullRow = 0; - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; /* res might be uninitialized if rc!=SQLITE_OK. But if rc!=SQLITE_OK ** processing is about to abort so we really do not care whether or not ** the following jump is taken. (In other words, do not stress over @@ -36920,7 +36920,7 @@ case OP_NewRowid: { } pC->rowidIsValid = 0; pC->deferredMoveto = 0; - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; } pTos++; pTos->u.i = v; @@ -37002,7 +37002,7 @@ case OP_Insert: { /* no-push */ pC->rowidIsValid = 0; pC->deferredMoveto = 0; - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; /* Invoke the update-hook if required. */ if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p3 ){ @@ -37062,7 +37062,7 @@ case OP_Delete: { /* no-push */ if( rc ) goto abort_due_to_error; rc = sqlite3BtreeDelete(pC->pCursor); pC->nextRowidValid = 0; - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; /* Invoke the update-hook if required. */ if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p3 ){ @@ -37245,7 +37245,7 @@ case OP_Last: { /* no-push */ rc = sqlite3BtreeLast(pCrsr, &res); pC->nullRow = res; pC->deferredMoveto = 0; - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; if( res && pOp->p2>0 ){ pc = pOp->p2 - 1; } @@ -37296,7 +37296,7 @@ case OP_Rewind: { /* no-push */ rc = sqlite3BtreeFirst(pCrsr, &res); pC->atFirst = res==0; pC->deferredMoveto = 0; - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; }else{ res = 1; } @@ -37343,7 +37343,7 @@ case OP_Next: { /* no-push */ rc = pOp->opcode==OP_Next ? sqlite3BtreeNext(pCrsr, &res) : sqlite3BtreePrevious(pCrsr, &res); pC->nullRow = res; - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; } if( res==0 ){ pc = pOp->p2 - 1; @@ -37386,7 +37386,7 @@ case OP_IdxInsert: { /* no-push */ const char *zKey = pTos->z; rc = sqlite3BtreeInsert(pCrsr, zKey, nKey, "", 0, 0, pOp->p2); assert( pC->deferredMoveto==0 ); - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; } } Release(pTos); @@ -37415,7 +37415,7 @@ case OP_IdxDelete: { /* no-push */ rc = sqlite3BtreeDelete(pCrsr); } assert( pC->deferredMoveto==0 ); - pC->cachetqStatus = CACHE_STALE; + pC->cacheStatus = CACHE_STALE; } Release(pTos); pTos--; @@ -39775,7 +39775,7 @@ static void heightOfSelect(Select *p, int *pnHeight){ /* ** Set the Expr.nHeight variable in the structure passed as an -** argument. An expression with no tqchildren, Expr.pList or +** argument. An expression with no children, Expr.pList or ** Expr.pSelect member has a height of 1. Any other expression ** has a height equal to the maximum height of any other ** referenced Expr plus one. @@ -39821,7 +39821,7 @@ SQLITE_PRIVATE void sqlite3ExprListDelete(ExprList *pList){ ** Walk an expression tree. Call xFunc for each node visited. ** ** The return value from xFunc determines whether the tree walk continues. -** 0 means continue walking the tree. 1 means do not walk tqchildren +** 0 means continue walking the tree. 1 means do not walk children ** of the current node but continue with siblings. 2 means abandon ** the tree walk completely. ** @@ -41310,7 +41310,7 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int */ op = ((pExpr->op+(TK_ISNULL&1))^1)-(TK_ISNULL&1); - /* Verify correct tqalignment of TK_ and OP_ constants + /* Verify correct alignment of TK_ and OP_ constants */ assert( pExpr->op!=TK_ISNULL || op==OP_NotNull ); assert( pExpr->op!=TK_NOTNULL || op==OP_IsNull ); @@ -46026,7 +46026,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex( sqliteFree(zStmt); /* Fill the index with data and reparse the schema. Code an OP_Expire - ** to tqinvalidate all pre-compiled statements. + ** to invalidate all pre-compiled statements. */ if( pTblName ){ sqlite3RefillIndex(pParse, pIndex, iMem); @@ -48125,7 +48125,7 @@ static void upperFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return; z2 = (char*)sqlite3_value_text(argv[0]); n = sqlite3_value_bytes(argv[0]); - /* Verify that the call to _bytes() does not tqinvalidate the _text() pointer */ + /* Verify that the call to _bytes() does not invalidate the _text() pointer */ assert( z2==(char*)sqlite3_value_text(argv[0]) ); if( z2 ){ z1 = sqlite3_malloc(n+1); @@ -48145,7 +48145,7 @@ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return; z2 = (char*)sqlite3_value_text(argv[0]); n = sqlite3_value_bytes(argv[0]); - /* Verify that the call to _bytes() does not tqinvalidate the _text() pointer */ + /* Verify that the call to _bytes() does not invalidate the _text() pointer */ assert( z2==(char*)sqlite3_value_text(argv[0]) ); if( z2 ){ z1 = sqlite3_malloc(n+1); @@ -53685,7 +53685,7 @@ static int sqlite3Prepare16( if( zTail8 && pzTail ){ /* If sqlite3_prepare returns a tail pointer, we calculate the - ** equivalent pointer into the UTF-16 string by counting the tqunicode + ** equivalent pointer into the UTF-16 string by counting the unicode ** characters between zSql8 and zTail8, and then returning a pointer ** the same number of characters into the UTF-16 string. */ @@ -60019,7 +60019,7 @@ struct WhereTerm { i16 leftColumn; /* Column number of X in "X <op> <expr>" */ u16 eOperator; /* A WO_xx value describing <op> */ u8 flags; /* Bit flags. See below */ - u8 nChild; /* Number of tqchildren that must disable us */ + u8 nChild; /* Number of children that must disable us */ WhereClause *pWC; /* The clause this term is part of */ Bitmask prereqRight; /* Bitmask of tables used by pRight */ Bitmask prereqAll; /* Bitmask of tables referenced by p */ @@ -66935,7 +66935,7 @@ SQLITE_PRIVATE int sqlite3CreateFunc( /* Check if an existing function is being overridden or deleted. If so, ** and there are active VMs, then return SQLITE_BUSY. If a function ** is being overridden/deleted but there are no active VMs, allow the - ** operation to continue but tqinvalidate all precompiled statements. + ** operation to continue but invalidate all precompiled statements. */ p = sqlite3FindFunction(db, zFunctionName, nName, nArg, enc, 0); if( p && p->iPrefEnc==enc && p->nArg==nArg ){ @@ -67205,7 +67205,7 @@ SQLITE_API const char *sqlite3_errmsg(sqlite3 *db){ ** error. */ SQLITE_API const void *sqlite3_errmsg16(sqlite3 *db){ - /* Because all the characters in the string are in the tqunicode + /* Because all the characters in the string are in the unicode ** range 0x00-0xFF, if we pad the big-endian string with a ** zero byte, we can obtain the little-endian string with ** &big_endian[1]. @@ -67292,7 +67292,7 @@ static int createCollation( /* Check if this call is removing or replacing an existing collation ** sequence. If so, and there are active VMs, return busy. If there - ** are no active VMs, tqinvalidate any pre-compiled statements. + ** are no active VMs, invalidate any pre-compiled statements. */ pColl = sqlite3FindCollSeq(db, (u8)enc2, zName, strlen(zName), 0); if( pColl && pColl->xCmp ){ diff --git a/amarok/src/sqlite/sqlite3.h b/amarok/src/sqlite/sqlite3.h index 474b8936..cb1fdb6c 100644 --- a/amarok/src/sqlite/sqlite3.h +++ b/amarok/src/sqlite/sqlite3.h @@ -1522,7 +1522,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** </ul> ** ** Conversions between UTF-16be and UTF-16le are always done in place and do -** not tqinvalidate a prior pointer, though of course the content of the buffer +** not invalidate a prior pointer, though of course the content of the buffer ** that the prior pointer points to will have been modified. Other kinds ** of conversion are done in place when it is possible, but sometime it is ** not possible and in those cases prior pointers are invalidated. @@ -2016,7 +2016,7 @@ int sqlite3_sleep(int); ** file directory. ** ** Once [sqlite3_open()] has been called, changing this variable will -** tqinvalidate the current temporary database, if any. Generally speaking, +** invalidate the current temporary database, if any. Generally speaking, ** it is not safe to invoke this routine after [sqlite3_open()] has ** been called. */ diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp index 979ee203..644cdafd 100644 --- a/amarok/src/statistics.cpp +++ b/amarok/src/statistics.cpp @@ -272,12 +272,12 @@ StatisticsList::renderView() qb.addReturnFunctionValue( QueryBuilder::funcMin, QueryBuilder::tabStats, QueryBuilder::valCreateDate ); qb.setOptions( QueryBuilder::optRemoveDuplicates ); a = qb.run(); - TQDateTime firstPlay = TQDateTime::tqcurrentDateTime(); + TQDateTime firstPlay = TQDateTime::currentDateTime(); if ( a[0].toUInt() ) firstPlay.setTime_t( a[0].toUInt() ); m_newestItem = new StatisticsItem( i18n("Newest Items"), this, m_genreItem ); - m_newestItem->setSubtext( i18n("First played %1").tqarg( Amarok::verboseTimeSince( firstPlay ) ) ); + m_newestItem->setSubtext( i18n("First played %1").arg( Amarok::verboseTimeSince( firstPlay ) ) ); m_trackItem ->setIcon( Amarok::icon("track") ); m_mostplayedItem->setIcon( Amarok::icon("mostplayed") ); @@ -344,7 +344,7 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i], fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1]); TQString score = locale->formatNumber( fave[i+3].toDouble(), 0 ); @@ -378,11 +378,11 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i], fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1]); double plays = fave[i+3].toDouble(); - TQString subtext = i18n("%1: %2").tqarg( i18n( "Playcount" ) ).tqarg( plays ); + TQString subtext = i18n("%1: %2").arg( i18n( "Playcount" ) ).arg( plays ); m_last = new StatisticsDetailedItem( name, subtext, item, m_last ); m_last->setItemType( StatisticsDetailedItem::TRACK ); m_last->setUrl( fave[i+2] ); @@ -413,13 +413,13 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2").tqarg( TQString::number(c), + TQString name = i18n("%1. %2").arg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i] ); TQString score = locale->formatNumber( fave[i+1].toDouble(), 2 ); TQString rating = locale->formatNumber( fave[i+2].toDouble() / 2.0, 2 ); m_last = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last ); m_last->setItemType( StatisticsDetailedItem::ARTIST ); - TQString url = TQString("%1").tqarg( fave[i] ); + TQString url = TQString("%1").arg( fave[i] ); m_last->setUrl( url ); c++; } @@ -461,7 +461,7 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { const bool isSampler = (fave[i+6] == trueValue); - TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i], isSampler ? i18n( "Various Artists" ) : ( fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1] ) ); @@ -470,7 +470,7 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) m_last = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last ); m_last->setItemType( StatisticsDetailedItem::ALBUM ); - TQString url = TQString("%1 @@@ %2").tqarg( isSampler ? "0" : fave[i+2], fave[i+3] ); + TQString url = TQString("%1 @@@ %2").arg( isSampler ? "0" : fave[i+2], fave[i+3] ); m_last->setUrl( url ); c++; } @@ -500,14 +500,14 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2").tqarg( TQString::number(c), + TQString name = i18n("%1. %2").arg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i] ); TQString score = locale->formatNumber( fave[i+1].toDouble(), 2 ); TQString rating = locale->formatNumber( fave[i+2].toDouble() / 2.0, 2 ); m_last = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last ); m_last->setItemType( StatisticsDetailedItem::GENRE ); - TQString url = TQString("%1").tqarg( fave[i] ); + TQString url = TQString("%1").arg( fave[i] ); m_last->setUrl( url ); c++; } @@ -541,33 +541,33 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < newest.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), newest[i].isEmpty() ? i18n( "Unknown" ) : newest[i], newest[i+1].isEmpty() ? i18n( "Unknown" ) : newest[i+1] ); TQDateTime added = TQDateTime(); added.setTime_t( newest[i+4].toUInt() ); - TQString subtext = i18n("Added: %1").tqarg( Amarok::verboseTimeSince( added ) ); + TQString subtext = i18n("Added: %1").arg( Amarok::verboseTimeSince( added ) ); m_last = new StatisticsDetailedItem( name, subtext, item, m_last ); m_last->setItemType( StatisticsDetailedItem::HISTORY ); - TQString url = TQString("%1 @@@ %2").tqarg( newest[i+2] ).tqarg( newest[i+3] ); + TQString url = TQString("%1 @@@ %2").arg( newest[i+2] ).arg( newest[i+3] ); m_last->setUrl( url ); c++; } } item->setExpanded( true ); - repaintItem( item ); // Better than ::tqrepaint(), flickers less + repaintItem( item ); // Better than ::repaint(), flickers less delete locale; } TQString StatisticsList::subText( const TQString &score, const TQString &rating ) //static { if( AmarokConfig::useScores() && AmarokConfig::useRatings() ) - return i18n( "Score: %1 Rating: %2" ).tqarg( score ).tqarg( rating ); + return i18n( "Score: %1 Rating: %2" ).arg( score ).arg( rating ); else if( AmarokConfig::useScores() ) - return i18n( "Score: %1" ).tqarg( score ); + return i18n( "Score: %1" ).arg( score ); else if( AmarokConfig::useRatings() ) - return i18n( "Rating: %1" ).tqarg( rating ); + return i18n( "Rating: %1" ).arg( rating ); else return TQString(); } @@ -623,9 +623,9 @@ StatisticsList::viewportPaintEvent( TQPaintEvent *e ) const uint x = (viewport()->width() - w - 30) / 2 ; const uint y = (viewport()->height() - h - 30) / 2 ; - p.setBrush( tqcolorGroup().background() ); + p.setBrush( colorGroup().background() ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); - t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() ); + t.draw( &p, x+15, y+15, TQRect(), colorGroup() ); } } @@ -735,7 +735,7 @@ StatisticsItem::slotAnimTimer() if( m_animEnter ) { m_animCount += 1; - listView()->repaintItem( this ); // Better than ::tqrepaint(), flickers less + listView()->repaintItem( this ); // Better than ::repaint(), flickers less if( m_animCount >= ANIM_MAX ) m_animTimer->stop(); @@ -930,7 +930,7 @@ StatisticsDetailedItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col if( showDetails ) { - const TQColorGroup _cg = listView()->tqpalette().disabled(); + const TQColorGroup _cg = listView()->palette().disabled(); text_x = lv->treeStepSize() + 3; font.setItalic( true ); pBuf.setPen( isSelected() ? _cg.highlightedText() : TQColor(_cg.text().dark()) ); diff --git a/amarok/src/statistics.h b/amarok/src/statistics.h index 4c043bec..0161e3a3 100644 --- a/amarok/src/statistics.h +++ b/amarok/src/statistics.h @@ -135,7 +135,7 @@ class StatisticsItem : public TQObject, public KListViewItem TQString m_subText; }; -/// Listview items for the tqchildren of expanded items (the actual results) +/// Listview items for the children of expanded items (the actual results) class StatisticsDetailedItem : public KListViewItem { public: diff --git a/amarok/src/statusbar/overlayWidget.cpp b/amarok/src/statusbar/overlayWidget.cpp index 3298056f..7f120a53 100644 --- a/amarok/src/statusbar/overlayWidget.cpp +++ b/amarok/src/statusbar/overlayWidget.cpp @@ -49,10 +49,10 @@ OverlayWidget::reposition() p.setY( -height() ); // Position in the toplevelwidget's coordinates - TQPoint pTopLevel = m_anchor->mapTo( tqtopLevelWidget(), p ); + TQPoint pTopLevel = m_anchor->mapTo( topLevelWidget(), p ); // Position in the widget's parentWidget coordinates - TQPoint pParent = parentWidget() ->mapFrom( tqtopLevelWidget(), pTopLevel ); + TQPoint pParent = parentWidget() ->mapFrom( topLevelWidget(), pTopLevel ); // keep it on the screen if( pParent.x() < 0 ) pParent.rx() = 0; diff --git a/amarok/src/statusbar/popupMessage.cpp b/amarok/src/statusbar/popupMessage.cpp index 58855c14..00c24c1c 100644 --- a/amarok/src/statusbar/popupMessage.cpp +++ b/amarok/src/statusbar/popupMessage.cpp @@ -62,9 +62,9 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con TQLabel *label; KActiveLabel *alabel; - m_tqlayout = new TQVBoxLayout( this, 9 /*margin*/, 6 /*spacing*/ ); + m_layout = new TQVBoxLayout( this, 9 /*margin*/, 6 /*spacing*/ ); - hbox = new TQHBoxLayout( m_tqlayout, 12 ); + hbox = new TQHBoxLayout( m_layout, 12 ); hbox->addWidget( m_countdownFrame = new TQFrame( this, "counterVisual" ) ); m_countdownFrame->setFixedWidth( fontMetrics().width( "X" ) ); @@ -76,12 +76,12 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con alabel = new KActiveLabel( this, "label" ); alabel->setTextFormat( TQt::RichText ); - alabel->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); + alabel->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); alabel->setPalette( p ); hbox->add( alabel ); - hbox = new TQHBoxLayout( m_tqlayout ); + hbox = new TQHBoxLayout( m_layout ); hbox->addItem( new TQSpacerItem( 4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); hbox->add( new KPushButton( KStdGuiItem::close(), this, "closeButton" ) ); @@ -91,7 +91,7 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con void PopupMessage::addWidget( TQWidget *widget ) { - m_tqlayout->add( widget ); + m_layout->add( widget ); adjustSize(); } @@ -191,7 +191,7 @@ void PopupMessage::countDown() TQFrame *&h = m_countdownFrame; if( m_counter < h->height() - 3 ) - TQPainter( h ).fillRect( 2, 2, h->width() - 4, m_counter, tqpalette().active().highlight() ); + TQPainter( h ).fillRect( 2, 2, h->width() - 4, m_counter, palette().active().highlight() ); if( !hasMouse() ) m_counter++; @@ -213,7 +213,7 @@ void PopupMessage::dissolveMask() { if( m_stage == 1 ) { - tqrepaint( false ); + repaint( false ); TQPainter maskPainter(&m_mask); m_mask.fill(TQt::black); diff --git a/amarok/src/statusbar/popupMessage.h b/amarok/src/statusbar/popupMessage.h index e23b7a39..eec8125d 100644 --- a/amarok/src/statusbar/popupMessage.h +++ b/amarok/src/statusbar/popupMessage.h @@ -28,7 +28,7 @@ #include "overlayWidget.h" #include <tqbitmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> namespace KDE @@ -85,7 +85,7 @@ namespace KDE void slideMask(); private: - TQVBoxLayout *m_tqlayout; + TQVBoxLayout *m_layout; TQFrame *m_countdownFrame; TQWidget *m_anchor; TQWidget *m_parent; diff --git a/amarok/src/statusbar/progressBar.cpp b/amarok/src/statusbar/progressBar.cpp index 2e69bf19..9b6d1415 100644 --- a/amarok/src/statusbar/progressBar.cpp +++ b/amarok/src/statusbar/progressBar.cpp @@ -38,7 +38,7 @@ ProgressBar::ProgressBar( TQWidget *parent, TQLabel *label ) { DEBUG_FUNC_INFO - m_label->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + m_label->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); m_abort = new KPushButton( KStdGuiItem::cancel(), parent ); m_abort->hide(); m_abort->setText( i18n("Abort") ); @@ -61,7 +61,7 @@ ProgressBar::setDescription( const TQString &text ) } ProgressBar& -ProgressBar::settqStatus( const TQString &text ) +ProgressBar::setStatus( const TQString &text ) { TQString s = m_description; s += " ["; @@ -100,11 +100,11 @@ ProgressBar::setDone() if( !m_done ) { m_done = true; m_abort->setEnabled( false ); - settqStatus( i18n("Done") ); + setStatus( i18n("Done") ); } else // then we we're aborted - settqStatus( i18n("Aborted") ); + setStatus( i18n("Aborted") ); } void @@ -114,7 +114,7 @@ ProgressBar::hide() m_done = true; m_abort->setEnabled( false ); - settqStatus( i18n("Aborting...") ); + setStatus( i18n("Aborting...") ); } } diff --git a/amarok/src/statusbar/progressBar.h b/amarok/src/statusbar/progressBar.h index a3f5f1b7..fdb8ad85 100644 --- a/amarok/src/statusbar/progressBar.h +++ b/amarok/src/statusbar/progressBar.h @@ -44,7 +44,7 @@ namespace KDE ProgressBar &setDescription( const TQString &text ); /** @param text eg. Scanning, Reading. The state of the operation */ - ProgressBar &settqStatus( const TQString &text ); + ProgressBar &setStatus( const TQString &text ); /** set the recipient slot for the abort button */ ProgressBar &setAbortSlot( TQObject *receiver, const char *slot ); diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp index d78869a0..c25431f2 100644 --- a/amarok/src/statusbar/queueLabel.cpp +++ b/amarok/src/statusbar/queueLabel.cpp @@ -99,27 +99,27 @@ void QueueLabel::setNum( int num ) TQPixmap pix( w, h ); TQPainter p( &pix ); - p.setBrush( tqcolorGroup().background() ); - p.setPen( tqcolorGroup().background() ); + p.setBrush( colorGroup().background() ); + p.setPen( colorGroup().background() ); p.drawRect( pix.rect() ); - p.setBrush( tqcolorGroup().highlight() ); - p.setPen( tqcolorGroup().highlight().dark() ); + p.setBrush( colorGroup().highlight() ); + p.setPen( colorGroup().highlight().dark() ); if( w > h ) { p.drawPie( 0, 0, h, h, 90*16, 180*16 ); p.drawPie( w-1 -h, 0, h, h, -90*16, 180*16 ); p.drawLine( h/2-1, 0, w-1 - h/2, 0 ); p.drawLine( h/2-1, h-1, w-1 - h/2, h-1 ); - p.setPen( tqcolorGroup().highlight() ); + p.setPen( colorGroup().highlight() ); p.drawRect( h/2-1, 1, w - h + 1, h-2 ); } else p.drawEllipse( pix.rect() ); p.setFont( f ); - p.setPen( tqcolorGroup().highlightedText() ); - p.setBrush( tqcolorGroup().highlight().dark() ); + p.setPen( colorGroup().highlightedText() ); + p.setBrush( colorGroup().highlight().dark() ); p.drawText( pix.rect(), TQt::AlignCenter | TQt::SingleLine, text ); p.end(); @@ -175,7 +175,7 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) const uint count = queue.count(); if( length ) menu->insertTitle( i18n( "1 Queued Track (%1)", "%n Queued Tracks (%1)", count ) - .tqarg( MetaBundle::prettyLength( length, true ) ) ); + .arg( MetaBundle::prettyLength( length, true ) ) ); else menu->insertTitle( i18n( "1 Queued Track", "%n Queued Tracks", count ) ); Amarok::actionCollection()->action( "queue_manager" )->plug( menu ); @@ -191,7 +191,7 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) { for( uint n = kMin( i + MAX_TO_SHOW - 1, count ); i <= n; ++i, ++it ) menu->insertItem( - KStringHandler::rsqueeze( i18n( "%1. %2" ).tqarg( i ).tqarg( veryNiceTitle( *it ) ), 50 ), i ); + KStringHandler::rsqueeze( i18n( "%1. %2" ).arg( i ).arg( veryNiceTitle( *it ) ), 50 ), i ); if( i < count ) { @@ -205,8 +205,8 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) menu = menus.getFirst(); int mx, my; - const int mw = menu->tqsizeHint().width(), - mh = menu->tqsizeHint().height(), + const int mw = menu->sizeHint().width(), + mh = menu->sizeHint().height(), sy = mapFrom( Amarok::StatusBar::instance(), TQPoint( 0, 0 ) ).y(), sheight = Amarok::StatusBar::instance()->height(); const TQRect dr = TQApplication::desktop()->availableGeometry( this ); @@ -264,11 +264,11 @@ void QueueLabel::showToolTip() } if( length ) text += TQString("<center>%1</center>") - .tqarg( i18n( "1 track (%1)", "%n tracks (%1)", count ) - .tqarg( MetaBundle::prettyLength( length, true ) ) ); + .arg( i18n( "1 track (%1)", "%n tracks (%1)", count ) + .arg( MetaBundle::prettyLength( length, true ) ) ); } - text += i18n( "Next: %1" ).tqarg( veryNiceTitle( item, true /*bold*/ ) ); + text += i18n( "Next: %1" ).arg( veryNiceTitle( item, true /*bold*/ ) ); m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), this, 0 ); m_tooltip->setShowCloseButton( false ); @@ -296,9 +296,9 @@ TQString QueueLabel::veryNiceTitle( PlaylistItem* item, bool bold ) const const TQString artist = item->artist()->stripWhiteSpace(), title = item->title().stripWhiteSpace(); if( !artist.isEmpty() && !title.isEmpty() ) - return ( bold ? i18n( "<b>%1</b> by <b>%2</b>" ) : i18n( "%1 by %2" ) ).tqarg( title ).tqarg( artist ); + return ( bold ? i18n( "<b>%1</b> by <b>%2</b>" ) : i18n( "%1 by %2" ) ).arg( title ).arg( artist ); else - return TQString( "<b>%1</b>" ).tqarg( MetaBundle::prettyTitle( item->filename() ) ); + return TQString( "<b>%1</b>" ).arg( MetaBundle::prettyTitle( item->filename() ) ); } diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h index 596834a4..6e819a1c 100644 --- a/amarok/src/statusbar/selectLabel.h +++ b/amarok/src/statusbar/selectLabel.h @@ -126,8 +126,8 @@ class SelectLabel : public TQLabel m_tooltipShowing = true; TQString tip = i18n("%1: %2") - .tqarg( m_action->text().remove( '&' ) ) - .tqarg( m_action->currentText().remove( '&' ) ); + .arg( m_action->text().remove( '&' ) ) + .arg( m_action->currentText().remove( '&' ) ); if( !isEnabled() ) tip += i18n(" <br> <i>Disabled</i>"); @@ -136,7 +136,7 @@ class SelectLabel : public TQLabel { KSelectAction *a = static_cast<KSelectAction*>( Amarok::actionCollection()->action( "favor_tracks" ) ); tip += TQString("<br><br>") + i18n("%1: %2") - .tqarg( a->text().remove( '&' ), a->currentText().remove( '&' ) ); + .arg( a->text().remove( '&' ), a->currentText().remove( '&' ) ); } tip += " "; diff --git a/amarok/src/statusbar/squeezedtextlabel.cpp b/amarok/src/statusbar/squeezedtextlabel.cpp index caca939a..4d6c842c 100644 --- a/amarok/src/statusbar/squeezedtextlabel.cpp +++ b/amarok/src/statusbar/squeezedtextlabel.cpp @@ -28,30 +28,30 @@ namespace KDE { SqueezedTextLabel::SqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); fullText = text; squeezeTextToLabel(); } SqueezedTextLabel::SqueezedTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); } void SqueezedTextLabel::resizeEvent( TQResizeEvent * ) { squeezeTextToLabel(); } -TQSize SqueezedTextLabel::tqminimumSizeHint() const +TQSize SqueezedTextLabel::minimumSizeHint() const { - TQSize sh = TQLabel::tqminimumSizeHint(); + TQSize sh = TQLabel::minimumSizeHint(); sh.setWidth(-1); return sh; } -TQSize SqueezedTextLabel::tqsizeHint() const +TQSize SqueezedTextLabel::sizeHint() const { - return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); + return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); } void SqueezedTextLabel::setText( const TQString &text ) { @@ -127,11 +127,11 @@ void SqueezedTextLabel::squeezeTextToLabel() } } -void SqueezedTextLabel::tqsetAlignment( int tqalignment ) +void SqueezedTextLabel::setAlignment( int alignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::tqsetAlignment(tqalignment); + TQLabel::setAlignment(alignment); fullText = tmpFull; } diff --git a/amarok/src/statusbar/squeezedtextlabel.h b/amarok/src/statusbar/squeezedtextlabel.h index a5cdbb0c..121c18ab 100644 --- a/amarok/src/statusbar/squeezedtextlabel.h +++ b/amarok/src/statusbar/squeezedtextlabel.h @@ -35,9 +35,9 @@ public: SqueezedTextLabel( TQWidget *parent, const char *name = 0 ); SqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqsizeHint() const; - virtual void tqsetAlignment( int ); + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual void setAlignment( int ); public slots: void setText( const TQString & ); diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp index e2373936..d13acd18 100644 --- a/amarok/src/statusbar/statusBarBase.cpp +++ b/amarok/src/statusbar/statusBarBase.cpp @@ -37,11 +37,11 @@ #include <tqfile.h> //writeLogFile() #include <tqpushbutton.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmessagebox.h> #include <tqobjectlist.h> //polish() #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqprogressbar.h> #include <tqstyle.h> //class CloseButton #include <tqtimer.h> @@ -86,10 +86,10 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) : TQWidget( parent, name ) , m_logCounter( -1 ) { - TQBoxLayout *maintqlayout = new TQHBoxLayout( this, 2, /*spacing*/5 ); + TQBoxLayout *mainlayout = new TQHBoxLayout( this, 2, /*spacing*/5 ); //we need extra spacing due to the way we paint the surrounding boxes - TQBoxLayout *tqlayout = new TQHBoxLayout( maintqlayout, /*spacing*/5 ); + TQBoxLayout *layout = new TQHBoxLayout( mainlayout, /*spacing*/5 ); TQHBox *statusBarTextBox = new TQHBox( this, "statusBarTextBox" ); m_mainTextLabel = new KDE::SqueezedTextLabel( statusBarTextBox, "mainTextLabel" ); @@ -103,15 +103,15 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) mainProgressBarBox->setSpacing( 2 ); mainProgressBarBox->hide(); - tqlayout->add( statusBarTextBox ); - tqlayout->add( mainProgressBarBox ); - tqlayout->setStretchFactor( statusBarTextBox, 3 ); - tqlayout->setStretchFactor( mainProgressBarBox, 1 ); + layout->add( statusBarTextBox ); + layout->add( mainProgressBarBox ); + layout->setStretchFactor( statusBarTextBox, 3 ); + layout->setStretchFactor( mainProgressBarBox, 1 ); - m_otherWidgetLayout = new TQHBoxLayout( maintqlayout, /*spacing*/5 ); + m_otherWidgetLayout = new TQHBoxLayout( mainlayout, /*spacing*/5 ); - maintqlayout->setStretchFactor( tqlayout, 6 ); - maintqlayout->setStretchFactor( m_otherWidgetLayout, 4 ); + mainlayout->setStretchFactor( layout, 6 ); + mainlayout->setStretchFactor( m_otherWidgetLayout, 4 ); shortLongButton->setIconSet( SmallIconSet( "edit_add" ) ); TQToolTip::add( shortLongButton, i18n( "Show details" ) ); @@ -129,7 +129,7 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) m_popupProgress->setMargin( 1 ); m_popupProgress->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); m_popupProgress->setFrameShape( TQFrame::StyledPanel ); - m_popupProgress->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + m_popupProgress->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); (new TQGridLayout( m_popupProgress, 1 /*rows*/, 3 /*cols*/, 6, 3 ))->setAutoAdd( true ); } @@ -151,7 +151,7 @@ StatusBar::polish() TQObjectList *list = queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false ); for( TQObject * o = list->first(); o; o = list->next() ) { - int _h = TQT_TQWIDGET( o ) ->tqminimumSizeHint().height(); + int _h = TQT_TQWIDGET( o ) ->minimumSizeHint().height(); if ( _h > h ) h = _h; @@ -185,7 +185,7 @@ StatusBar::paintEvent( TQPaintEvent* ) TQStyle::PE_StatusBarSection, &p, TQRect( w->x() - 1, w->y() - 1, w->width() + 2, w->height() + 2 ), - tqcolorGroup(), + colorGroup(), TQStyle::Style_Default, TQStyleOption( w ) ); } @@ -541,12 +541,12 @@ StatusBar::incrementProgressTotalSteps( const TQObject *owner, int inc ) } void -StatusBar::setProgresstqStatus( const TQObject *owner, const TQString &text ) +StatusBar::setProgressStatus( const TQObject *owner, const TQString &text ) { if ( !m_progressMap.contains( owner ) ) return ; - m_progressMap[owner]->settqStatus( text ); + m_progressMap[owner]->setStatus( text ); } void StatusBar::incrementProgress() @@ -669,7 +669,7 @@ StatusBar::writeLogFile( const TQString &text ) TQTextStream stream( &file ); stream.setEncoding( TQTextStream::UnicodeUTF8 ); - stream << "[" << KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) << "] " << text << endl; + stream << "[" << KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) << "] " << text << endl; } } //namespace KDE diff --git a/amarok/src/statusbar/statusBarBase.h b/amarok/src/statusbar/statusBarBase.h index e71f5071..8bfe392d 100644 --- a/amarok/src/statusbar/statusBarBase.h +++ b/amarok/src/statusbar/statusBarBase.h @@ -52,7 +52,7 @@ namespace KDE * * statusbar->newProgressOperation( myObject ) * .setDescription( i18n("MyProgressOperation") ) - * .settqStatus( i18n("Stage1") ) + * .setStatus( i18n("Stage1") ) * .setAbortSlot( myObject, TQT_SLOT(abort()) ) * .setTotalSteps( 100 ); * @@ -93,7 +93,7 @@ namespace KDE * @return the progressBar so you can configure its parameters * @see setProgress( TQObject*, int ) * @see incrementProgress( TQObject* ) - * @see setProgresstqStatus( const TQObject*, const TQString& ) + * @see setProgressStatus( const TQObject*, const TQString& ) */ ProgressBar &newProgressOperation( TQObject *owner ); @@ -104,7 +104,7 @@ namespace KDE void incrementProgressTotalSteps( const TQObject *owner, int inc = 1 ); void incrementProgress( const TQObject *owner ); - void setProgresstqStatus( const TQObject *owner, const TQString &text ); + void setProgressStatus( const TQObject *owner, const TQString &text ); public slots: /** @@ -187,7 +187,7 @@ namespace KDE /** * You must parent the widget to the statusbar, we won't do that - * for you! The widget will be added to the right of the tqlayout. + * for you! The widget will be added to the right of the layout. * Currently you must add widgets before the statusbar gets shown * for the first time, because we are not currently very flexible. */ diff --git a/amarok/src/statusbar/statusbar.cpp b/amarok/src/statusbar/statusbar.cpp index 6d2c1e37..b191aa23 100644 --- a/amarok/src/statusbar/statusbar.cpp +++ b/amarok/src/statusbar/statusbar.cpp @@ -32,7 +32,7 @@ #include <klocale.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> // stuff that must be included last @@ -65,8 +65,8 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) // total songs count m_itemCountLabel = new TQLabel( this ); - m_itemCountLabel->tqsetAlignment( TQt::AlignCenter ); - m_itemCountLabel->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed ); + m_itemCountLabel->setAlignment( TQt::AlignCenter ); + m_itemCountLabel->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed ); //positionBox TQWidget *positionBox = new TQWidget( this, "positionBox" ); @@ -85,12 +85,12 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) // TODO Both labels need tooltips (string freeze?) TQWidget *hbox = new TQWidget( this ); - TQBoxLayout *tqlayout = new TQHBoxLayout( hbox, 0, 2 ); - tqlayout->addSpacing( 3 ); - tqlayout->addWidget( m_queueLabel = new QueueLabel( hbox ) ); - tqlayout->addWidget( new SelectLabel( static_cast<Amarok::SelectAction*>( Amarok::action( "repeat" ) ), hbox ) ); - tqlayout->addWidget( new SelectLabel( static_cast<Amarok::SelectAction*>( Amarok::action( "random_mode" ) ), hbox ) ); - tqlayout->addSpacing( 3 ); + TQBoxLayout *layout = new TQHBoxLayout( hbox, 0, 2 ); + layout->addSpacing( 3 ); + layout->addWidget( m_queueLabel = new QueueLabel( hbox ) ); + layout->addWidget( new SelectLabel( static_cast<Amarok::SelectAction*>( Amarok::action( "repeat" ) ), hbox ) ); + layout->addWidget( new SelectLabel( static_cast<Amarok::SelectAction*>( Amarok::action( "random_mode" ) ), hbox ) ); + layout->addSpacing( 3 ); //TODO reimplement insertChild() instead addWidget( m_itemCountLabel ); @@ -183,16 +183,16 @@ StatusBar::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ ) // ugly because of translation requirements if( !title.isEmpty() && !artist.isEmpty() && !album.isEmpty() ) title = i18n( "track by artist on album", "<b>%1</b> by <b>%2</b> on <b>%3</b>" ) - .tqarg( title, artist, album ); + .arg( title, artist, album ); else if( !title.isEmpty() && !artist.isEmpty() ) title = i18n( "track by artist", "<b>%1</b> by <b>%2</b>" ) - .tqarg( title, artist ); + .arg( title, artist ); else if( !album.isEmpty() ) // we try for pretty title as it may come out better title = i18n( "track on album", "<b>%1</b> on <b>%2</b>" ) - .tqarg( prettyTitle, album ); + .arg( prettyTitle, album ); else title = "<b>" + prettyTitle + "</b>"; @@ -206,7 +206,7 @@ StatusBar::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ ) title += ')'; } - setMainText( i18n( "Playing: %1" ).tqarg( title ) ); + setMainText( i18n( "Playing: %1" ).arg( title ) ); m_slider->newBundle( bundle ); engineTrackLengthChanged( bundle.length() ); @@ -220,10 +220,10 @@ StatusBar::slotItemCountChanged( int newCount, int newLength, //total const bool hasSel = ( selCount > 1 ), hasVis = ( visCount != newCount ); TQString text = ( hasSel && hasVis ) ? i18n( "%1 selected of %2 visible tracks" ) - .tqarg( selCount ).tqarg( visCount ) + .arg( selCount ).arg( visCount ) : ( hasVis && newCount == 1 ) ? i18n( "0 visible of 1 track" ) - : ( hasVis ) ? i18n( "%1 visible of %2 tracks" ).tqarg( visCount).tqarg( newCount ) - : ( hasSel ) ? i18n( "%1 selected of %2 tracks" ).tqarg( selCount ).tqarg( newCount ) + : ( hasVis ) ? i18n( "%1 visible of %2 tracks" ).arg( visCount).arg( newCount ) + : ( hasSel ) ? i18n( "%1 selected of %2 tracks" ).arg( selCount ).arg( newCount ) : i18n( "1 track", "%n tracks", newCount ); int getValue = 0; @@ -238,11 +238,11 @@ StatusBar::slotItemCountChanged( int newCount, int newLength, //total getValue = newLength; if( getValue ) - m_itemCountLabel->setText( i18n( "X visible/selected tracks (time) ", "%1 (%2)" ).tqarg( text, MetaBundle::fuzzyTime( getValue ) ) ); + m_itemCountLabel->setText( i18n( "X visible/selected tracks (time) ", "%1 (%2)" ).arg( text, MetaBundle::fuzzyTime( getValue ) ) ); else m_itemCountLabel->setText( text ); - TQToolTip::add( m_itemCountLabel, i18n( "Play-time: %1" ).tqarg( MetaBundle::veryPrettyTime( getValue ) ) ); + TQToolTip::add( m_itemCountLabel, i18n( "Play-time: %1" ).arg( MetaBundle::veryPrettyTime( getValue ) ) ); } void diff --git a/amarok/src/statusbar/timeLabel.h b/amarok/src/statusbar/timeLabel.h index 1acd0d3b..ec703b93 100644 --- a/amarok/src/statusbar/timeLabel.h +++ b/amarok/src/statusbar/timeLabel.h @@ -28,7 +28,7 @@ public: TimeLabel( TQWidget *parent ) : TQLabel( " 0:00:00 ", parent ) { setFont( KGlobalSettings::fixedFont() ); - tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed ); + setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed ); } virtual void mousePressEvent( TQMouseEvent * ) diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h index f1ba257a..0ff74243 100644 --- a/amarok/src/statusbar/toggleLabel.h +++ b/amarok/src/statusbar/toggleLabel.h @@ -123,7 +123,7 @@ class ToggleLabel : public TQLabel m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCounter( false ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); - m_tooltip->setText( tip.tqarg(m_action->text().remove('&') ) ); + m_tooltip->setText( tip.arg(m_action->text().remove('&') ) ); m_tooltip->setImage( path ); m_tooltip->reposition(); diff --git a/amarok/src/systray.cpp b/amarok/src/systray.cpp index 81e80f78..7bfa39e3 100644 --- a/amarok/src/systray.cpp +++ b/amarok/src/systray.cpp @@ -26,7 +26,7 @@ namespace Amarok static TQPixmap loadOverlay( const char *iconName, int iconWidth ) { - return TQImage( locate( "data", TQString( "amarok/images/b_%1.png" ).tqarg( iconName ) ), "PNG" ).smoothScale( ((iconWidth/2)-(iconWidth/20)), ((iconWidth/2)-(iconWidth/20)) ); + return TQImage( locate( "data", TQString( "amarok/images/b_%1.png" ).arg( iconName ) ), "PNG" ).smoothScale( ((iconWidth/2)-(iconWidth/20)), ((iconWidth/2)-(iconWidth/20)) ); } } @@ -146,12 +146,12 @@ Amarok::TrayIcon::engineStateChanged( Engine::State state, Engine::State /*oldSt if( AmarokConfig::animateTrayIcon() ) blinkTimerID = startTimer( 1500 ); // start 'blink' timer - paintIcon( mergeLevel, true ); // tqrepaint the icon + paintIcon( mergeLevel, true ); // repaint the icon break; case Engine::Empty: overlayVisible = false; - paintIcon( -1, true ); // tqrepaint the icon + paintIcon( -1, true ); // repaint the icon // fall through to default: default: setLastFm( false ); @@ -175,7 +175,7 @@ Amarok::TrayIcon::engineTrackPositionChanged( long position, bool /*userSeek*/ ) void Amarok::TrayIcon::paletteChange( const TQPalette & op ) { - if ( tqpalette().active().highlight() == op.active().highlight() || alternateIcon.isNull() ) + if ( palette().active().highlight() == op.active().highlight() || alternateIcon.isNull() ) return; alternateIcon.resize( 0, 0 ); @@ -209,7 +209,7 @@ Amarok::TrayIcon::paintIcon( int mergePixels, bool force ) // eros: this looks cool with dark red blue or green but sucks with // other colors (such as kde default's pale pink..). maybe the effect // or the blended color has to be changed.. - TQColor saturatedColor = tqpalette().active().highlight(); + TQColor saturatedColor = palette().active().highlight(); int hue, sat, value; saturatedColor.getHsv( &hue, &sat, &value ); saturatedColor.setHsv( hue, sat > 200 ? 200 : sat, value < 100 ? 100 : value ); diff --git a/amarok/src/systray.h b/amarok/src/systray.h index 63383733..fe9380d8 100644 --- a/amarok/src/systray.h +++ b/amarok/src/systray.h @@ -38,7 +38,7 @@ private: // repaints trayIcon showing progress (and overlay if present) void paintIcon( int mergePixels = -1, bool force = false ); - // blend an overlay icon over 'sourcePixmap' and tqrepaint trayIcon + // blend an overlay icon over 'sourcePixmap' and repaint trayIcon void blendOverlay( TQPixmap &sourcePixmap ); long trackLength, mergeLevel; diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp index 0f66a715..40e76a00 100644 --- a/amarok/src/tagdialog.cpp +++ b/amarok/src/tagdialog.cpp @@ -24,7 +24,7 @@ #include <tqfile.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpair.h> #include <tqpushbutton.h> #include <tqtooltip.h> @@ -309,7 +309,7 @@ TagDialog::queryDone( KTRMResultList results, TQString error ) //SLOT #if HAVE_TUNEPIMP if ( !error.isEmpty() ) { - KMessageBox::sorry( this, i18n( "Tunepimp (MusicBrainz tagging library) returned the following error: \"%1\"." ).tqarg(error) ); + KMessageBox::sorry( this, i18n( "Tunepimp (MusicBrainz tagging library) returned the following error: \"%1\"." ).arg(error) ); } else { if ( !results.isEmpty() ) @@ -418,12 +418,12 @@ void TagDialog::init() //m_labelCloud = new KHTMLPart( labels_favouriteLabelsFrame ); m_labelCloud = new HTMLView( labels_favouriteLabelsFrame ); - m_labelCloud->view()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored, false ); + m_labelCloud->view()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored, false ); m_labelCloud->view()->setVScrollBarMode( TQScrollView::AlwaysOff ); m_labelCloud->view()->setHScrollBarMode( TQScrollView::AlwaysOff ); new TQVBoxLayout( labels_favouriteLabelsFrame ); - labels_favouriteLabelsFrame->tqlayout()->add( m_labelCloud->view() ); + labels_favouriteLabelsFrame->layout()->add( m_labelCloud->view() ); const TQStringList favoriteLabels = CollectionDB::instance()->favoriteLabels(); TQString html = generateHTML( favoriteLabels ); m_labelCloud->set( html ); @@ -550,7 +550,7 @@ void TagDialog::init() // make it as small as possible - resize( tqsizeHint().width(), tqminimumSize().height() ); + resize( sizeHint().width(), minimumSize().height() ); } @@ -629,21 +629,21 @@ void TagDialog::readTags() { bool local = m_bundle.url().isLocalFile(); - setCaption( kapp->makeStdCaption( i18n("Track Information: %1 by %2").tqarg( m_bundle.title(), m_bundle.artist() ) ) ); + setCaption( kapp->makeStdCaption( i18n("Track Information: %1 by %2").arg( m_bundle.title(), m_bundle.artist() ) ) ); TQString niceTitle; if ( m_bundle.album().isEmpty() ) { if( !m_bundle.title().isEmpty() ) { if( !m_bundle.artist().isEmpty() ) - niceTitle = i18n( "<b>%1</b> by <b>%2</b>" ).tqarg( m_bundle.title(), m_bundle.artist() ); + niceTitle = i18n( "<b>%1</b> by <b>%2</b>" ).arg( m_bundle.title(), m_bundle.artist() ); else - niceTitle = TQString( "<b>%1</b>" ).tqarg( m_bundle.title() ); + niceTitle = TQString( "<b>%1</b>" ).arg( m_bundle.title() ); } else niceTitle = m_bundle.prettyTitle(); } else { niceTitle = i18n( "<b>%1</b> by <b>%2</b> on <b>%3</b>" ) - .tqarg( m_bundle.title(), m_bundle.artist(), m_bundle.album() ); + .arg( m_bundle.title(), m_bundle.artist(), m_bundle.album() ); } trackArtistAlbumLabel->setText( niceTitle ); trackArtistAlbumLabel2->setText( niceTitle ); @@ -671,22 +671,22 @@ void TagDialog::readTags() const TQString emptyLine = "<tr><td colspan=2></td></tr>"; summaryText = "<table width=100%><tr><td width=50%><table>"; - summaryText += body2cols.tqarg( i18n("Length"), unknownSafe( m_bundle.prettyLength() ) ); - summaryText += body2cols.tqarg( i18n("Bitrate"), unknownSafe( m_bundle.prettyBitrate() ) ); - summaryText += body2cols.tqarg( i18n("Samplerate"), unknownSafe( m_bundle.prettySampleRate() ) ); - summaryText += body2cols.tqarg( i18n("Size"), unknownSafe( m_bundle.prettyFilesize() ) ); - summaryText += body2cols.tqarg( i18n("Format"), unknownSafe( m_bundle.type() ) ); + summaryText += body2cols.arg( i18n("Length"), unknownSafe( m_bundle.prettyLength() ) ); + summaryText += body2cols.arg( i18n("Bitrate"), unknownSafe( m_bundle.prettyBitrate() ) ); + summaryText += body2cols.arg( i18n("Samplerate"), unknownSafe( m_bundle.prettySampleRate() ) ); + summaryText += body2cols.arg( i18n("Size"), unknownSafe( m_bundle.prettyFilesize() ) ); + summaryText += body2cols.arg( i18n("Format"), unknownSafe( m_bundle.type() ) ); summaryText += "</table></td><td width=50%><table>"; if( AmarokConfig::useScores() ) - summaryText += body2cols.tqarg( i18n("Score"), TQString::number( static_cast<int>( m_bundle.score() ) ) ); + summaryText += body2cols.arg( i18n("Score"), TQString::number( static_cast<int>( m_bundle.score() ) ) ); if( AmarokConfig::useRatings() ) - summaryText += body2cols.tqarg( i18n("Rating"), m_bundle.prettyRating() ); + summaryText += body2cols.arg( i18n("Rating"), m_bundle.prettyRating() ); - summaryText += body2cols.tqarg( i18n("Playcount"), TQString::number( m_bundle.playCount() ) ); - summaryText += body2cols.tqarg( i18n("First Played"), + summaryText += body2cols.arg( i18n("Playcount"), TQString::number( m_bundle.playCount() ) ); + summaryText += body2cols.arg( i18n("First Played"), m_bundle.playCount() ? KGlobal::locale()->formatDate( CollectionDB::instance()->getFirstPlay( m_bundle.url().path() ).date() , true ) : i18n("Never") ); - summaryText += body2cols.tqarg( i18n("a single item (singular)", "Last Played"), + summaryText += body2cols.arg( i18n("a single item (singular)", "Last Played"), m_bundle.playCount() ? KGlobal::locale()->formatDate( CollectionDB::instance()->getLastPlay( m_bundle.url().path() ).date() , true ) : i18n("Never") ); summaryText += "</table></td></tr></table>"; @@ -696,7 +696,7 @@ void TagDialog::readTags() TQStringList sData = statisticsData(); for ( uint i = 0; i<sData.count(); i+=2 ) { - statisticsText += body2cols.tqarg( sData[i], sData[i+1] ); + statisticsText += body2cols.arg( sData[i], sData[i+1] ); } statisticsText += "</table>"; @@ -916,15 +916,15 @@ TagDialog::readMultipleTracks() TQString statisticsText = "<table>"; if( AmarokConfig::useRatings() ) { - statisticsText += body.tqarg( i18n( "Rated Songs" ) , TQString::number( ratingCount ) ); + statisticsText += body.arg( i18n( "Rated Songs" ) , TQString::number( ratingCount ) ); if ( ratingCount ) - statisticsText += body.tqarg( i18n( "Average Rating" ) , TQString::number( (float)ratingSum / (float)ratingCount/2.0, 'f', 1 ) ); + statisticsText += body.arg( i18n( "Average Rating" ) , TQString::number( (float)ratingSum / (float)ratingCount/2.0, 'f', 1 ) ); } if( AmarokConfig::useRatings() ) { - statisticsText += body.tqarg( i18n( "Scored Songs" ) , TQString::number( scoreCount ) ); + statisticsText += body.arg( i18n( "Scored Songs" ) , TQString::number( scoreCount ) ); if ( scoreCount ) - statisticsText += body.tqarg( i18n( "Average Score" ) , TQString::number( scoreSum / scoreCount, 'f', 1 ) ); + statisticsText += body.arg( i18n( "Average Score" ) , TQString::number( scoreSum / scoreCount, 'f', 1 ) ); } @@ -1388,7 +1388,7 @@ TagDialog::generateHTML( const TQStringList &labels ) if ( labelUse == 0 ) labelUse = 1; html.append( TQString( "<span class='label size%1'><a href=\"label:%2\">%3</a></span> " ) - .tqarg( TQString::number( labelUse ), mapping[key].first, mapping[key].first ) ); + .arg( TQString::number( labelUse ), mapping[key].first, mapping[key].first ) ); } html.append( "</html></body>" ); debug() << "Dumping HTML for label cloud: " << html << endl; @@ -1418,7 +1418,7 @@ TagDialog::writeTag( MetaBundle &mb, bool updateCB ) TQCString path = TQFile::encodeName( mb.url().path() ); if ( !TagLib::File::isWritable( path ) ) { Amarok::StatusBar::instance()->longMessage( i18n( - "The file %1 is not writable." ).tqarg( mb.url().fileName() ), KDE::StatusBar::Error ); + "The file %1 is not writable." ).arg( mb.url().fileName() ), KDE::StatusBar::Error ); return false; } @@ -1458,7 +1458,7 @@ TagDialogWriter::doJob() TQCString path = TQFile::encodeName( m_tags[i].url().path() ); if ( !TagLib::File::isWritable( path ) ) { Amarok::StatusBar::instance()->longMessageThreadSafe( i18n( - "The file %1 is not writable." ).tqarg( m_tags[i].url().fileName() ), KDE::StatusBar::Error ); + "The file %1 is not writable." ).arg( m_tags[i].url().fileName() ), KDE::StatusBar::Error ); m_failed += true; continue; } @@ -1491,7 +1491,7 @@ TagDialogWriter::completeJob() CollectionView::instance()->databaseChanged(); if ( m_failCount ) Amarok::StatusBar::instance()->longMessage( i18n( - "Sorry, the tag for the following files could not be changed:\n" ).tqarg( m_failedURLs.join( ";\n" ) ), KDE::StatusBar::Error ); + "Sorry, the tag for the following files could not be changed:\n" ).arg( m_failedURLs.join( ";\n" ) ), KDE::StatusBar::Error ); } diff --git a/amarok/src/tagdialogbase.ui b/amarok/src/tagdialogbase.ui index 8ce0a726..589f6fb1 100644 --- a/amarok/src/tagdialogbase.ui +++ b/amarok/src/tagdialogbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout5_3</cstring> + <cstring>layout5_3</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>215</width> <height>30</height> @@ -106,7 +106,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -169,13 +169,13 @@ <property name="name"> <cstring>pixmap_cover</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>85</width> <height>85</height> @@ -189,7 +189,7 @@ <property name="text"> <string>Track by Artist on Album</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -231,7 +231,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -286,7 +286,7 @@ </widget> <widget class="TQLayoutWidget" row="8" column="1"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -372,7 +372,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> - <cstring>tqlayout5_2</cstring> + <cstring>layout5_2</cstring> </property> <hbox> <property name="name"> @@ -473,7 +473,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -521,13 +521,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>32767</height> @@ -627,7 +627,7 @@ <property name="text"> <string>Track by Artist on Album</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -641,7 +641,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>200</height> @@ -655,7 +655,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -669,7 +669,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>431</width> <height>20</height> @@ -747,7 +747,7 @@ <property name="name"> <cstring>labels_favouriteLabelsFrame</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>120</height> diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui index d99d254c..abe81601 100644 --- a/amarok/src/tagguesserconfigdialog.ui +++ b/amarok/src/tagguesserconfigdialog.ui @@ -149,7 +149,7 @@ Note that the order in which the schemes appear in the list is relevant, since t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/amarok/src/threadmanager.cpp b/amarok/src/threadmanager.cpp index 96d01c6e..71b59f38 100644 --- a/amarok/src/threadmanager.cpp +++ b/amarok/src/threadmanager.cpp @@ -369,7 +369,7 @@ ThreadManager::Job::setProgress( uint steps ) } void -ThreadManager::Job::settqStatus( const TQString &status ) +ThreadManager::Job::setStatus( const TQString &status ) { m_status = status; @@ -390,7 +390,7 @@ ThreadManager::Job::customEvent( TQCustomEvent *e ) switch( progress ) { case -2: - StatusBar::instance()->setProgresstqStatus( this, m_status ); + StatusBar::instance()->setProgressStatus( this, m_status ); break; case -1: diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h index 63c3d72d..0cd39a51 100644 --- a/amarok/src/threadmanager.h +++ b/amarok/src/threadmanager.h @@ -287,7 +287,7 @@ public: /** * If you set progress information, you should set this too, changing it when appropriate */ - void settqStatus( const TQString &status ); + void setStatus( const TQString &status ); /** * This shows the progressBar too, the user will be able to abort @@ -375,7 +375,7 @@ public: * * It is only safe to have one dependent, if you depend on multiple objects * that might get deleted while you are running you should instead try to - * make the multiple objects tqchildren of one TQObject and depend on the + * make the multiple objects children of one TQObject and depend on the * top-most parent or best of all would be to make copies of the data you * need instead of being dependent. */ diff --git a/amarok/src/tooltip.cpp b/amarok/src/tooltip.cpp index c9bb2283..5feb6136 100644 --- a/amarok/src/tooltip.cpp +++ b/amarok/src/tooltip.cpp @@ -151,9 +151,9 @@ void Amarok::ToolTip::maybeTip( const TQPoint &pos ) void Amarok::ToolTip::showTip() { m_timer.start( 15000, true ); - if( !isVisible() || tqsizeHint() != size() ) + if( !isVisible() || sizeHint() != size() ) { - resize( tqsizeHint() ); + resize( sizeHint() ); position(); } if( !isVisible() ) @@ -176,9 +176,9 @@ void Amarok::ToolTip::drawContents( TQPainter *painter ) { TQPixmap buf( width(), height() ); TQPainter p( &buf ); - buf.fill( tqcolorGroup().background() ); + buf.fill( colorGroup().background() ); - p.setPen( tqcolorGroup().foreground() ); + p.setPen( colorGroup().foreground() ); p.drawRect( buf.rect() ); TQSimpleRichText text( s_text, TQToolTip::parentWidget()->font() ); @@ -188,12 +188,12 @@ void Amarok::ToolTip::drawContents( TQPainter *painter ) : s_hack == 1 ? TQPoint(4, -2) : TQPoint(2, -2); //HACK positioning p.setFont( TQToolTip::parentWidget()->font() ); - text.draw( &p, pos.x(), pos.y(), rect(), tqcolorGroup() ); + text.draw( &p, pos.x(), pos.y(), rect(), colorGroup() ); painter->drawPixmap( 0, 0, buf ); } -TQSize Amarok::ToolTip::tqsizeHint() const +TQSize Amarok::ToolTip::sizeHint() const { if( !s_rect.isNull() ) return s_rect.size(); @@ -208,7 +208,7 @@ TQSize Amarok::ToolTip::tqsizeHint() const void Amarok::ToolTip::position() { const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() ); - const TQSize size = tqsizeHint(); + const TQSize size = sizeHint(); const int width = size.width(), height = size.height(); TQPoint pos; if( !s_rect.isNull() ) diff --git a/amarok/src/tooltip.h b/amarok/src/tooltip.h index 0ca9b92d..268d8302 100644 --- a/amarok/src/tooltip.h +++ b/amarok/src/tooltip.h @@ -65,7 +65,7 @@ private: static Manager* s_manager; public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: virtual void maybeTip( const TQPoint &pos ); diff --git a/amarok/src/trackpickerdialogbase.ui b/amarok/src/trackpickerdialogbase.ui index 6ab2e7e7..4352b51b 100644 --- a/amarok/src/trackpickerdialogbase.ui +++ b/amarok/src/trackpickerdialogbase.ui @@ -34,7 +34,7 @@ <property name="title"> <string>File Name</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <hbox> @@ -53,7 +53,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="indent"> @@ -79,7 +79,7 @@ <property name="title"> <string>Select Best Possible Match</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <vbox> diff --git a/amarok/src/tracktooltip.cpp b/amarok/src/tracktooltip.cpp index c345e22e..08cae102 100644 --- a/amarok/src/tracktooltip.cpp +++ b/amarok/src/tracktooltip.cpp @@ -114,14 +114,14 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) TQString s; for( int i = 0; i < rating / 2; ++i ) s += TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" ) - .tqarg( locate( "data", "amarok/images/star.png" ) ) - .tqarg( TQFontMetrics( TQToolTip::font() ).height() ) - .tqarg( TQFontMetrics( TQToolTip::font() ).height() ); + .arg( locate( "data", "amarok/images/star.png" ) ) + .arg( TQFontMetrics( TQToolTip::font() ).height() ) + .arg( TQFontMetrics( TQToolTip::font() ).height() ); if( rating % 2 ) s += TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" ) - .tqarg( locate( "data", "amarok/images/smallstar.png" ) ) - .tqarg( TQFontMetrics( TQToolTip::font() ).height() ) - .tqarg( TQFontMetrics( TQToolTip::font() ).height() ); + .arg( locate( "data", "amarok/images/smallstar.png" ) ) + .arg( TQFontMetrics( TQToolTip::font() ).height() ) + .arg( TQFontMetrics( TQToolTip::font() ).height() ); right << s; left << playlist->columnText( column ); } @@ -163,7 +163,7 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) } right << TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" ) - .tqarg( filename ).tqarg( height ).tqarg( MOODBAR_WIDTH ); + .arg( filename ).arg( height ).arg( MOODBAR_WIDTH ); } break; @@ -237,10 +237,10 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) if (tags.title().isEmpty() || tags.artist().isEmpty()) // no title or no artist, so we add prettyTitle m_tooltip += TQString ("<tr><td align=center colspan='2'>%1</td></tr>") - .tqarg(tags.veryNiceTitle()); + .arg(tags.veryNiceTitle()); for( uint x = 0; x < left.count(); ++x ) if ( !right[x].isEmpty() ) - m_tooltip += tableRow.tqarg( left[x] ).tqarg( right[x] ); + m_tooltip += tableRow.arg( left[x] ).arg( right[x] ); m_tooltip += "</table></td>"; m_tooltip += "</tr></table></center>"; @@ -332,13 +332,13 @@ TQString TrackToolTip::tooltip() const if( !m_tags.isEmpty() ) { if( !m_cover.isEmpty() ) - tip = tip.tqarg( TQString( "<td><table cellpadding='0' cellspacing='0'><tr><td>" + tip = tip.arg( TQString( "<td><table cellpadding='0' cellspacing='0'><tr><td>" "<img src='%1'>" - "</td></tr></table></td>" ).tqarg( m_cover ) ); + "</td></tr></table></td>" ).arg( m_cover ) ); else - tip = tip.tqarg(""); + tip = tip.arg(""); if( m_haspos ) - tip = tip.tqarg( MetaBundle::prettyLength( m_pos / 1000, true ) ); + tip = tip.arg( MetaBundle::prettyLength( m_pos / 1000, true ) ); } return tip; } diff --git a/amarok/src/transferdialog.cpp b/amarok/src/transferdialog.cpp index 3a044315..08e3280a 100644 --- a/amarok/src/transferdialog.cpp +++ b/amarok/src/transferdialog.cpp @@ -17,7 +17,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <kapplication.h> @@ -45,13 +45,13 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) TQGroupBox *location = new TQGroupBox( 1, Qt::Vertical, i18n( "Music Location" ), vbox ); new TQLabel( i18n( "Your music will be transferred to:\n%1" ) - .tqarg( transferDir ), location ); + .arg( transferDir ), location ); TQVBox *vbox2 = new TQVBox( vbox ); TQSpacerItem *spacer = new TQSpacerItem( 0, 25 ); - TQLayout *vtqlayout = vbox2->tqlayout(); - if( vtqlayout ) - vtqlayout->addItem( spacer ); + TQLayout *vlayout = vbox2->layout(); + if( vlayout ) + vlayout->addItem( spacer ); new TQLabel( i18n( "You can have your music automatically grouped in\n" "a variety of ways. Each grouping will create\n" @@ -94,9 +94,9 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) TQVBox *vbox3 = new TQVBox( vbox ); TQSpacerItem *spacer2 = new TQSpacerItem( 0, 25 ); - TQLayout *vtqlayout2 = vbox3->tqlayout(); - if( vtqlayout2 ) - vtqlayout2->addItem( spacer2 ); + TQLayout *vlayout2 = vbox3->layout(); + if( vlayout2 ) + vlayout2->addItem( spacer2 ); TQGroupBox *options = new TQGroupBox( 6, Qt::Vertical, i18n( "Options" ), vbox ); diff --git a/amarok/src/xmlloader.cpp b/amarok/src/xmlloader.cpp index 9313cb3b..2ff72b21 100644 --- a/amarok/src/xmlloader.cpp +++ b/amarok/src/xmlloader.cpp @@ -213,7 +213,7 @@ bool MetaBundle::XmlLoader::fatalError( const TQXmlParseException &e ) bundleLoaded(); m_lastError = TQString( "Error loading XML: \"%1\", at line %2, column %3." ) - .tqarg( e.message(), TQString::number( e.lineNumber() ), TQString::number( e.columnNumber() ) ); + .arg( e.message(), TQString::number( e.lineNumber() ), TQString::number( e.columnNumber() ) ); errorEncountered( e.message(), e.lineNumber(), e.columnNumber() ); return false; diff --git a/amarok/src/xspfplaylist.h b/amarok/src/xspfplaylist.h index 522eff21..9e15593f 100644 --- a/amarok/src/xspfplaylist.h +++ b/amarok/src/xspfplaylist.h @@ -8,7 +8,7 @@ class AtomicString; #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <tqdatetime.h> #include <tqfile.h> |