rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 51 insertions, 51 deletions

diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS
index 5d30b733..0612242c 100644
--- a/noatun/modules/kaiman/SKIN-SPECS
+++ b/noatun/modules/kaiman/SKIN-SPECS
@@ -37,7 +37,7 @@ if the play button was 30 by 20, the resulting image file would be
 
 Note that images for buttons and numbers contain the items horizontally,
 the images for items contain the items vertically, the image for a font
-tqcontains 3 rows of 32 items, and the slider contains the background and
+contains 3 rows of 32 items, and the slider contains the background and
 handle horizontally or vertically (depending if a slider is horizontal
 or verticle, respectivley).
 
@@ -125,7 +125,7 @@ Title/Album/Artist/Genre: filename length [extended] x y
 
  extended
    (optional, absence defaults to FALSE)
-   When TRUE, the image tqcontains 3 additional lines for internation
+   When TRUE, the image contains 3 additional lines for internation
    characters. The result is 6 lines of 32 characters each.
 
 ==========================
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index a318dbb6..87e1a5e2 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -76,7 +76,7 @@ void KaimanPrefDlg::reopen()
     KConfig *config=KGlobal::config();
     config->setGroup("Kaiman");
     TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN );
-    TQListBoxItem *item = _skinList->tqfindItem( skin );
+    TQListBoxItem *item = _skinList->findItem( skin );
     if ( item )
         _skinList->setCurrentItem( item );
     else
@@ -86,7 +86,7 @@ void KaimanPrefDlg::reopen()
 
 void KaimanPrefDlg::setSkin( TQString skin )
 {
-    _skinList->setCurrentItem( _skinList->tqfindItem( skin ) );
+    _skinList->setCurrentItem( _skinList->findItem( skin ) );
 }
 
 
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index 4e568b5d..4f9b5315 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -1332,7 +1332,7 @@ TQString KaimanStyle::getToken(TQString &val_s_string, char val_c_separator)
     TQString l_s_token;
 
     // Find the first occurrence of the separator
-    l_i_pos = val_s_string.tqfind(val_c_separator, 0, false);
+    l_i_pos = val_s_string.find(val_c_separator, 0, false);
     if ( l_i_pos == -1 ) {
         // No sparator! Then the whole string is the token
         l_s_token = val_s_string;
@@ -1413,7 +1413,7 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e )
             for ( TQWidget *s = i_sliders.first(); s!=0; s=i_sliders.next() )
             {
                 TQRect sliderRect( s->pos(), s->size() );
-                if ( sliderRect.tqcontains(mousePos) ) slider = s;
+                if ( sliderRect.contains(mousePos) ) slider = s;
             }
 
             /* the slider the mouse events instead of the visible widget */
@@ -1445,11 +1445,11 @@ bool KaimanStyle::loadPixmaps()
         l_kse_elem->loadPixmaps(l_s_tmpName);
     }
 
-    l_kse_elem = this->tqfind("Background");
+    l_kse_elem = this->find("Background");
     if ( l_kse_elem != 0 ) {
         l_pixmap_Background = l_kse_elem->pixmaps[0];
     }
-    l_kse_elem = this->tqfind("Mask");
+    l_kse_elem = this->find("Mask");
     if ( l_kse_elem != 0 ) {
         l_pixmap_Mask = l_kse_elem->pixmaps[0];
     }
@@ -1492,7 +1492,7 @@ TQBitmap* KaimanStyle::Mask()
     return &i_bitmap_Mask;
 }
 
-KaimanStyleElement* KaimanStyle::tqfind(const char *val_s_elemName)
+KaimanStyleElement* KaimanStyle::find(const char *val_s_elemName)
 {
     for (uint i=0; i< I_styleElem.count(); i++) {
         if ( I_styleElem[i]->element == TQString(val_s_elemName)) {
diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h
index 6dd1fd3e..03ba4f2d 100644
--- a/noatun/modules/kaiman/style.h
+++ b/noatun/modules/kaiman/style.h
@@ -321,7 +321,7 @@ public:
     enum { ParsingError=1, FileNotFound };
 
     /// Finds a style element, according  to it's name. Returns 0 when element is not available.
-    KaimanStyleElement* tqfind(const char* val_s_elemName);
+    KaimanStyleElement* find(const char* val_s_elemName);
 
     /// Tries to load the given style and returns success (true) or failure (false)
     bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" );
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 4c3d4e28..47e8a8b7 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -164,7 +164,7 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc )
 		                   _style->Mask()->handle(), ShapeSet );
 	}
 
