From 330c33ab6f97b279737bf9527c9add7bb1475450 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- parts/replace/replace_part.cpp | 12 ++++++------ parts/replace/replace_widget.cpp | 24 ++++++++++++------------ parts/replace/replace_widget.h | 6 +++--- parts/replace/replacedlg.ui | 2 +- parts/replace/replacedlgimpl.cpp | 2 +- parts/replace/replaceview.cpp | 6 +++--- 6 files changed, 26 insertions(+), 26 deletions(-) (limited to 'parts/replace') diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index ebeeb311..3e8242e8 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -24,24 +24,24 @@ #include "replace_widget.h" -static const KDevPluginInfo data("kdevtqreplace"); +static const KDevPluginInfo data("kdevreplace"); typedef KDevGenericFactory ReplaceFactory; -K_EXPORT_COMPONENT_FACTORY(libkdevtqreplace, ReplaceFactory(data)) +K_EXPORT_COMPONENT_FACTORY(libkdevreplace, ReplaceFactory(data)) ReplacePart::ReplacePart(TQObject *tqparent, const char *name, const TQStringList& ) : KDevPlugin( &data, tqparent, name ? name : "ReplacePart" ) { setInstance(ReplaceFactory::instance()); - setXMLFile("kdevpart_tqreplace.rc"); + setXMLFile("kdevpart_replace.rc"); m_widget = new ReplaceWidget(this); - m_widget->setIcon( SmallIcon("filetqfind") ); + m_widget->setIcon( SmallIcon("filefind") ); m_widget->setCaption(i18n("Replace")); TQWhatsThis::add (m_widget, i18n("Replace

" - "This window shows a preview of a string tqreplace " + "This window shows a preview of a string replace " "operation. Uncheck a line to exclude that replacement. " "Uncheck a file to exclude the whole file from the " "operation. " @@ -60,7 +60,7 @@ ReplacePart::ReplacePart(TQObject *tqparent, const char *name, const TQStringLis "can enter a string or a regular expression which is then " "searched for within all files in the locations " "you specify. Matches will be displayed in the Replace window, you " - "can replace them with the specified string, exclude them from replace operation or cancel the whole tqreplace.") ); + "can replace them with the specified string, exclude them from replace operation or cancel the whole replace.") ); connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(enableAction())); diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index 957f845a..1136e08a 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -69,21 +69,21 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) TQHBoxLayout * buttontqlayout = new TQHBoxLayout( tqlayout ); _cancel = new KPushButton( KStdGuiItem::cancel(), this ); - _tqreplace = new KPushButton( KGuiItem(i18n("Replace"),"filetqfind"), this ); + _replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this ); _cancel->setEnabled( false ); - _tqreplace->setEnabled( false ); + _replace->setEnabled( false ); - buttontqlayout->addWidget( _tqreplace ); + buttontqlayout->addWidget( _replace ); buttontqlayout->addWidget( _cancel ); _listview = new ReplaceView( this ); tqlayout->addWidget( _listview ); // setup signals - connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( tqfind() ) ); + connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) ); - connect( _tqreplace, TQT_SIGNAL( clicked() ), TQT_SLOT( tqreplace() ) ); + connect( _replace, TQT_SIGNAL( clicked() ), TQT_SLOT( replace() ) ); connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) ); connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) ); @@ -142,7 +142,7 @@ void ReplaceWidget::showDialog() } -void ReplaceWidget::tqfind() +void ReplaceWidget::find() { _listview->clear(); m_part->mainWindow()->raiseView( this ); @@ -153,7 +153,7 @@ void ReplaceWidget::tqfind() if ( showReplacements() ) { _cancel->setEnabled( true ); - _tqreplace->setEnabled( true ); + _replace->setEnabled( true ); } else { @@ -162,7 +162,7 @@ void ReplaceWidget::tqfind() } } -void ReplaceWidget::tqreplace() +void ReplaceWidget::replace() { makeReplacements(); clear(); @@ -174,7 +174,7 @@ void ReplaceWidget::clear() _listview->clear(); _cancel->setEnabled( false ); - _tqreplace->setEnabled( false ); + _replace->setEnabled( false ); m_part->mainWindow()->setViewAvailable( this, false ); } @@ -215,7 +215,7 @@ bool ReplaceWidget::showReplacements() break; } - if ( openfiles.tqcontains( *it ) ) + if ( openfiles.contains( *it ) ) { if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( *it ) ) { @@ -290,7 +290,7 @@ bool ReplaceWidget::makeReplacements() { TQString currentfile = fileitem->file(); - if ( openfiles.tqcontains( currentfile ) ) + if ( openfiles.contains( currentfile ) ) { if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( currentfile ) ) { @@ -437,7 +437,7 @@ TQStringList ReplaceWidget::openProjectFiles() if ( KTextEditor::Editor * ed = dynamic_cast( part ) ) { TQString editorpath = ed->url().path(); - if ( projectfiles.tqcontains( editorpath ) ) + if ( projectfiles.contains( editorpath ) ) { openfiles.append( editorpath ); } diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h index ea1e3dc6..b3959124 100644 --- a/parts/replace/replace_widget.h +++ b/parts/replace/replace_widget.h @@ -42,8 +42,8 @@ protected: virtual void focusInEvent(TQFocusEvent *e); private slots: - void tqfind(); - void tqreplace(); + void find(); + void replace(); void clear(); void editDocument( const TQString & ,int ); void setCursorPos( KParts::Part *part, uint line, uint col ); @@ -69,7 +69,7 @@ private: ReplaceView * _listview; TQPushButton * _cancel; - TQPushButton * _tqreplace; + TQPushButton * _replace; uint calledCol; uint calledLine; diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui index 559a226d..6a8b81f9 100644 --- a/parts/replace/replacedlg.ui +++ b/parts/replace/replacedlg.ui @@ -276,7 +276,7 @@ textLabel1 - &Text to tqfind: + &Text to find: find_combo diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp index 0973e54f..87be28f9 100644 --- a/parts/replace/replacedlgimpl.cpp +++ b/parts/replace/replacedlgimpl.cpp @@ -27,7 +27,7 @@ TQString escape(const TQString &str) for (uint i=0; i < str.length(); ++i) { - if (escaped.tqfind(str[i]) != -1) + if (escaped.find(str[i]) != -1) res += "\\"; res += str[i]; } diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index 5f5eee77..b81b7dbb 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -60,7 +60,7 @@ void ReplaceView::makeReplacementsForFile( TQTextStream & istream, TQTextStream line++; } // this is the hit - ostream << istream.readLine().tqreplace( _regexp, _replacement ) << "\n"; + ostream << istream.readLine().replace( _regexp, _replacement ) << "\n"; line++; } @@ -84,9 +84,9 @@ void ReplaceView::showReplacementsForFile( TQTextStream & stream, TQString const { TQString s = stream.readLine(); - if ( s.tqcontains( _regexp ) > 0 ) + if ( s.contains( _regexp ) > 0 ) { - s.tqreplace( _regexp, _replacement ); + s.replace( _regexp, _replacement ); if ( firstline ) { -- cgit v1.2.1