summaryrefslogtreecommitdiffstats
path: root/kpresenter/KPrView.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kpresenter/KPrView.cpp')
-rw-r--r--kpresenter/KPrView.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 9577bc7d..f3bc053d 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -2255,7 +2255,7 @@ void KPrView::createGUI()
KPrPage *initPage=m_pKPresenterDoc->initialActivePage();
if ( !initPage )
m_pKPresenterDoc->pageList().at( 0 ); // first page
- skipToPage( m_pKPresenterDoc->pageList().tqfindRef( initPage ) );
+ skipToPage( m_pKPresenterDoc->pageList().findRef( initPage ) );
}
void KPrView::initGui()
@@ -2338,10 +2338,10 @@ void KPrView::setupActions()
TQT_TQOBJECT(this), TQT_SLOT( editDelPage() ),
actionCollection(), "edit_delpage" );
- actionEditFind=KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_tqfind" );
+ actionEditFind=KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_find" );
actionEditFindNext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" );
actionEditFindPrevious = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" );
- actionEditReplace=KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_tqreplace" );
+ actionEditReplace=KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" );
// ---------------- View actions
@@ -3368,7 +3368,7 @@ void KPrView::recalcCurrentPageNum()
TQPtrList<KPrPage> pageList( m_pKPresenterDoc->pageList() );
- int pos = pageList.tqfindRef( activePage );
+ int pos = pageList.findRef( activePage );
if ( pos != -1 )
{
@@ -3873,7 +3873,7 @@ void KPrView::showObjectRect( const KPrObject * object )
if ( ! TQRect( getCanvas()->diffx(),
getCanvas()->diffy(),
getCanvas()->width(),
- getCanvas()->height() ).tqcontains( r ) )
+ getCanvas()->height() ).contains( r ) )
{
int x = r.left() - 20;
int y = r.top() - 20;
@@ -4396,7 +4396,7 @@ void KPrView::insertLink()
if ( edit->textObject()->hasSelection() )
{
TQString selectedText = edit->textObject()->selectedText();
- if ( edit->textObject()->selectionHasCustomItems() || selectedText.tqcontains('\n') )
+ if ( edit->textObject()->selectionHasCustomItems() || selectedText.contains('\n') )
return;
if ( selectedText.startsWith( "mailto:/" ) ||
selectedText.startsWith( "ftp:/" ) ||
@@ -4595,7 +4595,7 @@ void KPrView::startKSpell()
m_spell.dlg->activeAutoCorrect( true );
TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)),
TQT_TQOBJECT(this), TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) );
- TQObject::connect( m_spell.dlg, TQT_SIGNAL(tqreplace(const TQString&, int, const TQString&)),
+ TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) );
TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ),
TQT_TQOBJECT(this), TQT_SLOT(spellCheckerDone(const TQString&)) );
@@ -4878,7 +4878,7 @@ void KPrView::refreshCustomMenu()
if ( var->type() == VT_CUSTOM )
{
varName=( (KoCustomVariable*) var )->name();
- if ( !lst.tqcontains( varName) )
+ if ( !lst.contains( varName) )
{
lst.append( varName );
TQCString name = TQString("custom-action_%1").tqarg(i).latin1();
@@ -4993,7 +4993,7 @@ void KPrView::insertVariable()
if ( edit )
{
KAction * act = (KAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
- VariableDefMap::ConstIterator it = m_variableDefMap.tqfind( act );
+ VariableDefMap::ConstIterator it = m_variableDefMap.find( act );
if ( it == m_variableDefMap.end() )
kdWarning(33001) << "Action not found in m_variableDefMap." << endl;
else
@@ -5140,7 +5140,7 @@ void KPrView::editFind()
KPrTextView * edit = m_canvas->currentTextObjectView();
bool hasSelection = edit && (edit->kpTextObject())->textObject()->hasSelection();
bool hasCursor = edit != 0;
- KoSearchDia dialog( m_canvas, "tqfind", m_searchEntry, hasSelection, hasCursor );
+ KoSearchDia dialog( m_canvas, "find", m_searchEntry, hasSelection, hasCursor );
/// KoFindReplace needs a TQValueList<KoTextObject *>...
TQValueList<KoTextObject *> list;
@@ -5170,7 +5170,7 @@ void KPrView::editReplace()
KPrTextView * edit = m_canvas->currentTextObjectView();
bool hasSelection = edit && (edit->kpTextObject())->textObject()->hasSelection();
bool hasCursor = edit != 0;
- KoReplaceDia dialog( m_canvas, "tqreplace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor );
+ KoReplaceDia dialog( m_canvas, "replace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor );
/// KoFindReplace needs a TQValueList<KoTextObject *>...
TQValueList<KoTextObject *> list;
@@ -5233,12 +5233,12 @@ void KPrView::changeZoomMenu( int zoom )
regexp.search(*it);
const int val=regexp.cap(1).toInt(&ok);
//zoom : limit inferior=10
- if(ok && val>9 && list.tqcontains(val)==0)
+ if(ok && val>9 && list.contains(val)==0)
list.append( val );
}
//necessary at the beginning when we read config
//this value is not in combo list
- if(list.tqcontains(zoom)==0)
+ if(list.contains(zoom)==0)
list.append( zoom );
qHeapSort( list );
@@ -5268,13 +5268,13 @@ void KPrView::showZoom( int zoom )
{
TQStringList list = actionViewZoom->items();
TQString zoomStr( i18n("%1%").tqarg( zoom ) );
- int pos = list.tqfindIndex(zoomStr);
+ int pos = list.findIndex(zoomStr);
if( pos == -1)
{
changeZoomMenu( zoom );
list = actionViewZoom->items();
}
- actionViewZoom->setCurrentItem( list.tqfindIndex(zoomStr) );
+ actionViewZoom->setCurrentItem( list.findIndex(zoomStr) );
}
void KPrView::viewZoom( const TQString &s )
@@ -5455,7 +5455,7 @@ void KPrView::updateStyleList()
TQString currentStyle = actionFormatStyle->currentText();
// Generate list of styles
const TQStringList lst = m_pKPresenterDoc->styleCollection()->displayNameList();
- const int pos = lst.tqfindIndex( currentStyle );
+ const int pos = lst.findIndex( currentStyle );
// Fill the combo - using a KSelectAction
actionFormatStyle->setItems( lst );
if ( pos > -1 )
@@ -6000,7 +6000,7 @@ void KPrView::applyAutoFormat()
{
m_pKPresenterDoc->getAutoFormat()->readConfig();
KMacroCommand *macro = 0L;
- m_switchPage=m_pKPresenterDoc->pageList().tqfindRef(m_canvas->activePage());
+ m_switchPage=m_pKPresenterDoc->pageList().findRef(m_canvas->activePage());
m_initSwitchPage=m_switchPage;
TQPtrList<KoTextObject> list=m_canvas->activePage()->allTextObjects();
@@ -6369,7 +6369,7 @@ TQPtrList<KAction> KPrView::listOfResultOfCheckWord( const TQString &word )
TQPtrList<KAction> listAction;
DefaultDictionary *dict = m_broker->defaultDictionary();
TQStringList lst = dict->suggest( word );
- if ( !lst.tqcontains( word ))
+ if ( !lst.contains( word ))
{
TQStringList::ConstIterator it = lst.begin();
for ( int i = 0; it != lst.end() ; ++it, ++i )