-	KaimanStyleElement* item = _style->tqfind("Background");
+	KaimanStyleElement* item = _style->find("Background");
 	setBackgroundMode(TQWidget::NoBackground);
 	if ( item!=0 )
 	{
@@ -173,53 +173,53 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc )
 		setFixedSize( item->width(), item->height());
 	}
 
-	item = _style->tqfind("Playlist_Button");
+	item = _style->find("Playlist_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) );
 
-	item = _style->tqfind("Play_Button");
+	item = _style->find("Play_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) );
 
-	item = _style->tqfind("Pause_Button");
+	item = _style->find("Pause_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) );
 
-	item = _style->tqfind("Stop_Button");
+	item = _style->find("Stop_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) );
 
-	item = _style->tqfind("Next_Button");
+	item = _style->find("Next_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) );
 
-	item = _style->tqfind("Prev_Button");
+	item = _style->find("Prev_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) );
 
-	item = _style->tqfind("Exit_Button");
+	item = _style->find("Exit_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) );
 
-	item = _style->tqfind("Mixer_Button");
+	item = _style->find("Mixer_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(execMixer()) );
 
-	item = _style->tqfind("Iconify_Button");
+	item = _style->find("Iconify_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMinimized()) );
 
-	item = _style->tqfind("Alt_Skin_Button");
+	item = _style->find("Alt_Skin_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleSkin()) );
 
-	item = _style->tqfind("Repeat_Button");
+	item = _style->find("Repeat_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleLoop()) );
 
-	item = _style->tqfind("Shuffle_Button");
+	item = _style->find("Shuffle_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShuffle()) );
 
-	item = _style->tqfind("Config_Button");
+	item = _style->find("Config_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp, TQT_SLOT(preferences()) );
 
-	item = _style->tqfind("Volume_Up_Button");
+	item = _style->find("Volume_Up_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeUp()));
 
-	item = _style->tqfind("Volume_Down_Button");
+	item = _style->find("Volume_Down_Button");
 	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeDown()));
 
 	KaimanStyleSlider* slider =
-		static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider"));
+		static_cast<KaimanStyleSlider*>(_style->find("Position_Slider"));
 	if( slider!=0 )
 	{
 		connect( slider, TQT_SIGNAL(newValueDrag(int)), this, TQT_SLOT(seekStart(int)) );
@@ -228,18 +228,18 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc )
 		slider->setValue( 0, 0, 1000 );
 	}
 
-	slider = static_cast<KaimanStyleSlider*>(_style->tqfind("Volume_Slider"));
+	slider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider"));
 	if ( slider!=0 )
 	{
 		connect(slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(setVolume(int)));
 		slider->setValue( napp->player()->volume(), 0, 100 );
 	}
 
-	KaimanStyleValue* volItem = static_cast<KaimanStyleValue*>(_style->tqfind("Volume_Item"));
+	KaimanStyleValue* volItem = static_cast<KaimanStyleValue*>(_style->find("Volume_Item"));
 	if ( volItem )
 		volItem->setValue( napp->player()->volume(), 0, 100 );
 
-	KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->tqfind("Title"));
+	KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->find("Title"));
 	if ( titleItem )
 		titleItem->startAnimation( 300 );
 
@@ -291,23 +291,23 @@ void Kaiman::seekDrag( int value )
 	if ( !_style ) return;
 
 	KaimanStyleValue* posItem =
-		static_cast<KaimanStyleValue*>(_style->tqfind("Position_Item"));
+		static_cast<KaimanStyleValue*>(_style->find("Position_Item"));
 	if ( posItem )
 		posItem->setValue( value, 0, length );
 
 	KaimanStyleSlider* posSlider =
-		static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider"));
+		static_cast<KaimanStyleSlider*>(_style->find("Position_Slider"));
 	if ( posSlider )
 		posSlider->setValue( value, 0, length );
 
 	// update time
 
 	KaimanStyleNumber* numItem =
-		static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Number"));
+		static_cast<KaimanStyleNumber*>(_style->find("Minute_Number"));
 	if ( numItem )
 		numItem->setValue( value/60%60 );
 
-	numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Number"));
+	numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Number"));
 	if ( numItem )
 		numItem->setValue( value % 60 );
 }
@@ -384,8 +384,8 @@ void Kaiman::timeout()
 		return;
 
 	// update volume
-	KaimanStyleSlider* l_elem_volslider = static_cast<KaimanStyleSlider*>(_style->tqfind("Volume_Slider"));
-	KaimanStyleValue* l_elem_volitem = static_cast<KaimanStyleValue*>(_style->tqfind("Volume_Item"));
+	KaimanStyleSlider* l_elem_volslider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider"));
+	KaimanStyleValue* l_elem_volitem = static_cast<KaimanStyleValue*>(_style->find("Volume_Item"));
 	if ( l_elem_volslider!=0 )
 		l_elem_volslider->setValue( napp->player()->volume(), 0, 100 );
 	if ( l_elem_volitem!=0 )
@@ -399,20 +399,20 @@ void Kaiman::timeout()
 			sec = 0;
 
 		KaimanStyleValue* posItem =
-			static_cast<KaimanStyleValue*>(_style->tqfind("Position_Item"));
+			static_cast<KaimanStyleValue*>(_style->find("Position_Item"));
 		if ( posItem ) posItem->setValue( sec, 0, napp->player()->getLength()/1000 );
 
 		KaimanStyleSlider* posSlider =
-			static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider"));
+			static_cast<KaimanStyleSlider*>(_style->find("Position_Slider"));
 		if ( posSlider ) posSlider->setValue( sec, 0, napp->player()->getLength()/1000 );
 
 		// update time
 		KaimanStyleNumber* numItem =
-			static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Number"));
+			static_cast<KaimanStyleNumber*>(_style->find("Minute_Number"));
 		if ( numItem )
 			numItem->setValue( sec/60%60 );
 
-		numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Number"));
+		numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Number"));
 		if ( numItem )
 			numItem->setValue( sec%60 );
 	}
@@ -420,14 +420,14 @@ void Kaiman::timeout()
 	const PlaylistItem &item = napp->playlist()->current();
 	KaimanStyleNumber* numItem = 0;
 
-	numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("In_Rate_Number"));
+	numItem = static_cast<KaimanStyleNumber*>(_style->find("In_Rate_Number"));
 	if ( numItem )
 		numItem->setValue(item.property("bitrate").toInt());
 
 	TQString hzString = item.property("samplerate");
 	hzString.truncate(2);
 
-	numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("In_Hz_Number"));
+	numItem = static_cast<KaimanStyleNumber*>(_style->find("In_Hz_Number"));
 	if ( numItem )
 		numItem->setValue(hzString.toInt());
 }
@@ -438,11 +438,11 @@ void Kaiman::updateMode()
 	if ( !_style ) return;
 
 	KaimanStyleButton* pause =
-		static_cast<KaimanStyleButton*>(_style->tqfind("Pause_Button"));
+		static_cast<KaimanStyleButton*>(_style->find("Pause_Button"));
 	KaimanStyleButton* play =
-		static_cast<KaimanStyleButton*>(_style->tqfind("Play_Button"));
+		static_cast<KaimanStyleButton*>(_style->find("Play_Button"));
 	KaimanStyleState* status =
-		static_cast<KaimanStyleState*>(_style->tqfind("Status_Item"));
+		static_cast<KaimanStyleState*>(_style->find("Status_Item"));
 
 	if (napp->player()->isStopped() )
 	{
@@ -469,7 +469,7 @@ void Kaiman::loopTypeChange( int )
 {
 	if ( !_style ) return;
 
-	KaimanStyleState* rep = static_cast<KaimanStyleState*>(_style->tqfind("Repeat_Item"));
+	KaimanStyleState* rep = static_cast<KaimanStyleState*>(_style->find("Repeat_Item"));
 	if ( rep )
 		rep->setValue( napp->player()->loopStyle() );
 }
@@ -486,19 +486,19 @@ void Kaiman::newSongLen( int, int )
 
 	// update time
 	KaimanStyleNumber* numItem =
-		static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Total_Number"));
+		static_cast<KaimanStyleNumber*>(_style->find("Minute_Total_Number"));
 	if ( numItem )
 		numItem->setValue( len/60%60 );
 
-	numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Total_Number"));
+	numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Total_Number"));
 	if ( numItem )
 		numItem->setValue( len%60 );
 
-	numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Song_Minute_Number"));
+	numItem = static_cast<KaimanStyleNumber*>(_style->find("Song_Minute_Number"));
 	if ( numItem )
 		numItem->setValue( len/60%60 );
 
-	numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Minute_Number"));
+	numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Minute_Number"));
 	if ( numItem )
 		numItem->setValue( len%60 );
 
@@ -510,7 +510,7 @@ void Kaiman::newSong()
 {
 	if ( !_style ) return;
 
-	KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->tqfind("Title"));
+	KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->find("Title"));
 	if ( titleItem )
 	{
 		TQString title = i18n("Noatun");