From 055401d5dbcb7a509b9d6a6414ba3fc55a23eb82 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: [PATCH] rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kbfx@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- configdialog/kbfxconfigdlgplugins.ui.h | 4 ++-- configdialog/kbfxconfigdlgthemes.ui.h | 2 +- kbfxlib/common/kbfxplasmapixmapprovider.cpp | 8 ++++---- kbfxlib/data/kbfxdatasource.cpp | 2 +- kbfxlib/data/kbfxdatastack.cpp | 2 +- plugins/applications/kbfxplasmadataplugin.cpp | 2 +- plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp | 2 +- plugins/recentstuff/kbfxplasmarecentstuff.cpp | 2 +- plugins/strigi/kbfxstrigiplugin.cpp | 6 +++--- src/kbfxbutton.cpp | 12 ++++++------ src/kbfxplasmacanvasgroup.cpp | 4 ++-- src/kbfxplasmacanvasgroupview.cpp | 2 +- src/kbfxplasmacanvasgroupview.h | 2 +- src/kbfxplasmacanvasitem.cpp | 6 +++--- src/kbfxplasmacanvasstack.cpp | 4 ++-- src/kbfxplasmacanvasstack.h | 4 ++-- src/kbfxplasmacanvasview.cpp | 6 +++--- src/kbfxplasmaindexview.cpp | 2 +- src/kbfxspinxmenu.cpp | 6 +++--- 19 files changed, 39 insertions(+), 39 deletions(-) diff --git a/configdialog/kbfxconfigdlgplugins.ui.h b/configdialog/kbfxconfigdlgplugins.ui.h index 176af80..9ede1e1 100644 --- a/configdialog/kbfxconfigdlgplugins.ui.h +++ b/configdialog/kbfxconfigdlgplugins.ui.h @@ -45,7 +45,7 @@ TQStringList KbfxConfigDlgPlugins::KbfxListPlugins ( int panel ) for ( it_requested = ConfigInit ().m_pluginsLeft.begin (); it_requested != ConfigInit ().m_pluginsLeft.end (); ++it_requested ) { - if ( ( *it_available ).tqcontains ( *it_requested ) > 0 ) + if ( ( *it_available ).contains ( *it_requested ) > 0 ) { _not_present = FALSE; break; @@ -57,7 +57,7 @@ TQStringList KbfxConfigDlgPlugins::KbfxListPlugins ( int panel ) for ( it_requested = ConfigInit ().m_pluginsRight.begin (); it_requested != ConfigInit ().m_pluginsRight.end (); ++it_requested ) { - if ( ( *it_available ).tqcontains ( *it_requested ) > 0 ) + if ( ( *it_available ).contains ( *it_requested ) > 0 ) { _not_present = FALSE; break; diff --git a/configdialog/kbfxconfigdlgthemes.ui.h b/configdialog/kbfxconfigdlgthemes.ui.h index e960eac..fb5d722 100644 --- a/configdialog/kbfxconfigdlgthemes.ui.h +++ b/configdialog/kbfxconfigdlgthemes.ui.h @@ -132,7 +132,7 @@ void KbfxConfigDlgThemes::ChangeForm() << KbfxThemesData().setThemeList ( ConfigInit().m_UserSpinxThemeBasePath ) [ConfigInit().m_SpinxThemeName] << endl; - KbfxThemeList->setSelected ( KbfxThemeList->tqfindItem ( ConfigInit().m_SpinxThemeName ), TRUE ); + KbfxThemeList->setSelected ( KbfxThemeList->findItem ( ConfigInit().m_SpinxThemeName ), TRUE ); setKbfxThemePreview(); diff --git a/kbfxlib/common/kbfxplasmapixmapprovider.cpp b/kbfxlib/common/kbfxplasmapixmapprovider.cpp index 8107583..d334a01 100644 --- a/kbfxlib/common/kbfxplasmapixmapprovider.cpp +++ b/kbfxlib/common/kbfxplasmapixmapprovider.cpp @@ -27,7 +27,7 @@ KbfxPlasmaPixmapProvider::addPixmap ( TQString pixmapname ) TQString lFileName = PixmapPath( pixmapname ); TQPixmap * lPixmapPtr = 0; - if ( ( lPixmapPtr = TQPixmapCache::tqfind ( pixmapname ) ) == NULL ) + if ( ( lPixmapPtr = TQPixmapCache::find ( pixmapname ) ) == NULL ) { lPixmapPtr = new TQPixmap ( lFileName ); TQPixmapCache::insert ( pixmapname,lPixmapPtr ); @@ -86,12 +86,12 @@ void KbfxPlasmaPixmapProvider::buildCache() TQPixmapCache::setCacheLimit ( 1024*5 ); static TQStringList m_skinElements; m_skinElements - <<"apptqfind" + <<"appfind" <<"bg" <<"botbg" <<"butterfly" <<"dudebox" - <<"tqfind" + <<"find" <<"hover" <<"indexseparator" <<"listboxbg" @@ -132,7 +132,7 @@ KbfxPlasmaPixmapProvider::pixmap ( const TQString & key ) { TQPixmap* pp; TQPixmap p; - if ( ( pp=TQPixmapCache::tqfind ( key ) ) ) + if ( ( pp=TQPixmapCache::find ( key ) ) ) { return pp; } diff --git a/kbfxlib/data/kbfxdatasource.cpp b/kbfxlib/data/kbfxdatasource.cpp index 91d13c2..ea22dcd 100644 --- a/kbfxlib/data/kbfxdatasource.cpp +++ b/kbfxlib/data/kbfxdatasource.cpp @@ -46,7 +46,7 @@ KbfxDataSource::lookup ( TQString str ) TQString _searchStr = m_text+m_comment+m_description+m_keyWords; - if ( _searchStr.tqcontains ( str,false ) > 0 ) + if ( _searchStr.contains ( str,false ) > 0 ) return true; return false; diff --git a/kbfxlib/data/kbfxdatastack.cpp b/kbfxlib/data/kbfxdatastack.cpp index 2b28ba0..3cdc29b 100644 --- a/kbfxlib/data/kbfxdatastack.cpp +++ b/kbfxlib/data/kbfxdatastack.cpp @@ -59,7 +59,7 @@ KbfxDataStack::getStack ( TQString name ) { - if ( m_nameList.tqcontains ( name ) >0 ) + if ( m_nameList.contains ( name ) >0 ) return m_stack[name]; else { diff --git a/plugins/applications/kbfxplasmadataplugin.cpp b/plugins/applications/kbfxplasmadataplugin.cpp index 070bda2..0bed7de 100644 --- a/plugins/applications/kbfxplasmadataplugin.cpp +++ b/plugins/applications/kbfxplasmadataplugin.cpp @@ -204,7 +204,7 @@ search ( TQString _keyword ) TQString *sPtr = new TQString (); ( *sPtr ) = ( *s )->name () + ( *s )->genericName () + ( *s )->comment (); - if ( ( !sPtr->isNull () ) && sPtr->tqcontains ( _keyword, false ) > 0 ) + if ( ( !sPtr->isNull () ) && sPtr->contains ( _keyword, false ) > 0 ) { KbfxDataSource *data = new KbfxDataSource (); data->setName ( ( *s )->name () ); diff --git a/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp b/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp index 36d22e8..207fd6e 100644 --- a/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp +++ b/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp @@ -131,7 +131,7 @@ search ( TQString _keyword ) while ( ( fi = it.current () ) != 0 ) { - if ( fi->fileName ().tqcontains ( _keyword ) > 0 ) + if ( fi->fileName ().contains ( _keyword ) > 0 ) { KDesktopFile *desktop = new KDesktopFile ( fi->filePath () ); diff --git a/plugins/recentstuff/kbfxplasmarecentstuff.cpp b/plugins/recentstuff/kbfxplasmarecentstuff.cpp index 0f1c8fb..ed2e68d 100644 --- a/plugins/recentstuff/kbfxplasmarecentstuff.cpp +++ b/plugins/recentstuff/kbfxplasmarecentstuff.cpp @@ -129,7 +129,7 @@ search ( TQString _keyword ) while ( ( fi = it.current () ) != 0 ) { - if ( fi->fileName ().tqcontains ( _keyword ) > 0 ) + if ( fi->fileName ().contains ( _keyword ) > 0 ) { KDesktopFile *desktop = new KDesktopFile ( fi->filePath () ); diff --git a/plugins/strigi/kbfxstrigiplugin.cpp b/plugins/strigi/kbfxstrigiplugin.cpp index 8039fa4..d97c1ae 100644 --- a/plugins/strigi/kbfxstrigiplugin.cpp +++ b/plugins/strigi/kbfxstrigiplugin.cpp @@ -167,11 +167,11 @@ search ( TQString _keyword ) TQString name; std::map < std::string, std::string >::const_iterator it = - hits.hits[i].properties.tqfind ( "title" ); + hits.hits[i].properties.find ( "title" ); TQString filename ( hits.hits[i].uri.c_str () ); - if ( filename.tqcontains ( ".tar." ) > 0 ) + if ( filename.contains ( ".tar." ) > 0 ) { filename = "tar:" + filename; kdDebug() << filename << endl; @@ -183,7 +183,7 @@ search ( TQString _keyword ) } else { - uint pos = hits.hits[i].uri.rtqfind ( '/' ); + uint pos = hits.hits[i].uri.rfind ( '/' ); if ( pos == std::string::npos ) { name = hits.hits[i].uri; diff --git a/src/kbfxbutton.cpp b/src/kbfxbutton.cpp index 0fe018c..4815a6b 100644 --- a/src/kbfxbutton.cpp +++ b/src/kbfxbutton.cpp @@ -105,7 +105,7 @@ TQCString KbfxButton::findPanel() it != objects.end(); ++it) { - if ( (*it).tqcontains ( "Panel" ) > 0 ) + if ( (*it).contains ( "Panel" ) > 0 ) { DCOPRef _dcop_obj ( "kicker", (*it) ); TQStringList _dcop_obj_applets =_dcop_obj.call ( "listApplets()" ); @@ -114,7 +114,7 @@ TQCString KbfxButton::findPanel() _it != _dcop_obj_applets.end(); _it++ ) { - if ( ( *_it ).tqcontains ( "kbfx" ) ) + if ( ( *_it ).contains ( "kbfx" ) ) { m_AppletPanel = (*it); break; @@ -308,7 +308,7 @@ void KbfxButton::selfDeleter() for ( it = returnTQStringList.begin();it != returnTQStringList.end();it++ ) { - if ( ( *it ).tqcontains ( "kbfx" ) ) + if ( ( *it ).contains ( "kbfx" ) ) { break; } @@ -371,17 +371,17 @@ void KbfxButton::dropEvent ( TQDropEvent * e ) { _tmp = ( *it ); kdDebug() << "KBFX button dropped file: " << _tmp << endl; - if ( _tmp.tqcontains ( "hover", FALSE ) > 0 ) + if ( _tmp.contains ( "hover", FALSE ) > 0 ) { _hover = _tmp; _hover_pix = TQImage ( _tmp ); } - if ( _tmp.tqcontains ( "normal", FALSE ) > 0 ) + if ( _tmp.contains ( "normal", FALSE ) > 0 ) { _normal = _tmp; _normal_pix = TQImage ( _tmp ); } - if ( _tmp.tqcontains ( "pressed", FALSE ) > 0 ) + if ( _tmp.contains ( "pressed", FALSE ) > 0 ) { _pressed = _tmp; _pressed_pix = TQImage ( _tmp ); diff --git a/src/kbfxplasmacanvasgroup.cpp b/src/kbfxplasmacanvasgroup.cpp index 371e622..94e9389 100644 --- a/src/kbfxplasmacanvasgroup.cpp +++ b/src/kbfxplasmacanvasgroup.cpp @@ -96,7 +96,7 @@ KbfxPlasmaCanvasGroup::addItem ( KbfxPlasmaCanvasAbstractItem * it ) qDebug ( "Adding Failed bcos Name Missing" ); return false; } - ItemListMap::ConstIterator itn = itemListMap ().tqfind ( it ); + ItemListMap::ConstIterator itn = itemListMap ().find ( it ); if ( itn != itemListMap ().end () ) { qDebug ( "Adding Failed Due to Item not end" ); @@ -308,7 +308,7 @@ KbfxPlasmaCanvasGroup::width () KbfxPlasmaCanvasGroup * KbfxPlasmaCanvasGroup::groupContaining ( KbfxPlasmaCanvasAbstractItem * item ) { - ItemListMap::ConstIterator it = itemListMap ().tqfind ( item ); + ItemListMap::ConstIterator it = itemListMap ().find ( item ); if ( it == itemListMap ().end () ) return 0; else diff --git a/src/kbfxplasmacanvasgroupview.cpp b/src/kbfxplasmacanvasgroupview.cpp index 0f84605..006cd32 100644 --- a/src/kbfxplasmacanvasgroupview.cpp +++ b/src/kbfxplasmacanvasgroupview.cpp @@ -74,7 +74,7 @@ KbfxPlasmaCanvasGroupView::addGroup ( KbfxPlasmaCanvasGroup * gPtr ) } KbfxPlasmaCanvasGroupView * -KbfxPlasmaCanvasGroupView::tqcontains ( KbfxPlasmaCanvasGroup * ) +KbfxPlasmaCanvasGroupView::contains ( KbfxPlasmaCanvasGroup * ) { //maybe I don't need this return 0; diff --git a/src/kbfxplasmacanvasgroupview.h b/src/kbfxplasmacanvasgroupview.h index 779d813..f373887 100644 --- a/src/kbfxplasmacanvasgroupview.h +++ b/src/kbfxplasmacanvasgroupview.h @@ -45,7 +45,7 @@ class KbfxPlasmaCanvasGroupView:public TQObject void addGroup ( KbfxPlasmaCanvasGroup* ); void deleteGroup ( KbfxPlasmaCanvasGroup* ); - KbfxPlasmaCanvasGroupView* tqcontains ( KbfxPlasmaCanvasGroup* ); + KbfxPlasmaCanvasGroupView* contains ( KbfxPlasmaCanvasGroup* ); virtual int rtti() {return 1006;} void predend ( KbfxPlasmaCanvasGroup* ); void append ( KbfxPlasmaCanvasGroup * ); diff --git a/src/kbfxplasmacanvasitem.cpp b/src/kbfxplasmacanvasitem.cpp index 98173d2..819222a 100644 --- a/src/kbfxplasmacanvasitem.cpp +++ b/src/kbfxplasmacanvasitem.cpp @@ -97,11 +97,11 @@ KbfxPlasmaCanvasItem::lookup ( TQString str ) if ( m_type == SEPARATOR || m_type == INDEX ) return false; - if ( m_labelText.tqcontains ( str,false ) > 0 ) + if ( m_labelText.contains ( str,false ) > 0 ) return true; - if ( m_commentText.tqcontains ( str,false ) > 0 ) + if ( m_commentText.contains ( str,false ) > 0 ) return true; - if ( m_exec.tqcontains ( str,false ) >0 ) + if ( m_exec.contains ( str,false ) >0 ) return true; diff --git a/src/kbfxplasmacanvasstack.cpp b/src/kbfxplasmacanvasstack.cpp index 4ce38cb..164137b 100644 --- a/src/kbfxplasmacanvasstack.cpp +++ b/src/kbfxplasmacanvasstack.cpp @@ -81,10 +81,10 @@ KbfxPlasmaCanvasStack::raise ( uint id ) bool -KbfxPlasmaCanvasStack::tqcontains ( TQString name ) +KbfxPlasmaCanvasStack::contains ( TQString name ) { //FIXME:Depricated Data Structure Needs fixing - if ( m_dict.tqcontains ( name ) == true ) + if ( m_dict.contains ( name ) == true ) return true; else return false; diff --git a/src/kbfxplasmacanvasstack.h b/src/kbfxplasmacanvasstack.h index 386c9b5..7c38fa2 100644 --- a/src/kbfxplasmacanvasstack.h +++ b/src/kbfxplasmacanvasstack.h @@ -48,7 +48,7 @@ class KbfxPlasmaCanvasStack:public TQObject virtual ~KbfxPlasmaCanvasStack(); void addGroup ( KbfxPlasmaCanvasGroupView* ); void deleteGroup ( KbfxPlasmaCanvasGroupView* ); - KbfxPlasmaCanvasStack* tqcontains ( KbfxPlasmaCanvasGroupView* ); + KbfxPlasmaCanvasStack* contains ( KbfxPlasmaCanvasGroupView* ); TQString getItemName ( int ); virtual int rtti() {return 1006;} void predend ( KbfxPlasmaCanvasGroupView* ); @@ -66,7 +66,7 @@ class KbfxPlasmaCanvasStack:public TQObject } TQString name() {return m_name;} void setName ( TQString name ) { m_name = name;} - bool tqcontains ( TQString ); + bool contains ( TQString ); KbfxPlasmaCanvasGroupView * activeViewByName ( TQString name ); public slots: void raise ( uint id ); diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp index b1943db..1484f9a 100644 --- a/src/kbfxplasmacanvasview.cpp +++ b/src/kbfxplasmacanvasview.cpp @@ -376,7 +376,7 @@ KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal ) ( *it )->hide (); } - if ( m_appletMap[signal.name () ]->tqcontains ( _activateGroup ) != true ) + if ( m_appletMap[signal.name () ]->contains ( _activateGroup ) != true ) { loadGroup ( _dataList, gview ); m_currentView = gview; @@ -562,7 +562,7 @@ KbfxPlasmaCanvasView::search ( const TQString & str ) void KbfxPlasmaCanvasView::addStack ( KbfxPlasmaCanvasStack * stak, TQString name ) { - if ( m_appletMap.tqcontains ( name ) ) + if ( m_appletMap.contains ( name ) ) { return; } @@ -572,7 +572,7 @@ KbfxPlasmaCanvasView::addStack ( KbfxPlasmaCanvasStack * stak, TQString name ) void KbfxPlasmaCanvasView::addStack ( KbfxDataStack * stak, TQString name ) { - if ( m_dataStack.tqcontains ( name ) ) + if ( m_dataStack.contains ( name ) ) { return; } diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp index d7e80e1..68bee8f 100644 --- a/src/kbfxplasmaindexview.cpp +++ b/src/kbfxplasmaindexview.cpp @@ -271,7 +271,7 @@ KbfxPlasmaIndexView::setKbfxCanvas ( TQCanvas * cnv ) void KbfxPlasmaIndexView::loadPlugin ( TQString name, KbfxPlasmaCanvasView * view ) { - if ( m_pluginList.tqcontains ( name ) <= 0 ) + if ( m_pluginList.contains ( name ) <= 0 ) { KbfxPlasmaPluginLoader *m_loader = new KbfxPlasmaPluginLoader (); KbfxDataStack *m_stack_R = m_loader->getView ( name ); diff --git a/src/kbfxspinxmenu.cpp b/src/kbfxspinxmenu.cpp index ed9924d..6f1ab9a 100644 --- a/src/kbfxspinxmenu.cpp +++ b/src/kbfxspinxmenu.cpp @@ -71,7 +71,7 @@ KbfxSpinxMenuWidget::init() m_searchTag->move ( ConfigInit ().m_searchBox_x, ConfigInit ().m_searchBox_y ); - TQPixmap m_searchPixmap = ( *KbfxPlasmaPixmapProvider::pixmap ( "tqfind" ) ); + TQPixmap m_searchPixmap = ( *KbfxPlasmaPixmapProvider::pixmap ( "find" ) ); m_searchTag->setPixmap ( m_searchPixmap ); @@ -320,7 +320,7 @@ KbfxSpinxMenuWidget::loadPluginLeft ( TQString name ) if (name == NULL) { return; } - if ( m_loadedListLeft.tqcontains ( name ) <= 0 ) + if ( m_loadedListLeft.contains ( name ) <= 0 ) { m_loader = new KbfxPlasmaPluginLoader (); m_stack_R = m_loader->getView ( name ); @@ -344,7 +344,7 @@ KbfxSpinxMenuWidget::loadPluginLeft ( TQString name ) void KbfxSpinxMenuWidget::loadPluginRight ( TQString name ) { -if ( m_loadedListRight.tqcontains ( name ) <= 0 ) +if ( m_loadedListRight.contains ( name ) <= 0 ) { m_loader = new KbfxPlasmaPluginLoader (); m_stack_R = m_loader->getView ( name );