diff options
Diffstat (limited to 'noatun')
37 files changed, 125 insertions, 125 deletions
diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui index 97f30430..4a0f6714 100644 --- a/noatun/library/equalizerwidget.ui +++ b/noatun/library/equalizerwidget.ui @@ -37,7 +37,7 @@ <property name="text"> <string>Pre&amp:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -122,7 +122,7 @@ <property name="text"> <string>+/-</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp index fe2ed649..40b3606c 100644 --- a/noatun/library/ksaver.cpp +++ b/noatun/library/ksaver.cpp @@ -78,7 +78,7 @@ bool Noatun::KSaver::open(void) } else { - d->error = i18n("Could not write to %1.").tqarg(d->url.prettyURL()); + d->error = i18n("Could not write to %1.").arg(d->url.prettyURL()); return false; } } diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index f5bd09bd..dbb91766 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -107,7 +107,7 @@ bool PlaylistSaver::metalist(const KURL &url) TQMap<TQString,TQString> map; map["playObject"]="Arts::StreamPlayObject"; - map["title"] = i18n("Stream from %1").tqarg(url.host()); + map["title"] = i18n("Stream from %1").arg(url.host()); KURL u(url); if (!u.hasPath()) @@ -303,7 +303,7 @@ public: else { propMap["playObject"]="SplayPlayObject"; - propMap["title"] = i18n("Stream from %1").tqarg(url.host()); + propMap["title"] = i18n("Stream from %1").arg(url.host()); if (!url.hasPath()) url.setPath("/"); propMap["url"] = url.url(); @@ -556,7 +556,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) { prop["playObject"]="SplayPlayObject"; // Default title, might be overwritten by #EXTINF later - prop["title"] = i18n("Stream from %1").tqarg(protourl.host()); + prop["title"] = i18n("Stream from %1").arg(protourl.host()); if (!protourl.hasPath()) protourl.setPath("/"); @@ -748,9 +748,9 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) map["playObject"]="SplayPlayObject"; if (title.isEmpty()) - map["title"] = i18n("Stream from %1 (port: %2)").tqarg( url.host() ).tqarg( url.port() ); + map["title"] = i18n("Stream from %1 (port: %2)").arg( url.host() ).arg( url.port() ); else - map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").tqarg( title ).tqarg( url.host() ).tqarg(url.port() ); + map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").arg( title ).arg( url.host() ).arg(url.port() ); map["url"] = map["stream_"]= url.url(); diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index 697b27b8..3c5b6f5d 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -94,7 +94,7 @@ Visualization::Visualization(int timeout, int pid) c.attach(); TQCString appids[2]; - appids[0]=TQString("noatun-%1").tqarg(parent).local8Bit(); + appids[0]=TQString("noatun-%1").arg(parent).local8Bit(); appids[1]="noatun"; TQCString &appid=appids[0]; @@ -504,7 +504,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent) TQCString appids[2]; - appids[0]=TQString("noatun-%1").tqarg(pid).local8Bit(); + appids[0]=TQString("noatun-%1").arg(pid).local8Bit(); appids[1]="noatun"; appid=appids[0]; diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp index 678a7098..c2c9dae8 100644 --- a/noatun/library/scrollinglabel.cpp +++ b/noatun/library/scrollinglabel.cpp @@ -128,7 +128,7 @@ ScrollingLabel::_update() if (d->scroll && (d->scrollSize > 0)) d->scrollTimer.start(100, true); - tqrepaint(false); + repaint(false); } void @@ -149,7 +149,7 @@ ScrollingLabel::scroll() { d->scrollTimer.stop(); - tqrepaint(false); + repaint(false); int scrollTime = 100; diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp index 5c705d3c..438504eb 100644 --- a/noatun/library/titleproxy.cpp +++ b/noatun/library/titleproxy.cpp @@ -157,11 +157,11 @@ void Proxy::sendRequest() //SLOT "%3" "%4" "\r\n" ) - .tqarg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) ) - .tqarg( m_url.host() ) - .tqarg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString() ) - .tqarg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString() ) - .tqarg( NOATUN_VERSION ); + .arg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) ) + .arg( m_url.host() ) + .arg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString() ) + .arg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString() ) + .arg( NOATUN_VERSION ); m_sockRemote.writeBlock( request.latin1(), request.length() ); diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 3b084d4e..9c255485 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -335,7 +335,7 @@ void Excellent::showMenubar(void) } else { - KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").tqarg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning"); + KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").arg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning"); menuBar()->hide(); } } diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index c83326ad..98150f40 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -109,9 +109,9 @@ void IRPrefs::save() int i = 1; for (TQMap<TQString, Command>::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it) { - c->writePathEntry(TQString("Command_%1").tqarg(i), it.key()); - c->writeEntry(TQString("Action_%1").tqarg(i), (int)((*it).action)); - c->writeEntry(TQString("Interval_%1").tqarg(i), (*it).interval); + c->writePathEntry(TQString("Command_%1").arg(i), it.key()); + c->writeEntry(TQString("Action_%1").arg(i), (int)((*it).action)); + c->writeEntry(TQString("Interval_%1").arg(i), (*it).interval); ++i; } } @@ -288,9 +288,9 @@ void IRPrefs::readConfig() for (int i = 1; i <= count; ++i) { Command cmd; - cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").tqarg(i))); - cmd.interval = c->readNumEntry(TQString("Interval_%1").tqarg(i)); - s_commands.insert(c->readPathEntry(TQString("Command_%1").tqarg(i)), cmd); + cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").arg(i))); + cmd.interval = c->readNumEntry(TQString("Interval_%1").arg(i)); + s_commands.insert(c->readPathEntry(TQString("Command_%1").arg(i)), cmd); } s_configRead = true; } diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS index ef603f30..ae293014 100644 --- a/noatun/modules/kaiman/SKIN-SPECS +++ b/noatun/modules/kaiman/SKIN-SPECS @@ -56,7 +56,7 @@ options in the event that options are added to the skin spec in the future. PROPER TRANSPARENCY: The main background image uses a threshold of 1 (out of 256 levels) for the -window tqshape, the rest is used for partially overwiting the background when +window shape, the rest is used for partially overwiting the background when the Transparency option is true. Portions of items, buttons, sliders, numbers, and text that never change and @@ -80,7 +80,7 @@ Background: filename filename The background image file, the window will be the same size as this image. - Add transparency to this image for tqshaped skins, the cutoff threshold for + Add transparency to this image for shaped skins, the cutoff threshold for transparency is 1 on images with muli-level alpha (like in png). Transparency: flag @@ -95,7 +95,7 @@ Mask: filename (this is DEPRECATED!, for transparent skins just add transparency to the Background image, Mask remains merely for backwards compatibility) filename - The mask image file, only needed for skins which are tqshaped windows (not + The mask image file, only needed for skins which are shaped windows (not rectangular). Contains a transparency mask for the main window. ========================== diff --git a/noatun/modules/kaiman/skins/circle/README b/noatun/modules/kaiman/skins/circle/README index a39fff38..d80082af 100644 --- a/noatun/modules/kaiman/skins/circle/README +++ b/noatun/modules/kaiman/skins/circle/README @@ -3,8 +3,8 @@ Author: Johne Ellis <gqview@geocities.ocm> Released: November 25, 1998 Version: 1.0 URL: http://www.geocities.com/SiliconValley/Haven/5235 -Comments: Skin with a doughnut tqshape to test tqshaped windows. - (skins with a tqshape mask) +Comments: Skin with a doughnut shape to test shaped windows. + (skins with a shape mask) Note: For transparency to work, GQmpeg 0.4.2 is required. Previous versions will work, but will be _ugly_. diff --git a/noatun/modules/kaiman/skins/circle/skindata b/noatun/modules/kaiman/skins/circle/skindata index 8dba21db..25268d22 100644 --- a/noatun/modules/kaiman/skins/circle/skindata +++ b/noatun/modules/kaiman/skins/circle/skindata @@ -6,15 +6,15 @@ #Released: November 25, 1998 #Author: John Ellis <gqview@geocities.com> #URL: http://www.geocities.com/SiliconValley/Haven/5235/ -#Comments: Skin with a doughnut tqshape to test tqshaped windows. -# (skins with a tqshape mask) +#Comments: Skin with a doughnut shape to test shaped windows. +# (skins with a shape mask) #run 'gqmpeg -skinhelp' for help with coordinates. #simply comment out items you do not want to display #only Background is required. Background: back.png -#Mask is an image with transparency used to define a tqshaped window +#Mask is an image with transparency used to define a shaped window Mask: back_mask.png #Title: filename length x y diff --git a/noatun/modules/kaiman/skins/circle/skindata_alt b/noatun/modules/kaiman/skins/circle/skindata_alt index 42661e81..fb3e97f5 100644 --- a/noatun/modules/kaiman/skins/circle/skindata_alt +++ b/noatun/modules/kaiman/skins/circle/skindata_alt @@ -6,15 +6,15 @@ #Released: November 25, 1998 #Author: John Ellis <gqview@geocities.com> #URL: http://www.geocities.com/SiliconValley/Haven/5235/ -#Comments: Skin with a doughnut tqshape to test tqshaped windows. -# (skins with a tqshape mask) +#Comments: Skin with a doughnut shape to test shaped windows. +# (skins with a shape mask) #run 'gqmpeg -skinhelp' for help with coordinates. #simply comment out items you do not want to display #only Background is required. Background: back_sm.png -#Mask is an image with transparency used to define a tqshaped window +#Mask is an image with transparency used to define a shaped window Mask: back_sm_mask.png #Title: filename length x y diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index bbf55cb3..32beb766 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -160,7 +160,7 @@ void KaimanStyleElement::setPixmap( int num ) if ( num<0 ) num = 0; _currentPixmap = num; - tqrepaint( FALSE ); + repaint( FALSE ); } } @@ -321,7 +321,7 @@ void KaimanStyleButton::updateButtonState() { } setPixmap( *I_pmIndex[i_i_currentState] ); - tqrepaint(); + repaint(); } @@ -349,7 +349,7 @@ void KaimanStyleSlider::setValue( int value ) if (value>_max) value=_max; if (value<_min) value=_min; _value = value; - tqrepaint(); + repaint(); } @@ -359,7 +359,7 @@ void KaimanStyleSlider::setValue( int value, int min, int max ) _min = min; _max = max; setValue( value ); - tqrepaint(); + repaint(); } } @@ -413,7 +413,7 @@ void KaimanStyleSlider::mouseReleaseEvent(TQMouseEvent *qme) { _down = false; releaseMouse(); - tqrepaint(); + repaint(); setValue( pos2value(qme->x(), qme->y()) ); emit newValue( value() ); @@ -465,7 +465,7 @@ void KaimanStyleSlider::enterEvent ( TQEvent * e ) if ( !_lit && optionPrelight ) { _lit = true; - tqrepaint(); + repaint(); } KaimanStyleMasked::enterEvent( e ); @@ -476,7 +476,7 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e ) if ( _lit ) { _lit = false; - tqrepaint(); + repaint(); } KaimanStyleMasked::leaveEvent( e ); @@ -522,7 +522,7 @@ void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme) void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme) { - // On the background we move the tqshaped toplevel around + // On the background we move the shaped toplevel around if (!i_b_move) { i_point_dragStart = qme->pos(); i_point_lastPos = qme->globalPos(); @@ -599,7 +599,7 @@ void KaimanStyleNumber::setValue( int value ) if ( _value!=value ) { _value = value; - tqrepaint(); + repaint(); } } @@ -667,7 +667,7 @@ void KaimanStyleText::setValue( TQString value ) _pos = 0; _direction = 1; _value = value; - tqrepaint(); + repaint(); } } @@ -698,7 +698,7 @@ void KaimanStyleText::timeout() // check new position if ( _pos+_direction>=0 && (int)_value.length()-(_pos+_direction)>=digits ) { _pos += _direction; - tqrepaint(); + repaint(); } _timer->start( _delay, TRUE ); @@ -1456,7 +1456,7 @@ bool KaimanStyle::loadPixmaps() if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) { - // OK, background and mask are defined. So now I can calculate the tqshape + // OK, background and mask are defined. So now I can calculate the shape int l_i_width_Mask = l_pixmap_Mask->width(); int l_i_height_Mask = l_pixmap_Mask->height(); diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h index 5d3bfcdb..19d44b98 100644 --- a/noatun/modules/kaiman/style.h +++ b/noatun/modules/kaiman/style.h @@ -346,7 +346,7 @@ private: TQString i_s_styleBase; - // The mask of the complete style. Used for doing tqshaped windows + // The mask of the complete style. Used for doing shaped windows TQBitmap i_bitmap_Mask; /// All style elements are stored here. diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 2a992040..3d1791ec 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -88,10 +88,10 @@ Kaiman::Kaiman() if ( !changeStyle(skinName, "skindata") ) { - KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").tqarg(skinName) ); + KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").arg(skinName) ); if ( !changeStyle( DEFAULT_SKIN, "skindata" ) ) { - KMessageBox::error( this, i18n("Cannot load default skin %1.").tqarg(DEFAULT_SKIN) ); + KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) ); TQTimer::singleShot( 0, this, TQT_SLOT(close()) ); return; } @@ -159,7 +159,7 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) if ( _style->Mask() != 0 ) { - // Set the tqshaped window form + // Set the shaped window form XShapeCombineMask( qt_xdisplay(), winId(), ShapeBounding, 0,0, _style->Mask()->handle(), ShapeSet ); } @@ -520,7 +520,7 @@ void Kaiman::newSong() if ( title.isEmpty() ) title = napp->player()->current().file(); - title = i18n("TITLE (LENGTH)", "%1 (%2)").tqarg(title, + title = i18n("TITLE (LENGTH)", "%1 (%2)").arg(title, napp->player()->current().lengthString()); } titleItem->setValue( title ); diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index edd53e2b..795dedfb 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -165,9 +165,9 @@ void KJButton::showPressed(bool b) { mShowPressed = b; if ( mShowPressed ) - tqrepaint(true); // tqrepaint with selected image + repaint(true); // repaint with selected image else - tqrepaint(false); // tqrepaint with default image (player-background) + repaint(false); // repaint with default image (player-background) } void KJButton::slotPlaylistShown(void) @@ -193,8 +193,8 @@ void KJButton::slotEqEnabled(bool on) void KJButton::mouseRelease(const TQPoint &, bool in) { - // tqrepaint with default image (player-background) - tqrepaint(false); + // repaint with default image (player-background) + repaint(false); if (!in) // only do something if users is still inside the button return; diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp index b84a0185..d7d2b9fa 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.cpp +++ b/noatun/modules/kjofol-skin/kjequalizer.cpp @@ -110,7 +110,7 @@ void KJEqualizer::slotUpdateBuffer() } // for() // whole thingy has been drawn, now set the mask mView->setMask( regionMask ); - tqrepaint(); + repaint(); } void KJEqualizer::mouseMove(const TQPoint &p, bool in) diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h index 42c64a45..18997c6f 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.h +++ b/noatun/modules/kjofol-skin/kjequalizer.h @@ -32,7 +32,7 @@ private: int mBandWidth; int mBandHalfHeight; TQPixmap mBars; // holds all slider images - TQPixmap *mBack; // holds background of EQ for easy tqrepaint + TQPixmap *mBack; // holds background of EQ for easy repaint TQPixmap *mView; // holds prepared img of all sliders VInterpolation *mInterpEq; }; diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index c4339229..ad843376 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -142,7 +142,7 @@ KJLoader::KJLoader() else { KNotifyClient::event(winId(), "warning", - i18n("There was trouble loading skin %1. Please select another skin file.").tqarg(skin)); + i18n("There was trouble loading skin %1. Please select another skin file.").arg(skin)); napp->preferences(); } @@ -392,7 +392,7 @@ void KJLoader::loadSkin(const TQString &file) show(); conserveMemory(); - tqrepaint(); + repaint(); // update displays if we are already playing // This happens while changing skins diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp index e82a1f8e..d368e95d 100644 --- a/noatun/modules/kjofol-skin/kjseeker.cpp +++ b/noatun/modules/kjofol-skin/kjseeker.cpp @@ -156,7 +156,7 @@ void KJSeeker::mouseRelease(const TQPoint &pos, bool in) return; g = grayRgb(color); - tqrepaint(); + repaint(); // kdDebug(66666) << "length : " << napp->player()->getLength() << endl; // kdDebug(66666) << "skip to: " << ((long long)g*(long long)napp->player()->getLength())/255 << endl; diff --git a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui index 17bce84d..c393bc03 100644 --- a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui +++ b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui @@ -135,7 +135,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp index 589f994f..eaba2e76 100644 --- a/noatun/modules/kjofol-skin/kjsliders.cpp +++ b/noatun/modules/kjofol-skin/kjsliders.cpp @@ -86,14 +86,14 @@ void KJVolumeBar::paint(TQPainter *p, const TQRect &) TQt::CopyROP); if (mText) - mText->tqrepaint(); + mText->repaint(); } bool KJVolumeBar::mousePress(const TQPoint &pos) { mVolume = (pos.x()*100) / rect().width(); // kdDebug(66666) << "volume: " << mVolume << endl; - tqrepaint(); + repaint(); napp->player()->setVolume(mVolume); return true; } @@ -112,7 +112,7 @@ void KJVolumeBar::mouseMove(const TQPoint &pos, bool in) void KJVolumeBar::timeUpdate(int) { mVolume = napp->player()->volume(); - tqrepaint(); + repaint(); } @@ -148,7 +148,7 @@ void KJVolumeBMP::paint(TQPainter *p, const TQRect &) TQRect from(mVolume*mCount/100*mWidth, 0, mWidth, mImages.height()); bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP); if (mText) - mText->tqrepaint(); + mText->repaint(); } bool KJVolumeBMP::mousePress(const TQPoint &pos) @@ -162,7 +162,7 @@ bool KJVolumeBMP::mousePress(const TQPoint &pos) // kdDebug(66666) << "gray : " << grayRgb(color) << endl; // kdDebug(66666) << "volume: " << mVolume << endl; - tqrepaint(); + repaint(); napp->player()->setVolume(mVolume); @@ -187,7 +187,7 @@ void KJVolumeBMP::timeUpdate(int) mOldVolume = mVolume; - tqrepaint(); + repaint(); } @@ -236,7 +236,7 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p) readConfig(); if (mText) - mText->tqrepaint(); + mText->repaint(); } TQString KJPitchBMP::tip() @@ -253,7 +253,7 @@ void KJPitchBMP::paint(TQPainter *p, const TQRect &) bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP); if (mText) - mText->tqrepaint(); + mText->repaint(); } bool KJPitchBMP::mousePress(const TQPoint &pos) @@ -266,7 +266,7 @@ bool KJPitchBMP::mousePress(const TQPoint &pos) mCurrentPitch = mMinPitch + ( (grayRgb(color)*(mMaxPitch-mMinPitch)) / 255 ); // kdDebug(66666) << "[KJPitchBMP] mousePress() mCurrentPitch: " << mCurrentPitch << endl; - tqrepaint(); + repaint(); newFile(); // wrong naming, in fact it just sets pitch @@ -300,7 +300,7 @@ void KJPitchBMP::timeUpdate(int) mOldPitch = mCurrentPitch; - tqrepaint(); + repaint(); } void KJPitchBMP::newFile() diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp index e0d3028e..7bacbb13 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp +++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp @@ -108,7 +108,7 @@ void KJFilename::timerEvent(TQTimerEvent *) // apply the newly created mask mView.setMask(newMask); - tqrepaint(); + repaint(); } bool KJFilename::mousePress(const TQPoint &) @@ -142,7 +142,7 @@ void KJFilename::readConfig() mDistance = 1; mTimerUpdates = KJLoader::kjofol->prefs()->titleMovingUpdates(); textFont().recalcSysFont(); - mLastTitle=""; // tqinvalidate title so it gets repainted on next timeUpdate() + mLastTitle=""; // invalidate title so it gets repainted on next timeUpdate() } void KJFilename::prepareString(const TQCString &str) @@ -255,7 +255,7 @@ void KJTime::readConfig() // kdDebug(66666) << "KJTime::readConfig()" << endl; countDown = napp->displayRemaining(); timeFont().recalcSysFont(); - mLastTime=""; // tqinvalidate time so it gets repainted on next timeUpdate() + mLastTime=""; // invalidate time so it gets repainted on next timeUpdate() } TQString KJTime::lengthString ( void ) @@ -325,7 +325,7 @@ void KJTime::prepareString(const TQCString &str) mLastTime = str; mTime = timeFont().draw(str, rect().width()); - tqrepaint(); + repaint(); // kdDebug(66666) << "END KJTime::prepareString(const TQCString &str)" << endl; } @@ -398,7 +398,7 @@ bool KJVolumeText::mousePress(const TQPoint &) void KJVolumeText::readConfig() { volumeFont().recalcSysFont(); - mLastVolume=""; // tqinvalidate value so it gets repainted on next timeUpdate() + mLastVolume=""; // invalidate value so it gets repainted on next timeUpdate() } void KJVolumeText::timeUpdate(int) @@ -421,7 +421,7 @@ void KJVolumeText::prepareString(const TQCString &str) mLastVolume = str; mVolume = volumeFont().draw(str, rect().width()); - tqrepaint(); + repaint(); } TQString KJVolumeText::tip() @@ -501,7 +501,7 @@ void KJPitchText::mouseRelease(const TQPoint &, bool in) void KJPitchText::readConfig() { pitchFont().recalcSysFont(); - mLastPitch=""; // tqinvalidate value so it gets repainted on next timeUpdate() + mLastPitch=""; // invalidate value so it gets repainted on next timeUpdate() } void KJPitchText::timeUpdate(int) @@ -529,7 +529,7 @@ void KJPitchText::prepareString(const TQCString &str) mLastPitch = str; mSpeed = pitchFont().draw(str, rect().width()); - tqrepaint(); + repaint(); } TQString KJPitchText::tip() @@ -600,7 +600,7 @@ bool KJFileInfo::mousePress(const TQPoint &) void KJFileInfo::readConfig() { textFont().recalcSysFont(); - mLastTime=""; // tqinvalidate value so it gets repainted on next timeUpdate() + mLastTime=""; // invalidate value so it gets repainted on next timeUpdate() } void KJFileInfo::timeUpdate(int) @@ -634,7 +634,7 @@ void KJFileInfo::prepareString(const TQCString &str) return; mLastTime = str; mTime = textFont().draw(str, rect().width()); - tqrepaint(); + repaint(); } TQString KJFileInfo::tip() diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp index a1a4c840..7ae04d44 100644 --- a/noatun/modules/kjofol-skin/kjvis.cpp +++ b/noatun/modules/kjofol-skin/kjvis.cpp @@ -79,7 +79,7 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent) mBack = new KPixmap ( TQSize(xs,ys) ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect ( x, y, xs, ys ); - tqrepaint(); + repaint(); } void KJNullScope::paint(TQPainter *p, const TQRect &) @@ -98,7 +98,7 @@ void KJNullScope::mouseRelease(const TQPoint &, bool in) if (!in) // only do something if users is still inside the button return; - parent()->tqrepaint(rect(), false); + parent()->repaint(rect(), false); swapScope(FFT); } @@ -108,7 +108,7 @@ void KJNullScope::readConfig() Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType(); if ( v != Null ) { - parent()->tqrepaint(rect(), false); + parent()->repaint(rect(), false); swapScope ( v ); } } @@ -163,7 +163,7 @@ void KJFFT::scopeEvent(float *d, int size) if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped) { if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped - parent()->tqrepaint(rect(), false); + parent()->repaint(rect(), false); return; } @@ -203,7 +203,7 @@ void KJFFT::scopeEvent(float *d, int size) mGradient->setMask(mGradientMask); bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP ); - tqrepaint(); + repaint(); } void KJFFT::paint(TQPainter *p, const TQRect &) @@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in) return; stop(); - parent()->tqrepaint(rect(), false); + parent()->repaint(rect(), false); swapScope(Mono); } @@ -236,7 +236,7 @@ void KJFFT::readConfig() if ( v != FFT ) { stop(); - parent()->tqrepaint(rect(), false); + parent()->repaint(rect(), false); swapScope ( v ); return; } @@ -297,7 +297,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped) { if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped - parent()->tqrepaint(rect(), false); + parent()->repaint(rect(), false); return; } @@ -356,7 +356,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) mGradient->setMask(mGradientMask); bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP ); - tqrepaint(); + repaint(); } void KJStereoFFT::paint(TQPainter *p, const TQRect &) @@ -376,7 +376,7 @@ void KJStereoFFT::mouseRelease(const TQPoint &, bool in) if (!in) // only do something if users is still inside the button return; stop(); - parent()->tqrepaint(rect(), false); + parent()->repaint(rect(), false); swapScope(Null); } @@ -387,7 +387,7 @@ void KJStereoFFT::readConfig() if ( v != StereoFFT ) { stop(); - parent()->tqrepaint(rect(), false); + parent()->repaint(rect(), false); swapScope ( v ); return; } @@ -448,7 +448,7 @@ void KJScope::scopeEvent(float *d, int size) if ( napp->player()->isStopped() ) { bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); - tqrepaint(); + repaint(); } return; } @@ -497,7 +497,7 @@ void KJScope::scopeEvent(float *d, int size) x++; } - tqrepaint(); + repaint(); } void KJScope::paint(TQPainter *p, const TQRect &) @@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in) return; stop(); - parent()->tqrepaint(rect(), false); + parent()->repaint(rect(), false); swapScope(/*Null*/ StereoFFT); } @@ -528,7 +528,7 @@ void KJScope::readConfig() if ( v != Mono ) { stop(); - parent()->tqrepaint(rect(), false); + parent()->repaint(rect(), false); swapScope ( v ); return; } diff --git a/noatun/modules/kjofol-skin/kjwidget.cpp b/noatun/modules/kjofol-skin/kjwidget.cpp index f9cb345a..737032cf 100644 --- a/noatun/modules/kjofol-skin/kjwidget.cpp +++ b/noatun/modules/kjofol-skin/kjwidget.cpp @@ -34,13 +34,13 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent) return bm; } -void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear) +void KJWidget::repaint(bool me, const TQRect &r, bool clear) { TQPainter p(parent()); if (me) paint(&p, r.isValid() ? r : rect()); else - parent()->tqrepaint(r.isValid() ? r : rect(), clear); + parent()->repaint(r.isValid() ? r : rect(), clear); } const TQString &KJWidget::backgroundPressed(const TQString &bmp) const diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h index a678e8a7..f64d2226 100644 --- a/noatun/modules/kjofol-skin/kjwidget.h +++ b/noatun/modules/kjofol-skin/kjwidget.h @@ -25,8 +25,8 @@ public: virtual void readConfig() {} // called when the mouse is moved while clicked in this widget - // tqrepaint myself - virtual void tqrepaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false); + // repaint myself + virtual void repaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false); virtual TQString tip() { return 0; } diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp index 1fa07fdd..dac87cf2 100644 --- a/noatun/modules/monoscope/monoscope.cpp +++ b/noatun/modules/monoscope/monoscope.cpp @@ -27,7 +27,7 @@ Monoscope::Monoscope() : TQWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin() setCaption(i18n("Monoscope")); show(); resizeEvent(0); - tqrepaint(0,0, TQWidget::width(), height(), false); + repaint(0,0, TQWidget::width(), height(), false); resizeEvent(0); setBackgroundColor(mLowColor); } @@ -83,7 +83,7 @@ void Monoscope::scopeEvent(float *d, int size) buffer.fill(mLowColor); TQPainter p(&buffer); p.setPen(mHighColor); - tqrepaint(rect()); + repaint(rect()); if (line) p.moveTo(0, y); diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 9d19b166..d3c6de0f 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -199,7 +199,7 @@ void MilkChocolate::changeCaption(const TQString& text) void MilkChocolate::popup() { NoatunStdAction::ContextMenu::showContextMenu( - mapToGlobal(mPopup->tqgeometry().bottomLeft()) + mapToGlobal(mPopup->geometry().bottomLeft()) ); } diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui index 21fd0686..ca13195a 100644 --- a/noatun/modules/simple/propertiesdialog.ui +++ b/noatun/modules/simple/propertiesdialog.ui @@ -82,7 +82,7 @@ <property name="name"> <cstring>iconLabel</cstring> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h index 3b7f6834..ef6f14f9 100644 --- a/noatun/modules/simple/propertiesdialog.ui.h +++ b/noatun/modules/simple/propertiesdialog.ui.h @@ -46,7 +46,7 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) // PlaylistItem properties (name and mimetype) if (!pi.isNull()) { - setCaption( i18n("Properties for %1").tqarg(pi.url().fileName()) ); + setCaption( i18n("Properties for %1").arg(pi.url().fileName()) ); KSharedPtr<KMimeType> mime = KMimeType::mimeType( pi.mimetype() ); iconLabel->setPixmap( mime->pixmap( KIcon::Desktop, KIcon::SizeMedium ) ); diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp index 3d42d566..a08faa94 100644 --- a/noatun/modules/splitplaylist/playlist.cpp +++ b/noatun/modules/splitplaylist/playlist.cpp @@ -220,11 +220,11 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC) TQRect rect(view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data()))); rect.setWidth(view->listView()->viewport()->width()); currentItem=i; - view->listView()->viewport()->tqrepaint(rect,true); + view->listView()->viewport()->repaint(rect,true); view->listView()->ensureItemVisible(static_cast<SafeListViewItem*>(current().data())); TQRect currentRect= view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data())); - view->listView()->viewport()->tqrepaint(currentRect); + view->listView()->viewport()->repaint(currentRect); now=static_cast<SafeListViewItem*>(current().data()); if(now) diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index 693b57ce..15963929 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -467,7 +467,7 @@ bool View::saveToURL(const KURL &url) } else { - KMessageBox::error( this, i18n("Could not write to %1.").tqarg(url.prettyURL()) ); + KMessageBox::error( this, i18n("Could not write to %1.").arg(url.prettyURL()) ); return false; } } diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 3303ad6a..4d008783 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -213,21 +213,21 @@ void NoatunSystray::slotPlayPause() if(!item.isProperty("title")) { // No metadata - s = TQString("<nobr>%1</nobr>").tqarg(item.title()); + s = TQString("<nobr>%1</nobr>").arg(item.title()); } else { - s = TQString("<h2><nobr>%1</nobr></h2>").tqarg(item.property("title")); + s = TQString("<h2><nobr>%1</nobr></h2>").arg(item.property("title")); if(item.isProperty("author")) - s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("author")); + s += TQString("<nobr>%1</nobr><br>").arg(item.property("author")); if(item.isProperty("album")) { if(item.isProperty("date")) - s += TQString("<nobr>%1 (%2)</nobr><br>").tqarg(item.property("album")).tqarg(item.property("date")); + s += TQString("<nobr>%1 (%2)</nobr><br>").arg(item.property("album")).arg(item.property("date")); else - s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("album")); + s += TQString("<nobr>%1</nobr><br>").arg(item.property("album")); } } @@ -242,11 +242,11 @@ void NoatunSystray::slotPlayPause() setTipText(TQString("<qt><br><table cellspacing=0 cellpadding=0><tr>" \ "<td align=center valign=center><h4><nobr>%1</nobr></h4>%2</td>" \ "<td valign=center><img src='%3'></td>" \ - "</qt></tr></table>").tqarg(status).tqarg(s).tqarg(tmpCoverPath)); + "</qt></tr></table>").arg(status).arg(s).arg(tmpCoverPath)); } else { - setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").tqarg(status).tqarg(s)); + setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").arg(status).arg(s)); } } @@ -256,7 +256,7 @@ void NoatunSystray::slotStopped() if(!napp->player()->current()) return; changeTray("player_stop"); - setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").tqarg(i18n("Noatun - Stopped"))); + setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").arg(i18n("Noatun - Stopped"))); } diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp index 234aafd0..0cfcb264 100644 --- a/noatun/modules/voiceprint/voiceprint.cpp +++ b/noatun/modules/voiceprint/voiceprint.cpp @@ -113,12 +113,12 @@ void VoicePrint::scopeEvent(float *data, int bands) // redraw changes with the minimum amount of work if(newOffset != 0) { - tqrepaint(mOffset,0,mSegmentWidth*2,height(),false); + repaint(mOffset,0,mSegmentWidth*2,height(),false); } else { - tqrepaint(mOffset,0,mSegmentWidth,height(),false); - tqrepaint(newOffset,0,mSegmentWidth,height(),false); + repaint(mOffset,0,mSegmentWidth,height(),false); + repaint(newOffset,0,mSegmentWidth,height(),false); } mOffset = newOffset; } diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index 05aa6381..5f670953 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -55,7 +55,7 @@ void WaInfo::timeEvent() } if (isVisible()) - tqrepaint(false); + repaint(false); } } diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index c2da5eb8..fdf2e768 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -558,9 +558,9 @@ void WaSkin::balanceSetValue(int val) waInfo->setText(i18n("Balance: Center")); } else if (val < 0) { - waInfo->setText(i18n("Balance: %1% Left").tqarg(-val)); + waInfo->setText(i18n("Balance: %1% Left").arg(-val)); } else { - waInfo->setText(i18n("Balance: %1% Right").tqarg(val)); + waInfo->setText(i18n("Balance: %1% Right").arg(val)); } } @@ -672,7 +672,7 @@ void WaSkin::volumeSliderReleased() void WaSkin::volumeSetValue(int val) { if (mVolumePressed) - waInfo->setText(i18n("Volume: %1%").tqarg(val)); + waInfo->setText(i18n("Volume: %1%").arg(val)); napp->player()->setVolume(val); } diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 0cfd7f90..43940bb7 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -163,7 +163,7 @@ void WinSkinConfig::remove() // Ask the user first if( KMessageBox::warningContinueCancel( this, - i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").tqarg( skin_list->currentText() ), TQString(), KStdGuiItem::del() ) + i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").arg( skin_list->currentText() ), TQString(), KStdGuiItem::del() ) == KMessageBox::Continue ) { mWaSkinManager->removeSkin( skin_list->currentText() ); |