summaryrefslogtreecommitdiffstats
path: root/lib/kofficeui
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-19 11:38:41 -0600
committerTimothy Pearson <[email protected]>2011-12-19 11:38:41 -0600
commitf0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (patch)
tree1fc538e179833e62caec21956bfe47a252be5a72 /lib/kofficeui
parent11191ef0b9908604d1d7aaca382b011ef22c454c (diff)
downloadkoffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.tar.gz
koffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'lib/kofficeui')
-rw-r--r--lib/kofficeui/KoCommandHistory.cpp18
-rw-r--r--lib/kofficeui/KoGuides.cpp2
-rw-r--r--lib/kofficeui/KoGuides.h10
-rw-r--r--lib/kofficeui/KoPageLayoutDia.cpp4
-rw-r--r--lib/kofficeui/KoPageLayoutSize.cpp2
-rw-r--r--lib/kofficeui/KoTabBar.cpp2
-rw-r--r--lib/kofficeui/KoTabChooser.cpp2
-rw-r--r--lib/kofficeui/KoTabChooser.h8
-rw-r--r--lib/kofficeui/KoTemplateChooseDia.cpp10
-rw-r--r--lib/kofficeui/KoTemplateCreateDia.cpp2
-rw-r--r--lib/kofficeui/KoToolBox.h2
-rw-r--r--lib/kofficeui/KoTooluButton.cpp6
-rw-r--r--lib/kofficeui/KoUnitWidgets.cpp2
-rw-r--r--lib/kofficeui/KoZoomAction.cpp30
-rw-r--r--lib/kofficeui/kcoloractions.cpp2
-rw-r--r--lib/kofficeui/tkaction.cpp8
-rw-r--r--lib/kofficeui/tkaction.h2
-rw-r--r--lib/kofficeui/tktoolbarbutton.cpp16
18 files changed, 64 insertions, 64 deletions
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index 9f071db9..2b5824ed 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -188,7 +188,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) {
m_first=false;
if (m_undo != 0) {
m_undo->setEnabled(true);
- m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+ m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
}
if((m_redo != 0) && m_redo->isEnabled()) {
m_redo->setEnabled(false);
@@ -203,7 +203,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) {
d->m_present=command;
if (m_undo != 0) {
m_undo->setEnabled(true);
- m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+ m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
}
if (m_redo != 0) {
m_redo->setEnabled(false);
@@ -229,7 +229,7 @@ void KoCommandHistory::undo() {
if (m_redo != 0) {
m_redo->setEnabled(true);
- m_redo->setText(i18n("&Redo: %1").tqarg(d->m_present->name()));
+ m_redo->setText(i18n("&Redo: %1").arg(d->m_present->name()));
}
int index;
if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()!=0) {
@@ -238,7 +238,7 @@ void KoCommandHistory::undo() {
emit commandExecuted(commandUndone);
if (m_undo != 0) {
m_undo->setEnabled(true);
- m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+ m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
}
--index;
if(index==d->m_savedAt)
@@ -282,13 +282,13 @@ void KoCommandHistory::redo() {
if (m_undo != 0) {
m_undo->setEnabled(true);
- m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+ m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
}
if(m_commands.next()!=0) {
if (m_redo != 0) {
m_redo->setEnabled(true);
- m_redo->setText(i18n("&Redo: %1").tqarg(m_commands.current()->name()));
+ m_redo->setText(i18n("&Redo: %1").arg(m_commands.current()->name()));
}
}
else {
@@ -365,7 +365,7 @@ void KoCommandHistory::slotUndoAboutToShow()
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()));
+ lst.append(i18n("Undo: %1").arg(m_commands.current()->name()));
m_commands.prev();
}
d->m_undoListBox->insertStringList( lst );
@@ -411,12 +411,12 @@ void KoCommandHistory::slotRedoAboutToShow()
if (m_first)
{
d->m_present = m_commands.first();
- lst.append(i18n("Redo: %1").tqarg(d->m_present->name()));
+ lst.append(i18n("Redo: %1").arg(d->m_present->name()));
}
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()));
+ lst.append(i18n("Redo: %1").arg(m_commands.current()->name()));
m_commands.next();
}
d->m_redoListBox->insertStringList( lst );
diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp
index c11e6745..870fddc6 100644
--- a/lib/kofficeui/KoGuides.cpp
+++ b/lib/kofficeui/KoGuides.cpp
@@ -754,7 +754,7 @@ void KoGuides::slotRemove()
void KoGuides::paint()
{
- m_view->canvas()->tqrepaint( false );
+ m_view->canvas()->repaint( false );
}
diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h
index 7a28962f..c1f66138 100644
--- a/lib/kofficeui/KoGuides.h
+++ b/lib/kofficeui/KoGuides.h
@@ -173,7 +173,7 @@ public:
void snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff );
/**
- * @brief tqrepaint guides if any changed snapping status
+ * @brief repaint guides if any changed snapping status
*
* This issues a paint request if any guides have changed snapping status.
*
@@ -182,7 +182,7 @@ public:
void repaintSnapping( const KoRect &snappedRect );
/**
- * @brief tqrepaint guides if any changed snapping status
+ * @brief repaint guides if any changed snapping status
*
* This issues a paint request if any guides have changed snapping status.
*
@@ -191,7 +191,7 @@ public:
void repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus );
/**
- * @brief tqrepaint guides so none is snapped
+ * @brief repaint guides so none is snapped
*
* This issues a paint request if any guides have changed snapping status.
* It also effectively un-snaps all since it doesn't take an argument
@@ -253,9 +253,9 @@ signals:
/**
* @brief This signal is emitted when guides start/stop painting.
*
- * With this signal it is possible to only tqrepaint the guides in the paint
+ * With this signal it is possible to only repaint the guides in the paint
* method of the canvas. Just set/unset a flag when this signal is emmited.
- * This signal is emitted before and after a tqrepaint is done.
+ * This signal is emitted before and after a repaint is done.
*
* @param state true when starting painting guides, false when stopping.
*/
diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp
index 0b410bf1..5cffc108 100644
--- a/lib/kofficeui/KoPageLayoutDia.cpp
+++ b/lib/kofficeui/KoPageLayoutDia.cpp
@@ -84,14 +84,14 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z;
m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z;
- tqrepaint( true );
+ repaint( true );
}
/*=================== set tqlayout =================================*/
void KoPagePreview::setPageColumns( const KoColumns &_columns )
{
columns = _columns.columns;
- tqrepaint( true );
+ repaint( true );
}
/*======================== draw contents =========================*/
diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp
index 111ba21b..54be2b3f 100644
--- a/lib/kofficeui/KoPageLayoutSize.cpp
+++ b/lib/kofficeui/KoPageLayoutSize.cpp
@@ -61,7 +61,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
else {
TQString str=KoUnit::unitDescription(unit);
- TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").tqarg(str), this );
+ TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").arg(str), this );
grid1->addWidget( lpgUnit, 0, 0, TQt::AlignLeft );
}
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index a7ffe145..a249084f 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -661,7 +661,7 @@ void KoTabBar::paintEvent( TQPaintEvent* )
TQPainter painter;
TQPixmap pm( size() );
pm.fill( colorGroup().background() );
- painter.tqbegin( TQT_TQPAINTDEVICE(&pm), this );
+ painter.begin( TQT_TQPAINTDEVICE(&pm), this );
painter.setPen( colorGroup().dark() );
painter.drawLine( 0, 0, width(), 0 );
diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp
index ed891e89..19d93764 100644
--- a/lib/kofficeui/KoTabChooser.cpp
+++ b/lib/kofficeui/KoTabChooser.cpp
@@ -94,7 +94,7 @@ void KoTabChooser::mousePressEvent( TQMouseEvent *e )
else if ( flags & TAB_RIGHT ) currType = TAB_RIGHT;
} break;
}
- tqrepaint( true );
+ repaint( true );
} break;
case Qt::RightButton: {
TQPoint pnt( TQCursor::pos() );
diff --git a/lib/kofficeui/KoTabChooser.h b/lib/kofficeui/KoTabChooser.h
index 31ad0f85..fb9a0591 100644
--- a/lib/kofficeui/KoTabChooser.h
+++ b/lib/kofficeui/KoTabChooser.h
@@ -71,10 +71,10 @@ protected:
KoTabChooserPrivate *d;
protected slots:
- void rbLeft() { currType = TAB_LEFT; tqrepaint( true ); }
- void rbCenter() { currType = TAB_CENTER; tqrepaint( true ); }
- void rbRight() { currType = TAB_RIGHT; tqrepaint( true ); }
- void rbDecPoint() { currType = TAB_DEC_PNT; tqrepaint( true ); }
+ void rbLeft() { currType = TAB_LEFT; repaint( true ); }
+ void rbCenter() { currType = TAB_CENTER; repaint( true ); }
+ void rbRight() { currType = TAB_RIGHT; repaint( true ); }
+ void rbDecPoint() { currType = TAB_DEC_PNT; repaint( true ); }
};
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 880c447b..0311049e 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -84,7 +84,7 @@ class MyFileDialog : public KFileDialog
ok = TQFile::exists( url.path() );
if ( !ok ) {
// Maybe offer to create a new document with that name? (see alos KoDocument::openFile)
- KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) );
+ KMessageBox::error( this, i18n( "The file %1 does not exist." ).arg( url.path() ) );
}
}
return ok;
@@ -312,7 +312,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
int i = 0;
TQString value;
do {
- TQString key=TQString( "File%1" ).tqarg( i );
+ TQString key=TQString( "File%1" ).arg( i );
value=d->m_instance->config()->readPathEntry( key );
if ( !value.isEmpty() ) {
// Support for tdelibs-3.5's new RecentFiles format: name[url]
@@ -478,7 +478,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
currentChanged(itemtoselect);
// setup the checkbox
- TQString translatedstring = i18n("Always start %1 with the selected template").tqarg(d->m_nativeName);
+ TQString translatedstring = i18n("Always start %1 with the selected template").arg(d->m_nativeName);
d->m_nodiag = new TQCheckBox ( translatedstring , widgetbase);
tqlayout->addWidget(d->m_nodiag, 2, 0);
@@ -706,7 +706,7 @@ bool KoTemplateChooseDia::collectInfo()
KURL url = item->url();
if(url.isLocalFile() && !TQFile::exists(url.path()))
{
- KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) );
+ KMessageBox::error( this, i18n( "The file %1 does not exist." ).arg( url.path() ) );
return false;
}
d->m_fullTemplateName = url.url();
@@ -793,7 +793,7 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item )
// and another one for deciding what's the text of the tooltip...
const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo();
TQString toolTipText = fi->url().prettyURL( 0, KURL::StripFileProtocol );
- toolTip = new TQLabel( TQString::fromLatin1(" %1 ").tqarg(toolTipText), 0,
+ toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(toolTipText), 0,
"myToolTip",
WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM );
toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 6243b9dc..4e8c4d0c 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -171,7 +171,7 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan
d->m_defaultTemplate = new TQCheckBox( i18n("Use the new template as default"), mainwidget );
d->m_defaultTemplate->setChecked( true );
- TQToolTip::add( d->m_defaultTemplate, i18n("Use the new template every time %1 starts").tqarg(instance->aboutData()->programName() ) );
+ TQToolTip::add( d->m_defaultTemplate, i18n("Use the new template every time %1 starts").arg(instance->aboutData()->programName() ) );
rightbox->addWidget( d->m_defaultTemplate );
enableButtonOK(false);
diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 764ce4c1..7b31d847 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -104,7 +104,7 @@ public:
TQWidget* getNextParent();
private:
- TQPtrList<TQWidget> m_tqchildren;
+ TQPtrList<TQWidget> m_children;
TQBoxLayout *m_layout;
TQWidget *m_leftRow;
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 3ac7cb45..bc5affeb 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -136,7 +136,7 @@ void KoColorPanel::insertDefaultColors()
return;
m_defaultsAdded = true;
- int currentRow = m_nextPosition.y; // we have to tqrepaint this row below
+ int currentRow = m_nextPosition.y; // we have to repaint this row below
// Note: No checking for duplicates, so take care when you modify that list
insertColor(TQColor( 255 , 0 , 0 ), i18n( "color", "Red" ), false);
@@ -294,9 +294,9 @@ void KoColorPanel::insertDefaultColors()
insertColor(TQColor( 0 , 0 , 205 ), i18n( "color", "MediumBlue" ), false);
insertColor(TQColor( 0 , 0 , 128 ), i18n( "color", "Navy" ), false);
- finalizeInsertion( m_nextPosition ); // with a no-op paint() call as we tqrepaint anyway
+ finalizeInsertion( m_nextPosition ); // with a no-op paint() call as we repaint anyway
updateGeometry();
- // we have to tqrepaint the "old" current row explicitly due
+ // we have to repaint the "old" current row explicitly due
// to WStaticContents
update( 0, currentRow << 4, COLS << 4, 16 );
}
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 89d9dbc8..14b92ec6 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -90,7 +90,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
TQString KoUnitDoubleBase::getVisibleText( double value ) const
{
- const TQString num ( TQString( "%1%2").tqarg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+ const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
return num;
}
diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp
index 7f9e4139..df1bac4d 100644
--- a/lib/kofficeui/KoZoomAction.cpp
+++ b/lib/kofficeui/KoZoomAction.cpp
@@ -69,10 +69,10 @@ void KoZoomAction::setZoom( const TQString& text )
// update items with new sorted zoom values
TQStringList values;
for (TQValueList<int>::Iterator it = list.begin(); it != list.end(); ++it )
- values.append( i18n("%1%").tqarg(*it) );
+ values.append( i18n("%1%").arg(*it) );
setItems( values );
- TQString zoomStr = i18n("%1%").tqarg( zoom );
+ TQString zoomStr = i18n("%1%").arg( zoom );
setCurrentItem( values.findIndex( zoomStr ) );
}
@@ -92,21 +92,21 @@ void KoZoomAction::init()
setEditable( true );
TQStringList values;
- values << i18n("%1%").tqarg("33");
- values << i18n("%1%").tqarg("50");
- values << i18n("%1%").tqarg("75");
- values << i18n("%1%").tqarg("100");
- values << i18n("%1%").tqarg("125");
- values << i18n("%1%").tqarg("150");
- values << i18n("%1%").tqarg("200");
- values << i18n("%1%").tqarg("250");
- values << i18n("%1%").tqarg("350");
- values << i18n("%1%").tqarg("400");
- values << i18n("%1%").tqarg("450");
- values << i18n("%1%").tqarg("500");
+ values << i18n("%1%").arg("33");
+ values << i18n("%1%").arg("50");
+ values << i18n("%1%").arg("75");
+ values << i18n("%1%").arg("100");
+ values << i18n("%1%").arg("125");
+ values << i18n("%1%").arg("150");
+ values << i18n("%1%").arg("200");
+ values << i18n("%1%").arg("250");
+ values << i18n("%1%").arg("350");
+ values << i18n("%1%").arg("400");
+ values << i18n("%1%").arg("450");
+ values << i18n("%1%").arg("500");
setItems( values );
- setCurrentItem( values.findIndex( i18n("%1%").tqarg( 100 ) ) );
+ setCurrentItem( values.findIndex( i18n("%1%").arg( 100 ) ) );
connect( this, TQT_SIGNAL( activated( const TQString& ) ),
TQT_SLOT( activated( const TQString& ) ) );
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index 2618a8e0..e09ef63d 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -341,7 +341,7 @@ TQString KSelectColorAction::whatsThisWithIcon() const
{
TQString text = whatsThis();
if (!icon().isEmpty())
- return TQString::fromLatin1("<img source=\"small|%1\"> %2").tqarg(icon()).tqarg(text);
+ return TQString::fromLatin1("<img source=\"small|%1\"> %2").arg(icon()).arg(text);
return text;
}
diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index da88a7c1..cfc21c65 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -120,19 +120,19 @@ void TKAction::updateLayout()
}
}
-TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* tqchildren)
+TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children)
{
TQWidget* base = new TQWidget(parent,"KTToolBarLayout");
TQLabel* textLabel = new TQLabel(base,"text");
textLabel->setMinimumHeight(1);
TQLabel* pixLabel = new TQLabel(base,"pixmap");
- tqchildren->reparent(base,TQPoint(0,0));
- tqchildren->setName("widget");
+ children->reparent(base,TQPoint(0,0));
+ children->setName("widget");
TQHBoxLayout* tqlayout = new TQHBoxLayout(base,0,3);
tqlayout->setResizeMode(TQLayout::Minimum);
tqlayout->addWidget(textLabel);
tqlayout->addWidget(pixLabel);
- tqlayout->addWidget(tqchildren,1);
+ tqlayout->addWidget(children,1);
updateLayout(base);
return base;
diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h
index 26b4069d..b9a84a41 100644
--- a/lib/kofficeui/tkaction.h
+++ b/lib/kofficeui/tkaction.h
@@ -44,7 +44,7 @@ public:
protected:
virtual void initToolBarButton(TKToolBarButton*);
- TQWidget* createLayout(TQWidget* parent, TQWidget* tqchildren);
+ TQWidget* createLayout(TQWidget* parent, TQWidget* children);
void updateLayout();
virtual void updateLayout(TQWidget*);
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index 5436496f..af2b14c2 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -182,7 +182,7 @@ void TKToolBarButton::setEnabled( bool enabled )
void TKToolBarButton::setText( const TQString& text)
{
d->m_text = text;
- tqrepaint(false);
+ repaint(false);
}
void TKToolBarButton::setIcon( const TQString& icon )
@@ -281,7 +281,7 @@ void TKToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle )
void TKToolBarButton::setRaised(bool f)
{
d->m_isRaised = f;
- tqrepaint(false);
+ repaint(false);
}
void TKToolBarButton::setAutoRaised(bool f)
@@ -308,7 +308,7 @@ void TKToolBarButton::enterEvent(TQEvent *)
} else {
TQToolButton::setPixmap(disabledPixmap);
}
- tqrepaint(false);
+ repaint(false);
}
}
@@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
case TQEvent::Hide:
on(false);
setDown(false);
- if ( !tqgeometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
+ if ( !geometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
leaveEvent(0L);
return false;
break;
@@ -409,7 +409,7 @@ void TKToolBarButton::paletteChange(const TQPalette &)
TQToolButton::setPixmap( disabledPixmap );
else
TQToolButton::setPixmap( defaultPixmap );
- tqrepaint(false);
+ repaint(false);
}
void TKToolBarButton::makeDefaultPixmap()
@@ -502,7 +502,7 @@ void TKToolBarButton::slotToggled()
void TKToolBarButton::on(bool flag)
{
d->m_isOn = flag;
- tqrepaint();
+ repaint();
}
void TKToolBarButton::toggle()
@@ -519,14 +519,14 @@ void TKToolBarButton::setToggle(bool flag)
disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
modeChange();
- tqrepaint();
+ repaint();
}
void TKToolBarButton::setIconMode( TK::IconMode m )
{
d->m_iconMode = m;
modeChange();
- tqrepaint();
+ repaint();
}
#include <tktoolbarbutton.moc>