summaryrefslogtreecommitdiffstats
path: root/lib/kofficeui
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kofficeui')
-rw-r--r--lib/kofficeui/KoCommandHistory.cpp18
-rw-r--r--lib/kofficeui/KoContextCelp.cpp2
-rw-r--r--lib/kofficeui/KoGuides.cpp10
-rw-r--r--lib/kofficeui/KoGuides.h2
-rw-r--r--lib/kofficeui/KoInsertLink.cpp16
-rw-r--r--lib/kofficeui/KoPartSelectAction.cpp2
-rw-r--r--lib/kofficeui/KoRuler.cpp2
-rw-r--r--lib/kofficeui/KoTabBar.cpp12
-rw-r--r--lib/kofficeui/KoTemplateChooseDia.cpp2
-rw-r--r--lib/kofficeui/KoTemplateCreateDia.cpp14
-rw-r--r--lib/kofficeui/KoToolBox.cpp2
-rw-r--r--lib/kofficeui/KoTooluButton.cpp10
-rw-r--r--lib/kofficeui/KoZoomAction.cpp6
-rw-r--r--lib/kofficeui/tktoolbarbutton.cpp2
14 files changed, 50 insertions, 50 deletions
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index 22e8599b..cfde2802 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -173,7 +173,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) {
return;
int index;
- if(d->m_present!=0L && (index=m_commands.tqfindRef(d->m_present))!=-1) {
+ if(d->m_present!=0L && (index=m_commands.findRef(d->m_present))!=-1) {
if (m_first)
--index;
m_commands.insert(index+1, command);
@@ -232,7 +232,7 @@ void KoCommandHistory::undo() {
m_redo->setText(i18n("&Redo: %1").tqarg(d->m_present->name()));
}
int index;
- if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.prev()!=0) {
+ if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()!=0) {
d->m_present=m_commands.current();
emit commandExecuted();
emit commandExecuted(commandUndone);
@@ -270,7 +270,7 @@ void KoCommandHistory::redo() {
if(d->m_savedAt==0)
emit documentRestored();
}
- else if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.next()!=0) {
+ else if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.next()!=0) {
d->m_present=m_commands.current();
d->m_present->execute();
emit commandExecuted();
@@ -301,7 +301,7 @@ void KoCommandHistory::redo() {
void KoCommandHistory::documentSaved() {
if(d->m_present!=0 && !m_first)
- d->m_savedAt=m_commands.tqfindRef(d->m_present);
+ d->m_savedAt=m_commands.findRef(d->m_present);
else if(d->m_present==0 && !m_first)
d->m_savedAt=-42; // this value signals that the document has
// been saved with an empty history.
@@ -331,7 +331,7 @@ void KoCommandHistory::clipCommands() {
if(count<=m_undoLimit && count<=m_redoLimit)
return;
- int index=m_commands.tqfindRef(d->m_present);
+ int index=m_commands.findRef(d->m_present);
if(index>=m_undoLimit) {
for(int i=0; i<=(index-m_undoLimit); ++i) {
m_commands.removeFirst();
@@ -339,7 +339,7 @@ void KoCommandHistory::clipCommands() {
if(d->m_savedAt==-1)
d->m_savedAt=-42;
}
- index=m_commands.tqfindRef(d->m_present); // calculate the new
+ index=m_commands.findRef(d->m_present); // calculate the new
count=m_commands.count(); // values (for the redo-branch :)
// make it easier for us... d->m_savedAt==-1 -> invalid
if(d->m_savedAt!=-42 && d->m_savedAt<-1)
@@ -362,7 +362,7 @@ void KoCommandHistory::slotUndoAboutToShow()
slotChangeUndoNumberOfSelectedItem( -1 );
int i = 0;
TQStringList lst;
- if (m_commands.tqfindRef(d->m_present)!=-1)
+ if (m_commands.findRef(d->m_present)!=-1)
while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
{
lst.append(i18n("Undo: %1").tqarg(m_commands.current()->name()));
@@ -413,7 +413,7 @@ void KoCommandHistory::slotRedoAboutToShow()
d->m_present = m_commands.first();
lst.append(i18n("Redo: %1").tqarg(d->m_present->name()));
}
- if (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next())
+ if (m_commands.findRef(d->m_present)!=-1 && m_commands.next())
while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
{
lst.append(i18n("Redo: %1").tqarg(m_commands.current()->name()));
@@ -436,7 +436,7 @@ void KoCommandHistory::updateActions()
if ( m_undo && m_redo )
{
m_undo->setEnabled( !m_first && ( d->m_present != 0L ) );
- m_redo->setEnabled(m_first || (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next()!=0));
+ m_redo->setEnabled(m_first || (m_commands.findRef(d->m_present)!=-1 && m_commands.next()!=0));
}
}
diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index 830dded4..c2a237bd 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -227,7 +227,7 @@ void KoHelpView::mouseReleaseEvent( TQMouseEvent* e )
TQString helpapp=currentAnchor.right(currentAnchor.length()-7);
TQString helpanchor;
int pos;
- if ((pos=helpapp.tqfind("#"))!=-1) {
+ if ((pos=helpapp.find("#"))!=-1) {
helpanchor=helpapp.right(helpapp.length()-pos-1);
helpapp=helpapp.left(pos);
}
diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp
index a7e85bcf..01f6e745 100644
--- a/lib/kofficeui/KoGuides.cpp
+++ b/lib/kofficeui/KoGuides.cpp
@@ -134,7 +134,7 @@ bool KoGuides::mousePressEvent( TQMouseEvent *e )
m_mouseSelected = false;
KoPoint p( mapFromScreen( e->pos() ) );
- KoGuideLine * guideLine = tqfind( p, m_zoomHandler->unzoomItY( 2 ) );
+ KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) );
if ( guideLine )
{
m_lastPoint = e->pos();
@@ -216,7 +216,7 @@ bool KoGuides::mouseMoveEvent( TQMouseEvent *e )
else if ( e->state() == Qt::NoButton )
{
KoPoint p( mapFromScreen( e->pos() ) );
- KoGuideLine * guideLine = tqfind( p, m_zoomHandler->unzoomItY( 2 ) );
+ KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) );
if ( guideLine )
{
m_view->canvas()->setCursor( guideLine->orientation == Qt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor );
@@ -249,7 +249,7 @@ bool KoGuides::mouseReleaseEvent( TQMouseEvent *e )
removeSelected();
}
}
- KoGuideLine * guideLine = tqfind( p, m_zoomHandler->unzoomItY( 2 ) );
+ KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) );
if ( guideLine )
{
m_view->canvas()->setCursor( guideLine->orientation == Qt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor );
@@ -722,7 +722,7 @@ void KoGuides::addGuide( const TQPoint &pos, bool /* horizontal */, int rulerWid
void KoGuides::slotChangePosition()
{
KoPoint p( mapFromScreen( m_lastPoint ) );
- KoGuideLine * guideLine = tqfind( p, m_zoomHandler->unzoomItY( 2 ) );
+ KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) );
const KoPageLayout& pl = m_view->koDocument()->pageLayout();
double max = 0.0;
@@ -819,7 +819,7 @@ bool KoGuides::hasSelected()
}
-KoGuides::KoGuideLine * KoGuides::tqfind( KoPoint &p, double diff )
+KoGuides::KoGuideLine * KoGuides::find( KoPoint &p, double diff )
{
TQValueList<KoGuideLine *>::iterator it = m_guideLines[GL_SELECTED].begin();
for ( ; it != m_guideLines[GL_SELECTED].end(); ++it )
diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h
index 15d99ca2..b98b0472 100644
--- a/lib/kofficeui/KoGuides.h
+++ b/lib/kofficeui/KoGuides.h
@@ -351,7 +351,7 @@ private:
* @return the fould guide
* @return 0 if none is found
*/
- KoGuideLine * tqfind( KoPoint &p, double diff );
+ KoGuideLine * find( KoPoint &p, double diff );
/**
* @brief Move selected guides.
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index 947624b9..4c863935 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -129,25 +129,25 @@ void KoInsertLinkDia::setHrefLinkName(const TQString &_href, const TQString &_li
}
return;
}
- if(_href.tqfind("http://")!=-1 || _href.tqfind("https://")!=-1 ||_href.tqfind("ftp://")!=-1 )
+ if(_href.find("http://")!=-1 || _href.find("https://")!=-1 ||_href.find("ftp://")!=-1 )
{
internetLink->setHrefName(_href);
internetLink->setLinkName(_link);
showPage(0);
}
- else if(_href.tqfind("file:/")!=-1)
+ else if(_href.find("file:/")!=-1)
{
fileLink->setHrefName(_href);
fileLink->setLinkName(_link);
showPage(2);
}
- else if(_href.tqfind("mailto:")!=-1 || _href.tqfind("news:")!=-1)
+ else if(_href.find("mailto:")!=-1 || _href.find("news:")!=-1)
{
mailLink->setHrefName(_href);
mailLink->setLinkName(_link);
showPage(1);
}
- else if(_href.tqfind("bkm://")!=-1)
+ else if(_href.find("bkm://")!=-1)
{
if ( bookmarkLink )
{
@@ -259,7 +259,7 @@ TQString internetLinkPage::createInternetLink()
if(result.isEmpty())
return result;
- if(result.tqfind("http://")==-1 && result.tqfind("https://")==-1 && result.tqfind("ftp://")==-1)
+ if(result.find("http://")==-1 && result.find("https://")==-1 && result.find("ftp://")==-1)
result = "http://"+result;
return result;
}
@@ -332,7 +332,7 @@ TQString bookmarkLinkPage::createBookmarkLink()
if(result.isEmpty())
return result;
- if(result.tqfind("bkm://")==-1)
+ if(result.find("bkm://")==-1)
result = "bkm://"+result;
return result;
}
@@ -411,7 +411,7 @@ TQString mailLinkPage::createMailLink()
if(result.isEmpty())
return result;
- if(result.tqfind("mailto:")==-1 && result.tqfind("news:")==-1)
+ if(result.find("mailto:")==-1 && result.find("news:")==-1)
result = "mailto:"+result;
return result;
}
@@ -516,7 +516,7 @@ TQString fileLinkPage::createFileLink()
if(result.isEmpty())
return result;
- if(result.tqfind("file:/")==-1)
+ if(result.find("file:/")==-1)
result = "file://"+result;
return result;
}
diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp
index 0e574725..d563e906 100644
--- a/lib/kofficeui/KoPartSelectAction.cpp
+++ b/lib/kofficeui/KoPartSelectAction.cpp
@@ -52,7 +52,7 @@ void KoPartSelectAction::init()
for( ; it != m_lstEntries.end(); ++it ) {
KService::Ptr serv = (*it).service();
if (!serv->genericName().isEmpty()) {
- KAction *action = new KAction( serv->genericName().tqreplace('&',"&&"), serv->icon(), 0,
+ KAction *action = new KAction( serv->genericName().replace('&',"&&"), serv->icon(), 0,
this, TQT_SLOT( slotActionActivated() ),
parentCollection(), serv->name().latin1() );
insert( action );
diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp
index 8e936874..212becd7 100644
--- a/lib/kofficeui/KoRuler.cpp
+++ b/lib/kofficeui/KoRuler.cpp
@@ -843,7 +843,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
p.drawLine( pt_fr, 0, pt_fr, d->canvas->height() );
}
- KoTabulatorList::Iterator it = d->tabList.tqfind( d->currTab );
+ KoTabulatorList::Iterator it = d->tabList.find( d->currTab );
Q_ASSERT( it != d->tabList.end() );
if ( it != d->tabList.end() )
(*it).ptPos = newValue;
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index b2e7c94b..7c0beeeb 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -245,7 +245,7 @@ int KoTabBarPrivate::tabAt( const TQPoint& pos )
{
TQRect rect = tabRects[ i ];
if( rect.isNull() ) continue;
- if( rect.tqcontains( pos ) ) return i;
+ if( rect.contains( pos ) ) return i;
}
return -1; // not found
@@ -396,7 +396,7 @@ void KoTabBar::addTab( const TQString& text )
// removes a tab
void KoTabBar::removeTab( const TQString& text )
{
- int i = d->tabs.tqfindIndex( text );
+ int i = d->tabs.findIndex( text );
if ( i == -1 ) return;
if ( d->activeTab == i + 1 )
@@ -457,7 +457,7 @@ void KoTabBar::setTabs( const TQStringList& list )
if( !left.isNull() )
{
- d->firstTab = d->tabs.tqfindIndex( left ) + 1;
+ d->firstTab = d->tabs.findIndex( left ) + 1;
if( d->firstTab > (int)d->tabs.count() )
d->firstTab = 1;
if( d->firstTab <= 0 )
@@ -572,7 +572,7 @@ void KoTabBar::scrollLast()
void KoTabBar::ensureVisible( const TQString& tab )
{
- int i = d->tabs.tqfindIndex( tab );
+ int i = d->tabs.findIndex( tab );
if ( i == -1 )
return;
i++;
@@ -612,7 +612,7 @@ void KoTabBar::moveTab( unsigned tab, unsigned target )
void KoTabBar::setActiveTab( const TQString& text )
{
- int i = d->tabs.tqfindIndex( text );
+ int i = d->tabs.findIndex( text );
if ( i == -1 )
return;
@@ -729,7 +729,7 @@ TQSize KoTabBar::tqsizeHint() const
void KoTabBar::renameTab( const TQString& old_name, const TQString& new_name )
{
- TQStringList::Iterator it = d->tabs.tqfind( old_name );
+ TQStringList::Iterator it = d->tabs.find( old_name );
(*it) = new_name;
update();
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index bd7a63f8..280a875c 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -319,7 +319,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
TQString s = value;
if ( s.endsWith("]") )
{
- int pos = s.tqfind("[");
+ int pos = s.find("[");
s = s.mid( pos + 1, s.length() - pos - 2);
}
KURL url(s);
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 756c6e2a..213e694f 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -228,7 +228,7 @@ void KoTemplateCreateDia::slotOk() {
return;
}
- KoTemplateGroup *group=d->m_tree->tqfind(item->text(0));
+ KoTemplateGroup *group=d->m_tree->find(item->text(0));
if(!group) { // even safer
d->m_tree->writeTemplateTree();
KDialogBase::slotCancel();
@@ -254,7 +254,7 @@ void KoTemplateCreateDia::slotOk() {
icon+=".png";
// try to find the extension for the template file :P
- const int pos = m_file.tqfindRev( '.' );
+ const int pos = m_file.findRev( '.' );
TQString ext;
if ( pos > -1 )
ext = m_file.mid( pos );
@@ -278,7 +278,7 @@ void KoTemplateCreateDia::slotOk() {
kdDebug(30004) << "Trying to create template: " << d->m_name->text() << "URL=" << ".source/"+file+ext << " ICON=" << tmpIcon << endl;
KoTemplate *t=new KoTemplate(d->m_name->text(), TQString(), ".source/"+file+ext, tmpIcon, "", "", false, true);
if(!group->add(t)) {
- KoTemplate *existingTemplate=group->tqfind(d->m_name->text());
+ KoTemplate *existingTemplate=group->find(d->m_name->text());
if(existingTemplate && !existingTemplate->isHidden()) {
if(KMessageBox::warningYesNo(this, i18n("Do you really want to overwrite"
" the existing '%1' template?").
@@ -321,7 +321,7 @@ void KoTemplateCreateDia::slotOk() {
bool ready=false;
TQStringList tmp=group->dirs();
for(TQStringList::ConstIterator it=tmp.begin(); it!=tmp.end() && !ready; ++it) {
- if((*it).tqcontains(dir)==0) {
+ if((*it).contains(dir)==0) {
orig.setPath( (*it)+".directory" );
// Check if we can read the file
if( KIO::NetAccess::exists(orig, true, this) ) {
@@ -395,7 +395,7 @@ void KoTemplateCreateDia::slotAddGroup() {
const TQString name ( KInputDialog::getText( i18n("Add Group"), i18n("Enter group name:"), TQString(), &ok, this ) );
if(!ok)
return;
- KoTemplateGroup *group=d->m_tree->tqfind(name);
+ KoTemplateGroup *group=d->m_tree->find(name);
if(group && !group->isHidden())
{
KMessageBox::information( this, i18n("This name is already used."), i18n("Add Group") );
@@ -436,14 +436,14 @@ void KoTemplateCreateDia::slotRemove() {
}
if(item->depth()==0) {
- KoTemplateGroup *group=d->m_tree->tqfind(item->text(0));
+ KoTemplateGroup *group=d->m_tree->find(item->text(0));
if(group)
group->setHidden(true);
}
else {
bool done=false;
for(KoTemplateGroup *g=d->m_tree->first(); g!=0L && !done; g=d->m_tree->next()) {
- KoTemplate *t=g->tqfind(item->text(0));
+ KoTemplate *t=g->find(item->text(0));
if(t) {
t->setHidden(true);
done=true;
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index ca7db5a7..eea6a290 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -172,7 +172,7 @@ void KoToolBox::enableTools(bool enable)
}
m_buttonGroup->setEnabled(enable);
for (TQ_UINT32 i = 0; i < m_numberOfButtons; ++i) {
- m_buttonGroup->tqfind( i )->setEnabled( enable );
+ m_buttonGroup->find( i )->setEnabled( enable );
}
}
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 4b5b1b4d..9f500bb1 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -377,7 +377,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e )
if ( !m_colorMap.isEmpty() ) {
int currentRow = startRow, currentCol = startCol;
while ( currentRow < endRow && currentCol < endCol ) {
- TQMap<Position, TQColor>::ConstIterator it = m_colorMap.tqfind( Position( currentCol, currentRow ) );
+ TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( Position( currentCol, currentRow ) );
if( it != m_colorMap.end() )
p.fillRect( ( currentCol << 4 ) + 2, ( currentRow << 4 ) + 2, 12, 12, it.data() );
@@ -516,7 +516,7 @@ TQColor KoColorPanel::mapToColor( const TQPoint& point ) const
TQColor KoColorPanel::mapToColor( const KoColorPanel::Position& position ) const
{
- TQMap<Position, TQColor>::ConstIterator it = m_colorMap.tqfind( position );
+ TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( position );
if ( it != m_colorMap.end() )
return it.data();
return TQColor();
@@ -576,7 +576,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition )
m_focusPosition = newPosition;
- TQMap<Position, TQColor>::ConstIterator it = m_colorMap.tqfind( m_focusPosition );
+ TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( m_focusPosition );
if ( it != m_colorMap.end() ) {
// draw at the new focus position
tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
@@ -588,7 +588,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition )
void KoColorPanel::paint( const Position& position )
{
- TQMap<Position, TQColor>::ConstIterator it = m_colorMap.tqfind( position );
+ TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( position );
if ( it == m_colorMap.end() )
return;
@@ -852,7 +852,7 @@ void KoToolButton::buttonShift( int& dx, int& dy )
bool KoToolButton::hitArrow( const TQPoint& pos )
{
- return TQRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() ).tqcontains( pos );
+ return TQRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() ).contains( pos );
}
#include <KoTooluButton.moc>
diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp
index 5455a159..bebe7055 100644
--- a/lib/kofficeui/KoZoomAction.cpp
+++ b/lib/kofficeui/KoZoomAction.cpp
@@ -60,7 +60,7 @@ void KoZoomAction::setZoom( const TQString& text )
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 );
}
@@ -73,7 +73,7 @@ void KoZoomAction::setZoom( const TQString& text )
setItems( values );
TQString zoomStr = i18n("%1%").tqarg( zoom );
- setCurrentItem( values.tqfindIndex( zoomStr ) );
+ setCurrentItem( values.findIndex( zoomStr ) );
}
void KoZoomAction::setZoom( int zoom )
@@ -106,7 +106,7 @@ void KoZoomAction::init()
values << i18n("%1%").tqarg("500");
setItems( values );
- setCurrentItem( values.tqfindIndex( i18n("%1%").tqarg( 100 ) ) );
+ setCurrentItem( values.findIndex( i18n("%1%").tqarg( 100 ) ) );
connect( this, TQT_SIGNAL( activated( const TQString& ) ),
TQT_SLOT( activated( const TQString& ) ) );
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index d3def7c9..fa36390e 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
case TQEvent::Hide:
on(false);
setDown(false);
- if ( !tqgeometry().tqcontains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
+ if ( !tqgeometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
leaveEvent(0L);
return false;
break;