summaryrefslogtreecommitdiffstats
path: root/tdeui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:57:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:57:02 -0600
commita51cd9949c4e6c726a84a61de3cfadd30cefb5c7 (patch)
treea65321bcfdb90583bcc7ef3a90fa357f6632e54c /tdeui
parent984c25aa6969e55896e9a13c8e7f7b8a58991a4e (diff)
downloadtdelibs-a51cd9949c4e6c726a84a61de3cfadd30cefb5c7.tar.gz
tdelibs-a51cd9949c4e6c726a84a61de3cfadd30cefb5c7.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'tdeui')
-rw-r--r--tdeui/kaboutdialog.cpp8
-rw-r--r--tdeui/kaboutdialog.h4
-rw-r--r--tdeui/kactionclasses.cpp2
-rw-r--r--tdeui/kactioncollection.cpp6
-rw-r--r--tdeui/kanimwidget.cpp4
-rw-r--r--tdeui/karrowbutton.cpp2
-rw-r--r--tdeui/karrowbutton.h4
-rw-r--r--tdeui/kcharselect.cpp2
-rw-r--r--tdeui/kcolorbutton.cpp2
-rw-r--r--tdeui/kcolordialog.cpp2
-rw-r--r--tdeui/kcompletionbox.cpp2
-rw-r--r--tdeui/kcursor.h2
-rw-r--r--tdeui/kdatetbl.cpp4
-rw-r--r--tdeui/kdialogbase.h8
-rw-r--r--tdeui/kdockwidget.cpp12
-rw-r--r--tdeui/kdockwidget_private.cpp14
-rw-r--r--tdeui/kdualcolorbutton.cpp14
-rw-r--r--tdeui/keditcl1.cpp8
-rw-r--r--tdeui/kfontdialog.cpp2
-rw-r--r--tdeui/kjanuswidget.cpp2
-rw-r--r--tdeui/kkeybutton.cpp4
-rw-r--r--tdeui/kkeydialog.cpp2
-rw-r--r--tdeui/klanguagebutton.cpp8
-rw-r--r--tdeui/kled.cpp20
-rw-r--r--tdeui/kled.h14
-rw-r--r--tdeui/klistview.cpp30
-rw-r--r--tdeui/klistview.h2
-rw-r--r--tdeui/knuminput.cpp30
-rw-r--r--tdeui/knuminput.h8
-rw-r--r--tdeui/kpanelapplet.cpp6
-rw-r--r--tdeui/kpanelapplet.h8
-rw-r--r--tdeui/kpanelextension.cpp6
-rw-r--r--tdeui/kpanelextension.h8
-rw-r--r--tdeui/krootpixmap.cpp18
-rw-r--r--tdeui/krootpixmap.h8
-rw-r--r--tdeui/kruler.cpp10
-rw-r--r--tdeui/kruler.h8
-rw-r--r--tdeui/kselect.cpp6
-rw-r--r--tdeui/ksharedpixmap.cpp2
-rw-r--r--tdeui/kspell.cpp2
-rw-r--r--tdeui/kspellui.ui2
-rw-r--r--tdeui/ksqueezedtextlabel.cpp4
-rw-r--r--tdeui/kstatusbar.h2
-rw-r--r--tdeui/ksystemtray.cpp2
-rw-r--r--tdeui/ktabbar.cpp8
-rw-r--r--tdeui/ktabctl.cpp12
-rw-r--r--tdeui/ktabctl.h2
-rw-r--r--tdeui/ktabwidget.cpp8
-rw-r--r--tdeui/ktoolbar.cpp6
-rw-r--r--tdeui/ktoolbar.h2
-rw-r--r--tdeui/ktoolbarbutton.cpp12
-rw-r--r--tdeui/kurllabel.cpp2
-rw-r--r--tdeui/kwordwrap.cpp4
-rw-r--r--tdeui/kwordwrap.h4
-rw-r--r--tdeui/tests/kdesattest.cpp2
-rw-r--r--tdeui/tests/kdockwidgetdemo.cpp2
-rw-r--r--tdeui/tests/kledtest.cpp6
-rw-r--r--tdeui/tests/kledtest.h2
-rw-r--r--tdeui/tests/ktabwidgettest.cpp6
-rw-r--r--tdeui/tests/kunbalancedgrdtest.cpp2
60 files changed, 197 insertions, 197 deletions
diff --git a/tdeui/kaboutdialog.cpp b/tdeui/kaboutdialog.cpp
index c7aaca01a..b1db10f12 100644
--- a/tdeui/kaboutdialog.cpp
+++ b/tdeui/kaboutdialog.cpp
@@ -890,7 +890,7 @@ void KAboutContainer::addPerson( const TQString &_name, const TQString &_email,
}
-void KAboutContainer::addTitle( const TQString &title, int tqalignment,
+void KAboutContainer::addTitle( const TQString &title, int alignment,
bool showFrame, bool showBold )
{
@@ -905,11 +905,11 @@ void KAboutContainer::addTitle( const TQString &title, int tqalignment,
{
label->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
}
- label->setAlignment( tqalignment );
+ label->setAlignment( alignment );
}
-void KAboutContainer::addImage( const TQString &fileName, int tqalignment )
+void KAboutContainer::addImage( const TQString &fileName, int alignment )
{
if( fileName.isNull() )
{
@@ -924,7 +924,7 @@ void KAboutContainer::addImage( const TQString &fileName, int tqalignment )
pix = logo;
label->setPixmap( pix );
}
- label->setAlignment( tqalignment );
+ label->setAlignment( alignment );
}
#if 0
diff --git a/tdeui/kaboutdialog.h b/tdeui/kaboutdialog.h
index 01a515959..6f0d80149 100644
--- a/tdeui/kaboutdialog.h
+++ b/tdeui/kaboutdialog.h
@@ -62,9 +62,9 @@ class TDEUI_EXPORT KAboutContainer : public TQFrame
const TQString &url, const TQString &task,
bool showHeader = false, bool showframe = false,
bool showBold = false );
- void addTitle( const TQString &title, int tqalignment=AlignLeft,
+ void addTitle( const TQString &title, int alignment=AlignLeft,
bool showframe = false, bool showBold = false );
- void addImage( const TQString &fileName, int tqalignment=AlignLeft );
+ void addImage( const TQString &fileName, int alignment=AlignLeft );
virtual TQSize sizeHint( void ) const;
virtual TQSize minimumSizeHint( void ) const;
diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp
index 8c3453fb3..c8b861e12 100644
--- a/tdeui/kactionclasses.cpp
+++ b/tdeui/kactionclasses.cpp
@@ -628,7 +628,7 @@ void KSelectAction::updateItems( int id )
for( ; it != lst.end(); ++it )
cb->insertItem( *it );
// qt caches and never recalculates the sizeHint()
- // qcombobox.cpp recommends calling setFont to tqinvalidate the sizeHint
+ // qcombobox.cpp recommends calling setFont to invalidate the sizeHint
// setFont sets own_font = True, so we're a bit mean and calll
// unsetFont which calls setFont and then overwrites the own_font
cb->unsetFont();
diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp
index 23cc55917..ba809087c 100644
--- a/tdeui/kactioncollection.cpp
+++ b/tdeui/kactioncollection.cpp
@@ -250,8 +250,8 @@ void KActionCollection::removeWidget( TQWidget* w )
}
delete pKAccel;
- d->m_widgetList.remove( d->m_widgetList.tqat( i ) );
- d->m_kaccelList.remove( d->m_kaccelList.tqat( i ) );
+ d->m_widgetList.remove( d->m_widgetList.at( i ) );
+ d->m_kaccelList.remove( d->m_kaccelList.at( i ) );
if( d->m_iWidgetCurrent == (int)i )
d->m_iWidgetCurrent = -1;
@@ -402,7 +402,7 @@ KAction* KActionCollection::action( int index ) const
TQAsciiDictIterator<KAction> it( d->m_actionDict );
it += index;
return it.current();
-// return d->m_actions.tqat( index );
+// return d->m_actions.at( index );
}
bool KActionCollection::readShortcutSettings( const TQString& sConfigGroup, KConfigBase* pConfig )
diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp
index d538bea20..899ba7bd3 100644
--- a/tdeui/kanimwidget.cpp
+++ b/tdeui/kanimwidget.cpp
@@ -74,7 +74,7 @@ void KAnimWidget::stop()
{
d->current_frame = 0;
d->timer.stop();
- tqrepaint();
+ repaint();
}
void KAnimWidget::setSize( int size )
@@ -162,7 +162,7 @@ void KAnimWidget::slotTimerUpdate()
// We have to clear the widget when repainting a transparent image
// By doing it like this we get a bit of flicker though. A better
// way might be to merge it with the background in drawContents.
- tqrepaint(d->transparent);
+ repaint(d->transparent);
}
void KAnimWidget::drawContents( TQPainter *p )
diff --git a/tdeui/karrowbutton.cpp b/tdeui/karrowbutton.cpp
index d691b6cfa..4808bcd54 100644
--- a/tdeui/karrowbutton.cpp
+++ b/tdeui/karrowbutton.cpp
@@ -49,7 +49,7 @@ void KArrowButton::setArrowType(Qt::ArrowType a)
{
if (d->arrow != a) {
d->arrow = a;
- tqrepaint();
+ repaint();
}
}
Qt::ArrowType KArrowButton::arrowType() const
diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h
index 90f56d9bb..0719f8bc1 100644
--- a/tdeui/karrowbutton.h
+++ b/tdeui/karrowbutton.h
@@ -28,7 +28,7 @@ class KArrowButtonPrivate;
* @short Draws a button with an arrow.
*
* Draws a button which shows an arrow pointing into a certain direction. The
- * arrow's tqalignment on the button depends on the direction it's pointing to,
+ * arrow's alignment on the button depends on the direction it's pointing to,
* e.g. a left arrow is aligned at the left border, a upwards arrow at the top
* border. This class honors the currently configured KStyle when drawing
* the arrow.
@@ -72,7 +72,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton
void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); }
public slots:
/**
- * Defines in what direction the arrow is pointing to. Will tqrepaint the
+ * Defines in what direction the arrow is pointing to. Will repaint the
* button if necessary.
*
* @param a The direction this arrow should be pointing in
diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp
index f20fdc004..e8ff5e6c3 100644
--- a/tdeui/kcharselect.cpp
+++ b/tdeui/kcharselect.cpp
@@ -493,7 +493,7 @@ void KCharSelect::fillFontCombo()
fontDataBase = new TQFontDatabase();
qAddPostRoutine( cleanupFontDatabase );
}
- fontList=fontDataBase->tqfamilies();
+ fontList=fontDataBase->families();
fontCombo->insertStringList( fontList );
}
diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp
index e697276d8..4d3db2983 100644
--- a/tdeui/kcolorbutton.cpp
+++ b/tdeui/kcolorbutton.cpp
@@ -85,7 +85,7 @@ void KColorButton::setColor( const TQColor &c )
{
if ( col != c ) {
col = c;
- tqrepaint( false );
+ repaint( false );
emit changed( col );
}
}
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index efdad2385..ac0251107 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -1479,7 +1479,7 @@ void KColorDialog::showColor( const KColor &color, const TQString &name )
d->valuePal->setValue( v );
d->valuePal->updateContents();
d->valuePal->blockSignals(false);
- d->valuePal->tqrepaint( false );
+ d->valuePal->repaint( false );
d->bRecursion = false;
}
diff --git a/tdeui/kcompletionbox.cpp b/tdeui/kcompletionbox.cpp
index 988c1f1cc..069a1733f 100644
--- a/tdeui/kcompletionbox.cpp
+++ b/tdeui/kcompletionbox.cpp
@@ -485,7 +485,7 @@ void KCompletionBox::setItems( const TQStringList& items )
}
else {
//Keep track of whether we need to change anything,
- //so we can avoid a tqrepaint for identical updates,
+ //so we can avoid a repaint for identical updates,
//to reduce flicker
bool dirty = false;
diff --git a/tdeui/kcursor.h b/tdeui/kcursor.h
index 7be14601b..538cdcd72 100644
--- a/tdeui/kcursor.h
+++ b/tdeui/kcursor.h
@@ -33,7 +33,7 @@ class TQWidget;
*
* A wrapper around TQCursor that allows for "themed" cursors.
*
- * Currently, the only themed cursor is a hand tqshaped cursor.
+ * Currently, the only themed cursor is a hand shaped cursor.
*
* A typical usage would be
* \code
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index 69fbc083b..9387a6322 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -815,7 +815,7 @@ KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e)
updateCell( row, col /*, false */ ); // mark the new active cell
}
}
- if ( tmpRow > -1 ) // tqrepaint the former active cell
+ if ( tmpRow > -1 ) // repaint the former active cell
updateCell( tmpRow, tmpCol /*, true */ );
}
}
@@ -1006,7 +1006,7 @@ int
KPopupFrame::exec(TQPoint pos)
{
popup(pos);
- tqrepaint();
+ repaint();
d->exec = true;
const TQGuardedPtr<TQObject> that = TQT_TQOBJECT(this);
tqApp->enter_loop();
diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h
index d89b8c67e..f0da150b6 100644
--- a/tdeui/kdialogbase.h
+++ b/tdeui/kdialogbase.h
@@ -100,7 +100,7 @@ class KDialogBaseTile;
* signals that are related to the standard action buttons will be used
* when you don't use these buttons.
*
- * <b>Dialog tqshapes:</b>\n
+ * <b>Dialog shapes:</b>\n
*
* You can either use one of the prebuilt, easy to use, faces or
* define your own main widget. The dialog provides ready to use
@@ -733,7 +733,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
* Sets the page with @p index to be displayed.
*
* This method will only
- * work when the dialog is using the predefined tqshape of TreeList,
+ * work when the dialog is using the predefined shape of TreeList,
* IconList or Tabbed.
*
* @param index Index of the page to be shown.
@@ -745,7 +745,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
* Returns the index of the active page.
*
* This method will only work when the dialog is using the
- * predefined tqshape of Tabbed, TreeList or IconList.
+ * predefined shape of Tabbed, TreeList or IconList.
*
* @return The page index or -1 if there is no active page.
*/
@@ -1167,7 +1167,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
* set it as a minimum size for the resulting dialog.
*
* You should not need to use this method and never if you use one of
- * the predefined tqshapes.
+ * the predefined shapes.
*
* @param w The width of you special widget.
* @param h The height of you special widget.
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index 219cfd0f6..88af16eb0 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -1497,7 +1497,7 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab )
tab->parentWidget()->setName( listOfName.utf8() );
tab->parentWidget()->setCaption( listOfCaption );
- tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint
+ tab->parentWidget()->repaint( false ); // KDockWidget->repaint
if ( tab->parentWidget()->parent() )
if ( tab->parentWidget()->parent()->inherits("KDockSplitter") )
((KDockSplitter*)(tab->parentWidget()->parent()))->updateName();
@@ -1570,7 +1570,7 @@ void KDockWidget::loseFormerBrotherDockWidget()
TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
this, TQT_SLOT(loseFormerBrotherDockWidget()) );
formerBrotherDockWidget = 0L;
- tqrepaint();
+ repaint();
}
void KDockWidget::dockBack()
@@ -1910,7 +1910,7 @@ void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const
while ( it.current() ) {
if ( it.current()->isWidgetType() ) {
w = (TQWidget*)it.current();
- if ( w->isVisible() && w->tqgeometry().contains(pos) ) {
+ if ( w->isVisible() && w->geometry().contains(pos) ) {
if ( w->inherits("KDockWidget") ) ww = w;
findChildDockWidget( ww, w, w->mapFromParent(pos) );
return;
@@ -2950,7 +2950,7 @@ void KDockManager::slotMenuPopup()
void KDockManager::slotMenuActivated( int id )
{
- MenuDockData* data = menuData->tqat( id );
+ MenuDockData* data = menuData->at( id );
data->dock->changeHideShowState();
}
@@ -3121,7 +3121,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
// for (unsigned int i=0;i<children()->count();i++)
{
// TQPtrList<TQObject> list(children());
-// TQObject *obj=((TQPtrList<TQObject*>)children())->tqat(i);
+// TQObject *obj=((TQPtrList<TQObject*>)children())->at(i);
TQObject *obj=children()->getFirst();
if (split = tqt_dynamic_cast<KDockSplitter*>(obj))
{
@@ -3272,7 +3272,7 @@ void KDockContainer::prepareSave(TQStringList &names)
names.remove(tmp->data);
// for (uint i=0;i<m_children.count();i++)
// {
-// names.remove(m_children.tqat(i));
+// names.remove(m_children.at(i));
// }
}
diff --git a/tdeui/kdockwidget_private.cpp b/tdeui/kdockwidget_private.cpp
index c7838d4d9..41372fdf6 100644
--- a/tdeui/kdockwidget_private.cpp
+++ b/tdeui/kdockwidget_private.cpp
@@ -513,7 +513,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
if (tmp_xpos != xpos) {
xpos = tmp_xpos;
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
}
}
} else {
@@ -529,7 +529,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
if (tmp_xpos != xpos) {
xpos = tmp_xpos;
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
}
}
}
@@ -546,7 +546,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
}
xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
} else {
if ((fixedWidth0!=-1) || (fixedWidth1!=-1))
{
@@ -554,7 +554,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
}
xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width();
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
}
handled= true;
break;
@@ -587,7 +587,7 @@ void KDockSplitter::updateName()
TQString new_name = TQString( child0->name() ) + "," + child1->name();
parentWidget()->setName( new_name.latin1() );
parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
- parentWidget()->tqrepaint( false );
+ parentWidget()->repaint( false );
((KDockWidget*)parentWidget())->firstName = child0->name();
((KDockWidget*)parentWidget())->lastName = child1->name();
@@ -661,13 +661,13 @@ void KDockButton_Private::drawButton( TQPainter* p )
void KDockButton_Private::enterEvent( TQEvent * )
{
moveMouse = true;
- tqrepaint();
+ repaint();
}
void KDockButton_Private::leaveEvent( TQEvent * )
{
moveMouse = false;
- tqrepaint();
+ repaint();
}
/*************************************************************************/
diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp
index 27cd28f43..f6d49a97e 100644
--- a/tdeui/kdualcolorbutton.cpp
+++ b/tdeui/kdualcolorbutton.cpp
@@ -112,7 +112,7 @@ TQSize KDualColorButton::sizeHint() const
void KDualColorButton::setForeground(const TQColor &c)
{
fg = TQBrush(c, Qt::SolidPattern);
- tqrepaint(false);
+ repaint(false);
emit fgChanged(fg.color());
}
@@ -120,7 +120,7 @@ void KDualColorButton::setForeground(const TQColor &c)
void KDualColorButton::setBackground(const TQColor &c)
{
bg = TQBrush(c, Qt::SolidPattern);
- tqrepaint(false);
+ repaint(false);
emit bgChanged(bg.color());
}
@@ -131,13 +131,13 @@ void KDualColorButton::setCurrentColor(const TQColor &c)
bg = TQBrush(c, Qt::SolidPattern);
else
fg = TQBrush(c, Qt::SolidPattern);
- tqrepaint(false);
+ repaint(false);
}
void KDualColorButton::setCurrent(DualColor s)
{
curColor = s;
- tqrepaint(false);
+ repaint(false);
}
void KDualColorButton::metrics(TQRect &fgRect, TQRect &bgRect)
@@ -181,7 +181,7 @@ void KDualColorButton::dropEvent(TQDropEvent *ev)
bg.setColor(c);
emit(bgChanged(c));
}
- tqrepaint(false);
+ repaint(false);
}
}
@@ -217,7 +217,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev)
emit bgChanged(bg.color());
miniCtlFlag = true;
}
- tqrepaint(false);
+ repaint(false);
}
@@ -270,7 +270,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev)
}
}
}
- tqrepaint(false);
+ repaint(false);
dragFlag = false;
}
else
diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp
index 3e03fc019..a8d9f5953 100644
--- a/tdeui/keditcl1.cpp
+++ b/tdeui/keditcl1.cpp
@@ -104,7 +104,7 @@ KEdit::insertText(TQTextStream *stream)
// MS: read everything at once if file <= 1MB,
// else read in 5000-line chunks to keep memory usage acceptable.
- TQIODevice *dev=stream->tqdevice();
+ TQIODevice *dev=stream->device();
if (dev && dev->size()>(1024*1024)) {
while(1) {
int i;
@@ -128,7 +128,7 @@ KEdit::insertText(TQTextStream *stream)
setCursorPosition(saveline, savecol);
// setAutoUpdate(true);
-// tqrepaint();
+// repaint();
setModified(true);
setFocus();
@@ -200,7 +200,7 @@ KEdit::cleanWhiteSpace()
{
deselect();
d->autoUpdate = true;
- tqrepaint();
+ repaint();
return;
}
if (wordWrap() == NoWrap)
@@ -225,7 +225,7 @@ KEdit::cleanWhiteSpace()
insert(newText);
d->autoUpdate = true;
- tqrepaint();
+ repaint();
setModified(true);
setFocus();
diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp
index 147b63901..1fcb3a2f2 100644
--- a/tdeui/kfontdialog.cpp
+++ b/tdeui/kfontdialog.cpp
@@ -641,7 +641,7 @@ void KFontChooser::setupDisplay()
void KFontChooser::getFontList( TQStringList &list, uint fontListCriteria)
{
TQFontDatabase dbase;
- TQStringList lstSys(dbase.tqfamilies());
+ TQStringList lstSys(dbase.families());
// if we have criteria; then check fonts before adding
if (fontListCriteria)
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index 0bf5199ff..a11cbbaf2 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -518,7 +518,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget )
TQObjectList l = mSwallowPage->childrenListObject(); // silence please
for( uint i=0; i < l.count(); i++ )
{
- TQObject *o = l.tqat(i);
+ TQObject *o = l.at(i);
if( o->isWidgetType() )
{
((TQWidget*)o)->hide();
diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp
index 7a51d47f0..6626a9a46 100644
--- a/tdeui/kkeybutton.cpp
+++ b/tdeui/kkeybutton.cpp
@@ -106,7 +106,7 @@ void KKeyButton::captureShortcut()
KShortcut cut;
m_bEditing = true;
- tqrepaint();
+ repaint();
{
KShortcutDialog dlg( m_cut, d->bQtShortcut, this );
@@ -117,7 +117,7 @@ void KKeyButton::captureShortcut()
emit capturedShortcut( cut );
m_bEditing = false;
- tqrepaint();
+ repaint();
}
void KKeyButton::drawButton( TQPainter *painter )
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index 84d367a65..0518d870c 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -532,7 +532,7 @@ void KKeyChooser::updateButtons()
d->pbtnShortcut->setShortcut( pItem->shortcut(), bQtShortcut );
//item->setText( 1, keyStrCfg );
- pItem->tqrepaint();
+ pItem->repaint();
d->lInfo->setText( i18n("Default key:") + TQString(" %1").arg(keyStrDef.isEmpty() ? i18n("None") : keyStrDef) );
// Select the appropriate radio button.
diff --git a/tdeui/klanguagebutton.cpp b/tdeui/klanguagebutton.cpp
index 07cdc6db3..abbc4f5d3 100644
--- a/tdeui/klanguagebutton.cpp
+++ b/tdeui/klanguagebutton.cpp
@@ -191,7 +191,7 @@ void KLanguageButton::slotActivated( int index )
setCurrentItem( index );
// Forward event from popup menu as if it was emitted from this widget:
- TQString id = *m_ids->tqat( index );
+ TQString id = *m_ids->at( index );
emit activated( id );
}
@@ -199,7 +199,7 @@ void KLanguageButton::slotHighlighted( int index )
{
//kdDebug() << "slotHighlighted" << index << endl;
- TQString id = *m_ids->tqat( index );
+ TQString id = *m_ids->at( index );
emit ( highlighted(id) );
}
@@ -237,7 +237,7 @@ bool KLanguageButton::contains( const TQString & id ) const
TQString KLanguageButton::current() const
{
- return *m_ids->tqat( currentItem() );
+ return *m_ids->at( currentItem() );
}
@@ -248,7 +248,7 @@ TQString KLanguageButton::id( int i ) const
kdDebug() << "KLanguageButton::tag(), unknown tag " << i << endl;
return TQString::null;
}
- return *m_ids->tqat( i );
+ return *m_ids->at( i );
}
diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp
index 71b6e00c1..7dd45f107 100644
--- a/tdeui/kled.cpp
+++ b/tdeui/kled.cpp
@@ -51,7 +51,7 @@ KLed::KLed(TQWidget *parent, const char *name)
: TQWidget( parent, name),
led_state(On),
led_look(Raised),
- led_tqshape(Circular)
+ led_shape(Circular)
{
TQColor col(green);
d = new KLed::KLedPrivate;
@@ -68,7 +68,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
: TQWidget( parent, name),
led_state(On),
led_look(Raised),
- led_tqshape(Circular)
+ led_shape(Circular)
{
d = new KLed::KLedPrivate;
d->dark_factor = 300;
@@ -81,11 +81,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
}
KLed::KLed(const TQColor& col, KLed::State state,
- KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name )
+ KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name )
: TQWidget(parent, name),
led_state(state),
led_look(look),
- led_tqshape(tqshape)
+ led_shape(shape)
{
d = new KLed::KLedPrivate;
d->dark_factor = 300;
@@ -93,7 +93,7 @@ KLed::KLed(const TQColor& col, KLed::State state,
d->off_map = 0;
d->on_map = 0;
- //setShape(tqshape);
+ //setShape(shape);
setColor(col);
}
@@ -114,7 +114,7 @@ KLed::paintEvent(TQPaintEvent *)
t.start();
for (int i=0; i<rounds; i++) {
#endif
- switch(led_tqshape)
+ switch(led_shape)
{
case Rectangular:
switch (led_look)
@@ -525,9 +525,9 @@ KLed::state() const
}
KLed::Shape
-KLed::tqshape() const
+KLed::shape() const
{
- return led_tqshape;
+ return led_shape;
}
TQColor
@@ -561,9 +561,9 @@ KLed::toggleState()
void
KLed::setShape(KLed::Shape s)
{
- if(led_tqshape!=s)
+ if(led_shape!=s)
{
- led_tqshape = s;
+ led_shape = s;
update();
}
}
diff --git a/tdeui/kled.h b/tdeui/kled.h
index 7ae03e196..7b9f327fa 100644
--- a/tdeui/kled.h
+++ b/tdeui/kled.h
@@ -47,7 +47,7 @@ class TDEUI_EXPORT KLed : public TQWidget
Q_OBJECT
Q_ENUMS( State Shape Look )
Q_PROPERTY( State state READ state WRITE setState )
- Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape )
+ Q_PROPERTY( Shape shape READ shape WRITE setShape )
Q_PROPERTY( Look look READ look WRITE setLook )
Q_PROPERTY( TQColor color READ color WRITE setColor )
Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor )
@@ -62,7 +62,7 @@ public:
/**
* Shades of the lamp.
- * @short LED tqshape
+ * @short LED shape
*/
enum Shape { Rectangular, Circular };
@@ -114,12 +114,12 @@ public:
* @param col Initial color of the LED.
* @param state Sets the State.
* @param look Sets the Look.
- * @param tqshape Sets the Shape (rectangular or circular)
+ * @param shape Sets the Shape (rectangular or circular)
* @param parent Will be handed over to TQWidget.
* @param name Will be handed over to TQWidget.
* @short Constructor
*/
- KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape tqshape,
+ KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape shape,
TQWidget *parent=0, const char *name=0);
@@ -137,7 +137,7 @@ public:
*/
State state() const;
- Shape tqshape() const;
+ Shape shape() const;
/**
* Returns the color of the widget
@@ -175,7 +175,7 @@ public:
void setState( State state );
/**
- * Set the tqshape of the LED to @p s.
+ * Set the shape of the LED to @p s.
*/
void setShape(Shape s);
/**
@@ -317,7 +317,7 @@ private:
State led_state;
TQColor led_color;
Look led_look;
- Shape led_tqshape;
+ Shape led_shape;
protected:
virtual void virtual_hook( int id, void* data );
diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp
index 197d90acd..fd5a6c51c 100644
--- a/tdeui/klistview.cpp
+++ b/tdeui/klistview.cpp
@@ -716,7 +716,7 @@ void KListView::focusInEvent( TQFocusEvent *fe )
&& (currentItem()))
{
currentItem()->setSelected(true);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
emit selectionChanged();
};
}
@@ -736,7 +736,7 @@ void KListView::focusOutEvent( TQFocusEvent *fe )
&& (!d->editor->isVisible()))
{
currentItem()->setSelected(false);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
emit selectionChanged();
};
@@ -776,7 +776,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e )
if (currentItem())
{
currentItem()->setSelected(false);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
// emit selectionChanged();
}
}
@@ -1008,7 +1008,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event)
{
cleanDropVisualizer();
d->mOldDropVisualizer=tmpRect;
- viewport()->tqrepaint(tmpRect);
+ viewport()->repaint(tmpRect);
}
}
if (dropHighlighter())
@@ -1018,7 +1018,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event)
{
cleanItemHighlighter();
d->mOldDropHighlighter=tmpRect;
- viewport()->tqrepaint(tmpRect);
+ viewport()->repaint(tmpRect);
}
}
}
@@ -1045,7 +1045,7 @@ void KListView::cleanDropVisualizer()
{
TQRect rect=d->mOldDropVisualizer;
d->mOldDropVisualizer = TQRect();
- viewport()->tqrepaint(rect, true);
+ viewport()->repaint(rect, true);
}
}
@@ -1371,7 +1371,7 @@ void KListView::cleanItemHighlighter ()
{
TQRect rect=d->mOldDropHighlighter;
d->mOldDropHighlighter = TQRect();
- viewport()->tqrepaint(rect, true);
+ viewport()->repaint(rect, true);
}
}
@@ -1482,7 +1482,7 @@ void KListView::activateAutomaticSelection()
if (currentItem())
{
currentItem()->setSelected(true);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
emit selectionChanged();
};
}
@@ -1816,12 +1816,12 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
{ // rectangle to be repainted
if ( ir.x() < 0 )
ir.moveBy( -ir.x(), 0 );
- viewport()->tqrepaint( ir, false );
+ viewport()->repaint( ir, false );
}
/*if (repaintItem1)
- repaintItem1->tqrepaint();
+ repaintItem1->repaint();
if (repaintItem2)
- repaintItem2->tqrepaint();*/
+ repaintItem2->repaint();*/
update();
if (emitSelectionChanged)
emit selectionChanged();
@@ -2001,13 +2001,13 @@ const TQColor &KListView::alternateBackground() const
void KListView::setAlternateBackground(const TQColor &c)
{
d->alternateBackground = c;
- tqrepaint();
+ repaint();
}
void KListView::setShadeSortColumn(bool shadeSortColumn)
{
d->shadeSortColumn = shadeSortColumn;
- tqrepaint();
+ repaint();
}
bool KListView::shadeSortColumn() const
@@ -2335,7 +2335,7 @@ bool KListViewItem::isAlternate()
return false;
}
-void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
TQColorGroup _cg = cg;
TQListView* lv = listView();
@@ -2353,7 +2353,7 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
TQColorGroup::Background : TQColorGroup::Base,
backgroundColor(column));
}
- TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
+ TQListViewItem::paintCell(p, _cg, column, width, alignment);
}
void KListView::virtual_hook( int, void* )
diff --git a/tdeui/klistview.h b/tdeui/klistview.h
index 4795299ed..ed101927f 100644
--- a/tdeui/klistview.h
+++ b/tdeui/klistview.h
@@ -1070,7 +1070,7 @@ public:
TQColor backgroundColor(int column);
virtual void paintCell(TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment);
+ int column, int width, int alignment);
private:
void init();
diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp
index 19c3268af..27b86f98e 100644
--- a/tdeui/knuminput.cpp
+++ b/tdeui/knuminput.cpp
@@ -86,7 +86,7 @@ void KNumInput::init()
m_label = 0;
m_slider = 0;
- m_tqalignment = 0;
+ m_alignment = 0;
}
KNumInput::~KNumInput()
@@ -103,17 +103,17 @@ void KNumInput::setLabel(const TQString & label, int a)
if(label.isEmpty()) {
delete m_label;
m_label = 0;
- m_tqalignment = 0;
+ m_alignment = 0;
}
else {
if (m_label) m_label->setText(label);
else m_label = new TQLabel(label, this, "KNumInput::TQLabel");
m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter)))
| AlignVCenter);
- // if no vertical tqalignment set, use Top tqalignment
+ // if no vertical alignment set, use Top alignment
if(!(a & (AlignTop|AlignBottom|AlignVCenter)))
a |= AlignTop;
- m_tqalignment = a;
+ m_alignment = a;
}
layout(true);
@@ -133,7 +133,7 @@ void KNumInput::layout(bool deep)
// label sizeHint
m_sizeLabel = (m_label ? m_label->sizeHint() : TQSize(0,0));
- if(m_label && (m_tqalignment & AlignVCenter))
+ if(m_label && (m_alignment & AlignVCenter))
m_colw1 = m_sizeLabel.width() + 4;
else
m_colw1 = 0;
@@ -422,7 +422,7 @@ TQSize KIntNumInput::minimumSizeHint() const
h = 2 + QMAX(m_sizeSpin.height(), m_sizeSlider.height());
// if in extra row, then count it here
- if(m_label && (m_tqalignment & (AlignBottom|AlignTop)))
+ if(m_label && (m_alignment & (AlignBottom|AlignTop)))
h += 4 + m_sizeLabel.height();
else
// label is in the same row as the other widgets
@@ -431,7 +431,7 @@ TQSize KIntNumInput::minimumSizeHint() const
w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
w += m_colw1 + m_colw2;
- if(m_tqalignment & (AlignTop|AlignBottom))
+ if(m_alignment & (AlignTop|AlignBottom))
w = QMAX(w, m_sizeLabel.width() + 4);
return TQSize(w, h);
@@ -451,12 +451,12 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e)
int w = m_colw1;
int h = 0;
- if(m_label && (m_tqalignment & AlignTop)) {
+ if(m_label && (m_alignment & AlignTop)) {
m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height());
h += m_sizeLabel.height() + KDialog::spacingHint();
}
- if(m_label && (m_tqalignment & AlignVCenter))
+ if(m_label && (m_alignment & AlignVCenter))
m_label->setGeometry(0, 0, w, m_sizeSpin.height());
if (tqApp->reverseLayout())
@@ -477,7 +477,7 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e)
h += m_sizeSpin.height() + 2;
- if(m_label && (m_tqalignment & AlignBottom))
+ if(m_label && (m_alignment & AlignBottom))
m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height());
}
@@ -663,7 +663,7 @@ TQSize KDoubleNumInput::minimumSizeHint() const
h = 2 + QMAX(m_sizeEdit.height(), m_sizeSlider.height());
// if in extra row, then count it here
- if(m_label && (m_tqalignment & (AlignBottom|AlignTop)))
+ if(m_label && (m_alignment & (AlignBottom|AlignTop)))
h += 4 + m_sizeLabel.height();
else
// label is in the same row as the other widgets
@@ -672,7 +672,7 @@ TQSize KDoubleNumInput::minimumSizeHint() const
w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
w += m_colw1 + m_colw2;
- if(m_tqalignment & (AlignTop|AlignBottom))
+ if(m_alignment & (AlignTop|AlignBottom))
w = QMAX(w, m_sizeLabel.width() + 4);
return TQSize(w, h);
@@ -683,12 +683,12 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e)
int w = m_colw1;
int h = 0;
- if(m_label && (m_tqalignment & AlignTop)) {
+ if(m_label && (m_alignment & AlignTop)) {
m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height());
h += m_sizeLabel.height() + 4;
}
- if(m_label && (m_tqalignment & AlignVCenter))
+ if(m_label && (m_alignment & AlignVCenter))
m_label->setGeometry(0, 0, w, m_sizeEdit.height());
if (tqApp->reverseLayout())
@@ -713,7 +713,7 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e)
h += m_sizeEdit.height() + 2;
- if(m_label && (m_tqalignment & AlignBottom))
+ if(m_label && (m_alignment & AlignBottom))
m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height());
}
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index c0a6d1847..5f0127cda 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -68,7 +68,7 @@ public:
~KNumInput();
/**
- * Sets the text and tqalignment of the main description label.
+ * Sets the text and alignment of the main description label.
*
* @param label The text of the label.
* Use TQString::null to remove an existing one.
@@ -77,7 +77,7 @@ public:
* @p AlignTop, @p AlignVCenter, @p AlignBottom.
* default is @p AlignLeft | @p AlignTop.
*
- * The vertical tqalignment flags have special meaning with this
+ * The vertical alignment flags have special meaning with this
* widget:
*
* @li @p AlignTop The label is placed above the edit/slider
@@ -144,7 +144,7 @@ protected:
TQSlider* m_slider;
TQSize m_sizeSlider, m_sizeLabel;
- int m_tqalignment;
+ int m_alignment;
private:
void init();
@@ -314,7 +314,7 @@ public:
/**
* This method returns the minimum size necessary to display the
* control. The minimum size is enough to show all the labels
- * in the current font (font change may tqinvalidate the return value).
+ * in the current font (font change may invalidate the return value).
*
* @return the minimum size necessary to show the control
*/
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp
index f04cd2177..7ca2999f1 100644
--- a/tdeui/kpanelapplet.cpp
+++ b/tdeui/kpanelapplet.cpp
@@ -47,7 +47,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type,
: TQFrame(parent, name, f)
, _type(type)
, _position( pBottom )
- , _tqalignment( LeftTop )
+ , _alignment( LeftTop )
, _config(0)
, _actions(actions)
, d(new KPanelApplet::KPanelAppletPrivate())
@@ -80,8 +80,8 @@ void KPanelApplet::setPosition( Position p )
void KPanelApplet::setAlignment( Alignment a )
{
- if( _tqalignment == a ) return;
- _tqalignment = a;
+ if( _alignment == a ) return;
+ _alignment = a;
alignmentChange( a );
}
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index a51f16fda..0d3ac430f 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -308,9 +308,9 @@ protected:
**/
Position position() const { return _position; }
/**
- * @return the applet's tqalignment. (top/left, center, or bottom/right)
+ * @return the applet's alignment. (top/left, center, or bottom/right)
**/
- Alignment tqalignment() const { return _tqalignment; }
+ Alignment alignment() const { return _alignment; }
/**
* The panel on which this applet resides has changed its position.
@@ -320,7 +320,7 @@ protected:
virtual void positionChange( Position p );
/**
- * The panel on which this applet resides has changed its tqalignment.
+ * The panel on which this applet resides has changed its alignment.
* Reimplement this change handler in order to adjust the look of your
* applet.
**/
@@ -383,7 +383,7 @@ protected:
private:
Type _type;
Position _position;
- Alignment _tqalignment;
+ Alignment _alignment;
KConfig* _config;
int _actions;
protected:
diff --git a/tdeui/kpanelextension.cpp b/tdeui/kpanelextension.cpp
index e9cd564bd..47ddd7d95 100644
--- a/tdeui/kpanelextension.cpp
+++ b/tdeui/kpanelextension.cpp
@@ -49,7 +49,7 @@ KPanelExtension::KPanelExtension(const TQString& configFile, Type type,
: TQFrame(parent, name)
, _type(type)
, _position( Top )
- , _tqalignment( LeftTop )
+ , _alignment( LeftTop )
, _config(0)
, _actions(actions)
{
@@ -73,8 +73,8 @@ void KPanelExtension::setPosition( Position p )
void KPanelExtension::setAlignment( Alignment a )
{
- if( _tqalignment == a ) return;
- _tqalignment = a;
+ if( _alignment == a ) return;
+ _alignment = a;
alignmentChange( a );
}
diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h
index 5045d5205..cdc97d14c 100644
--- a/tdeui/kpanelextension.h
+++ b/tdeui/kpanelextension.h
@@ -282,9 +282,9 @@ protected:
Position position() const { return _position; }
/**
- * @return the extension's tqalignment. (left/top, center, or right/bottom)
+ * @return the extension's alignment. (left/top, center, or right/bottom)
**/
- Alignment tqalignment() const { return _tqalignment; }
+ Alignment alignment() const { return _alignment; }
/**
* @return the extensions orientation. (horizontal or vertical)
@@ -305,7 +305,7 @@ protected:
virtual void positionChange( Position ) {}
/**
- * This extension has changed its tqalignment.
+ * This extension has changed its alignment.
* Reimplement this change handler in order to adjust the look of your
* applet.
**/
@@ -333,7 +333,7 @@ protected:
private:
Type _type;
Position _position;
- Alignment _tqalignment;
+ Alignment _alignment;
KConfig* _config;
int _actions;
protected:
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index 8bcd7827b..8b188c480 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -68,7 +68,7 @@ void KRootPixmap::init()
m_bCustomPaint = false;
connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)));
- connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint()));
+ connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint()));
#ifdef Q_WS_X11
connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
@@ -115,7 +115,7 @@ void KRootPixmap::start()
return;
}
if (m_bInit)
- tqrepaint(true);
+ repaint(true);
}
@@ -136,7 +136,7 @@ void KRootPixmap::setFadeEffect(double fade, const TQColor &color)
m_Fade = fade;
m_FadeColor = color;
- if ( m_bActive && m_bInit ) tqrepaint(true);
+ if ( m_bActive && m_bInit ) repaint(true);
}
void KRootPixmap::setBlurEffect(double radius, double sigma)
@@ -191,7 +191,7 @@ void KRootPixmap::desktopChanged(int desktop)
if (KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop() == NET::OnAllDesktops &&
pixmapName(m_Desk) != pixmapName(desktop))
#endif
- tqrepaint(true);
+ repaint(true);
}
void KRootPixmap::desktopChanged( WId window, unsigned int properties )
@@ -203,16 +203,16 @@ void KRootPixmap::desktopChanged( WId window, unsigned int properties )
#endif
kdDebug() << k_funcinfo << endl;
- tqrepaint(true);
+ repaint(true);
}
-void KRootPixmap::tqrepaint()
+void KRootPixmap::repaint()
{
- tqrepaint(false);
+ repaint(false);
}
-void KRootPixmap::tqrepaint(bool force)
+void KRootPixmap::repaint(bool force)
{
TQPoint p1 = m_pWidget->mapToGlobal(m_pWidget->rect().topLeft());
TQPoint p2 = m_pWidget->mapToGlobal(m_pWidget->rect().bottomRight());
@@ -341,7 +341,7 @@ void KRootPixmap::slotBackgroundChanged(int desk)
return;
if (desk == m_Desk)
- tqrepaint(true);
+ repaint(true);
}
#include "krootpixmap.moc"
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index 8ca135e1f..776863c46 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -159,16 +159,16 @@ public slots:
* Repaints the widget background. Normally, you shouldn't need this
* as it is handled automatically.
*
- * @param force Force a tqrepaint, even if the contents did not change.
+ * @param force Force a repaint, even if the contents did not change.
*/
- void tqrepaint( bool force );
+ void repaint( bool force );
/**
* Repaints the widget background. Normally, you shouldn't need this
* as it is handled automatically. This is equivalent to calling
- * tqrepaint( false ).
+ * repaint( false ).
*/
- void tqrepaint();
+ void repaint();
/**
* Enables custom handling of the background painting. If custom
diff --git a/tdeui/kruler.cpp b/tdeui/kruler.cpp
index e9651424b..fed264981 100644
--- a/tdeui/kruler.cpp
+++ b/tdeui/kruler.cpp
@@ -550,16 +550,16 @@ KRuler::slotNewValue(int _value)
return;
}
// get the rectangular of the old and the new ruler pointer
- // and tqrepaint only him
+ // and repaint only him
if (dir == Qt::Horizontal) {
TQRect oldrec(-5+oldvalue,10, 11,6);
TQRect newrec(-5+_value,10, 11,6);
- tqrepaint( oldrec.unite(newrec) );
+ repaint( oldrec.unite(newrec) );
}
else {
TQRect oldrec(10,-5+oldvalue, 6,11);
TQRect newrec(10,-5+_value, 6,11);
- tqrepaint( oldrec.unite(newrec) );
+ repaint( oldrec.unite(newrec) );
}
}
@@ -569,7 +569,7 @@ KRuler::slotNewOffset(int _offset)
if (offset_ != _offset) {
//setOffset(_offset);
offset_ = _offset;
- tqrepaint(contentsRect());
+ repaint(contentsRect());
}
}
@@ -586,7 +586,7 @@ KRuler::slotEndOffset(int offset)
}
if (d->endOffset_length != tmp) {
d->endOffset_length = tmp;
- tqrepaint(contentsRect());
+ repaint(contentsRect());
}
}
diff --git a/tdeui/kruler.h b/tdeui/kruler.h
index 1c48a36dc..ecfcd7b3d 100644
--- a/tdeui/kruler.h
+++ b/tdeui/kruler.h
@@ -55,12 +55,12 @@
* To receive mouse clicks or mouse moves,
* the class has to be overloaded.
*
- * For performance reasons, the public methods don't call TQWidget::tqrepaint().
+ * For performance reasons, the public methods don't call TQWidget::repaint().
* (Slots do, see documentation below.)
* All the changed settings will be painted once after leaving
* to the main event loop.
* For performance painting the slot methods should be used,
- * they do a fast TQWidget::tqrepaint() call after changing the values.
+ * they do a fast TQWidget::repaint() call after changing the values.
* For setting multiple values like minValue(), maxValue(), offset() etc.
* using the public methods is recommended
* so the widget will be painted only once when entering the main event loop.
@@ -428,7 +428,7 @@ public slots:
* Sets the pointer to a new position.
*
* The offset is NOT updated.
- * TQWidget::tqrepaint() is called afterwards.
+ * TQWidget::repaint() is called afterwards.
**/
void slotNewValue(int);
@@ -436,7 +436,7 @@ public slots:
* Sets the ruler marks to a new position.
*
* The pointer is NOT updated.
- * TQWidget::tqrepaint() is called afterwards.
+ * TQWidget::repaint() is called afterwards.
**/
void slotNewOffset(int);
diff --git a/tdeui/kselect.cpp b/tdeui/kselect.cpp
index 367ebdb1b..cda0c2685 100644
--- a/tdeui/kselect.cpp
+++ b/tdeui/kselect.cpp
@@ -135,7 +135,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
}
else if (paintRect.intersects(cursorRect))
{
- tqrepaint( cursorRect, false);
+ repaint( cursorRect, false);
}
painter.end();
@@ -392,11 +392,11 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
{
if ( orientation() == Qt::Vertical )
{
- tqrepaint(pos.x(), pos.y()-5, 6, 11, true);
+ repaint(pos.x(), pos.y()-5, 6, 11, true);
}
else
{
- tqrepaint(pos.x()-5, pos.y(), 11, 6, true);
+ repaint(pos.x()-5, pos.y(), 11, 6, true);
}
}
}
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp
index d0a74f223..29c670265 100644
--- a/tdeui/ksharedpixmap.cpp
+++ b/tdeui/ksharedpixmap.cpp
@@ -102,7 +102,7 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect)
// already active
return false;
- TQPixmap::resize(0, 0); // tqinvalidate
+ TQPixmap::resize(0, 0); // invalidate
TQString str = TQString("KDESHPIXMAP:%1").arg(name);
d->selection = XInternAtom(qt_xdisplay(), str.latin1(), true);
diff --git a/tdeui/kspell.cpp b/tdeui/kspell.cpp
index aa65dc484..7a17ad607 100644
--- a/tdeui/kspell.cpp
+++ b/tdeui/kspell.cpp
@@ -995,7 +995,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog )
// origbuffer since I got errors otherwise
if ( !origbuffer.endsWith("\n\n" ) )
{
- if (origbuffer.tqat(origbuffer.length()-1)!='\n')
+ if (origbuffer.at(origbuffer.length()-1)!='\n')
{
origbuffer+='\n';
origbuffer+='\n'; //shouldn't these be removed at some point?
diff --git a/tdeui/kspellui.ui b/tdeui/kspellui.ui
index 18b755117..ac1deecd7 100644
--- a/tdeui/kspellui.ui
+++ b/tdeui/kspellui.ui
@@ -87,7 +87,7 @@
<property name="text">
<string>... the &lt;b&gt;misspelled&lt;/b&gt; word shown in context ...</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
<property name="toolTip" stdset="0">
diff --git a/tdeui/ksqueezedtextlabel.cpp b/tdeui/ksqueezedtextlabel.cpp
index 63d85ab8f..f44b38916 100644
--- a/tdeui/ksqueezedtextlabel.cpp
+++ b/tdeui/ksqueezedtextlabel.cpp
@@ -73,11 +73,11 @@ void KSqueezedTextLabel::squeezeTextToLabel() {
}
}
-void KSqueezedTextLabel::setAlignment( int tqalignment )
+void KSqueezedTextLabel::setAlignment( int alignment )
{
// save fullText and restore it
TQString tmpFull(fullText);
- TQLabel::setAlignment(tqalignment);
+ TQLabel::setAlignment(alignment);
fullText = tmpFull;
}
diff --git a/tdeui/kstatusbar.h b/tdeui/kstatusbar.h
index c481a551a..a1b89d0a7 100644
--- a/tdeui/kstatusbar.h
+++ b/tdeui/kstatusbar.h
@@ -167,7 +167,7 @@ public:
void changeItem( const TQString& text, int id );
/**
- * Sets the tqalignment of item @p id. By default all fields are aligned
+ * Sets the alignment of item @p id. By default all fields are aligned
* @p AlignHCenter | @p AlignVCenter. See TQLabel::setAlignment for details.
*
*/
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index b35924375..100f86df8 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -96,7 +96,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
d->on_all_desktops = false;
}
setCaption( KGlobal::instance()->aboutData()->programName());
- setAlignment( tqalignment() | Qt::AlignVCenter | Qt::AlignHCenter );
+ setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter );
// Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications
setScaledContents(true);
diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp
index cfc6ce481..3b54aab99 100644
--- a/tdeui/ktabbar.cpp
+++ b/tdeui/ktabbar.cpp
@@ -67,7 +67,7 @@ void KTabBar::setTabEnabled( int id, bool enabled )
if ( !enabled && id == currentTab() && count()>1 ) {
TQPtrList<TQTab> *tablist = tabList();
if ( mTabCloseActivatePrevious )
- t = tablist->tqat( count()-2 );
+ t = tablist->at( count()-2 );
else {
int index = indexOf( id );
index += ( index+1 == count() ) ? -1 : 1;
@@ -80,7 +80,7 @@ void KTabBar::setTabEnabled( int id, bool enabled )
emit selected( t->identifier() );
}
}
- tqrepaint( r );
+ repaint( r );
}
}
}
@@ -253,7 +253,7 @@ void KTabBar::dragMoveEvent( TQDragMoveEvent *e )
TQTab *tab = selectTab( e->pos() );
if( tab ) {
bool accept = false;
- // The tqreceivers of the testCanDecode() signal has to adjust
+ // The receivers of the testCanDecode() signal has to adjust
// 'accept' accordingly.
emit testCanDecode( e, accept);
if ( accept && tab != TQTabBar::tab( currentTab() ) ) {
@@ -294,7 +294,7 @@ void KTabBar::setTabColor( int id, const TQColor& color )
TQTab *t = tab( id );
if ( t ) {
mTabColors.insert( id, color );
- tqrepaint( t->rect(), false );
+ repaint( t->rect(), false );
}
}
diff --git a/tdeui/ktabctl.cpp b/tdeui/ktabctl.cpp
index dc31a5a0f..0ff9f64e4 100644
--- a/tdeui/ktabctl.cpp
+++ b/tdeui/ktabctl.cpp
@@ -56,8 +56,8 @@ void KTabCtl::resizeEvent(TQResizeEvent *)
for (i=0; i<(int)pages.size(); i++) {
pages[i]->setGeometry(r);
}
- if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) ||
- ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) {
+ if( ( tabs->shape() == TQTabBar::RoundedBelow ) ||
+ ( tabs->shape() == TQTabBar::TriangularBelow ) ) {
tabs->move( 0, height()-tabs->height()-4 );
}
}
@@ -184,9 +184,9 @@ void KTabCtl::setBorder( bool state )
blBorder = state;
}
-void KTabCtl::setShape( TQTabBar::Shape tqshape )
+void KTabCtl::setShape( TQTabBar::Shape shape )
{
- tabs->setShape( tqshape );
+ tabs->setShape( shape );
}
TQSize
@@ -273,8 +273,8 @@ void KTabCtl::paintEvent(TQPaintEvent *)
TQRect KTabCtl::getChildRect() const
{
- if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) ||
- ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) {
+ if( ( tabs->shape() == TQTabBar::RoundedBelow ) ||
+ ( tabs->shape() == TQTabBar::TriangularBelow ) ) {
return TQRect(2, 1, width() - 4,
height() - tabs->height() - 4);
} else {
diff --git a/tdeui/ktabctl.h b/tdeui/ktabctl.h
index d18da9750..28de4805b 100644
--- a/tdeui/ktabctl.h
+++ b/tdeui/ktabctl.h
@@ -61,7 +61,7 @@ public:
bool isTabEnabled(const TQString& );
void setTabEnabled(const TQString&, bool);
void setBorder(bool);
- void setShape( TQTabBar::Shape tqshape );
+ void setShape( TQTabBar::Shape shape );
virtual TQSize sizeHint() const;
protected:
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index 7423a126f..7570c6716 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -95,7 +95,7 @@ void KTabWidget::insertTab( TQWidget *child, TQTab *tab, int index )
resizeTabs( d->m_tabNames.count()-1 );
}
else {
- d->m_tabNames.insert( d->m_tabNames.tqat( index ), tab->text() );
+ d->m_tabNames.insert( d->m_tabNames.at( index ), tab->text() );
resizeTabs( index );
}
}
@@ -301,7 +301,7 @@ void KTabWidget::dragMoveEvent( TQDragMoveEvent *e )
{
if ( isEmptyTabbarSpace( e->pos() ) ) {
bool accept = false;
- // The tqreceivers of the testCanDecode() signal has to adjust
+ // The receivers of the testCanDecode() signal has to adjust
// 'accept' accordingly.
emit testCanDecode( e, accept);
e->accept( accept );
@@ -422,7 +422,7 @@ void KTabWidget::moveTab( int from, int to )
if ( to < 0 || to >= count() )
d->m_tabNames.append( TQString::null );
else
- d->m_tabNames.insert( d->m_tabNames.tqat( to ), TQString::null );
+ d->m_tabNames.insert( d->m_tabNames.at( to ), TQString::null );
}
w = page( to );
@@ -441,7 +441,7 @@ void KTabWidget::removePage( TQWidget * w ) {
if ( d->m_automaticResizeTabs ) {
int index = indexOf( w );
if ( index != -1 )
- d->m_tabNames.remove( d->m_tabNames.tqat( index ) );
+ d->m_tabNames.remove( d->m_tabNames.at( index ) );
}
TQTabWidget::removePage( w );
if ( d->m_automaticResizeTabs )
diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp
index 2a9a56ef3..d1cb8ba00 100644
--- a/tdeui/ktoolbar.cpp
+++ b/tdeui/ktoolbar.cpp
@@ -734,7 +734,7 @@ int KToolBar::itemIndex (int id)
int KToolBar::idAt (int index)
{
- TQWidget *w = widgets.tqat(index);
+ TQWidget *w = widgets.at(index);
return widget2id[w];
}
@@ -1263,7 +1263,7 @@ void KToolBar::rebuildLayout()
if ( stretchableWidget )
l->setStretchFactor( stretchableWidget, 10 );
}
- l->tqinvalidate();
+ l->invalidate();
TQApplication::postEvent( this, new TQEvent( TQEvent::LayoutHint ) );
}
@@ -1740,7 +1740,7 @@ void KToolBar::slotRepaint()
resizeEvent(&ev);
TQApplication::sendPostedEvents( this, TQEvent::LayoutHint );
setUpdatesEnabled( true );
- tqrepaint( true );
+ repaint( true );
}
void KToolBar::toolBarPosChanged( TQToolBar *tb )
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h
index bbf0bfc65..947fd3bab 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/ktoolbar.h
@@ -91,7 +91,7 @@ private:
* Once you have a KToolBar object, you can insert items into it with the
* insert... methods, or remove them with the removeItem() method. This
* can be done at any time; the toolbar will be automatically updated.
- * There are also many methods to set per-child properties like tqalignment
+ * There are also many methods to set per-child properties like alignment
* and toggle behavior.
*
* KToolBar uses a global config group to load toolbar settings on
diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp
index 5e89c175a..76d87f06c 100644
--- a/tdeui/ktoolbarbutton.cpp
+++ b/tdeui/ktoolbarbutton.cpp
@@ -376,7 +376,7 @@ void KToolBarButton::leaveEvent(TQEvent *)
{
d->m_isRaised = false;
d->m_isActive = false;
- tqrepaint(false);
+ repaint(false);
}
emit highlighted(d->m_id, false);
@@ -398,7 +398,7 @@ void KToolBarButton::enterEvent(TQEvent *)
d->m_isActive = false;
}
- tqrepaint(false);
+ repaint(false);
}
emit highlighted(d->m_id, true);
}
@@ -634,7 +634,7 @@ void KToolBarButton::paletteChange(const TQPalette &)
if(!d->m_isSeparator)
{
modeChange();
- tqrepaint(false); // no need to delete it first therefore only false
+ repaint(false); // no need to delete it first therefore only false
}
}
@@ -698,7 +698,7 @@ void KToolBarButton::setNoStyle(bool no_style)
modeChange();
d->m_iconText = KToolBar::IconTextRight;
- tqrepaint(false);
+ repaint(false);
}
void KToolBarButton::setRadio (bool f)
@@ -716,13 +716,13 @@ void KToolBarButton::on(bool flag)
setDown(flag);
leaveEvent((TQEvent *) 0);
}
- tqrepaint();
+ repaint();
}
void KToolBarButton::toggle()
{
setOn(!isOn());
- tqrepaint();
+ repaint();
}
void KToolBarButton::setToggle(bool flag)
diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index 8a996fe5b..943cf393a 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -407,7 +407,7 @@ TQRect KURLLabel::activeRect() const
TQRect r( contentsRect() );
if (text().isEmpty() || (!d->MarginAltered && sizePolicy() == TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)))
return r; //fixed size is sometimes used with pixmap
- int hAlign = TQApplication::horizontalAlignment( tqalignment() );
+ int hAlign = TQApplication::horizontalAlignment( alignment() );
int indentX = (hAlign && indent()>0) ? indent() : 0;
TQFontMetrics fm(font());
r.setWidth( QMIN(fm.width(text()), r.width()));
diff --git a/tdeui/kwordwrap.cpp b/tdeui/kwordwrap.cpp
index b7eeaff7c..d104b421a 100644
--- a/tdeui/kwordwrap.cpp
+++ b/tdeui/kwordwrap.cpp
@@ -35,7 +35,7 @@ KWordWrap* KWordWrap::formatText( TQFontMetrics &fm, const TQRect & r, int /*fla
{
KWordWrap* kw = new KWordWrap( r );
// The wordwrap algorithm
- // The variable names and the global tqshape of the algorithm are inspired
+ // The variable names and the global shape of the algorithm are inspired
// from QTextFormatterBreakWords::format().
//kdDebug() << "KWordWrap::formatText " << str << " r=" << r.x() << "," << r.y() << " " << r.width() << "x" << r.height() << endl;
int height = fm.height();
@@ -201,7 +201,7 @@ void KWordWrap::drawFadeoutText(TQPainter *p, int x, int y, int maxW,
int n = TQMIN( tl, 3);
for (int i = 0; i < n; i++) {
p->setPen( mixColors( 0.70 - i * 0.25, textColor, bgColor ) );
- TQString s( t.tqat( tl - n + i ) );
+ TQString s( t.at( tl - n + i ) );
p->drawText( x, y, s );
x += fm.width( s );
}
diff --git a/tdeui/kwordwrap.h b/tdeui/kwordwrap.h
index 50d90e1e7..3fb48acd9 100644
--- a/tdeui/kwordwrap.h
+++ b/tdeui/kwordwrap.h
@@ -91,12 +91,12 @@ public:
/**
* Draw the text that has been previously wrapped, at position x,y.
- * Flags are for tqalignment, e.g. Qt::AlignHCenter. Default is
+ * Flags are for alignment, e.g. Qt::AlignHCenter. Default is
* Qt::AlignAuto.
* @param painter the TQPainter to use.
* @param x the horizontal position of the text
* @param y the vertical position of the text
- * @param flags the ORed text tqalignment flags from the Qt namespace,
+ * @param flags the ORed text alignment flags from the Qt namespace,
* ORed with FadeOut if you want the text to fade out if it
* does not fit (the @p painter's background must be set
* accordingly)
diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp
index e75b320a7..28f7d4cf2 100644
--- a/tdeui/tests/kdesattest.cpp
+++ b/tdeui/tests/kdesattest.cpp
@@ -23,7 +23,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name)
void KDesatWidget::change(double) {
desat_value = slide->value();
- tqrepaint(false);
+ repaint(false);
}
void KDesatWidget::paintEvent(TQPaintEvent */*ev*/)
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index b4d1bd30b..15b83d14e 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -242,7 +242,7 @@ void PixmapView::setPixmap( const TQPixmap &pix )
{
pixmap = pix;
resizeContents( pixmap.size().width(), pixmap.size().height() );
- viewport()->tqrepaint( true );
+ viewport()->repaint( true );
}
void PixmapView::drawContents( TQPainter *p, int, int, int, int )
diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp
index f8d031530..d68f1e366 100644
--- a/tdeui/tests/kledtest.cpp
+++ b/tdeui/tests/kledtest.cpp
@@ -50,14 +50,14 @@ KLedTest::KLedTest(TQWidget* parent)
}
else {
y=Grid; index=0;
- for( int tqshape=0; (int)tqshape<2; tqshape=(KLed::Shape)(tqshape+1)) {
+ for( int shape=0; (int)shape<2; shape=(KLed::Shape)(shape+1)) {
x=Grid;
for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) {
for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1))
{
leds[index]=new KLed(Qt::yellow, state,
(KLed::Look)(look+1),
- (KLed::Shape)(tqshape+1), this);
+ (KLed::Shape)(shape+1), this);
leds[index]->setGeometry(x, y, LedWidth, LedHeight);
++index;
x+=Grid+LedWidth;
@@ -108,7 +108,7 @@ KLedTest::nextLook() {
ledlook = static_cast<KLed::Look>(tmp);
l->setLook(ledlook);
//qDebug("painting look %i", ledlook);
- //l->tqrepaint();
+ //l->repaint();
}
diff --git a/tdeui/tests/kledtest.h b/tdeui/tests/kledtest.h
index 5d660f5a3..5652e306e 100644
--- a/tdeui/tests/kledtest.h
+++ b/tdeui/tests/kledtest.h
@@ -15,7 +15,7 @@ protected:
const int LedWidth;
const int LedHeight;
const int Grid;
- KLed::Shape tqshape;
+ KLed::Shape shape;
KLed::Look look;
KLed::State state;
int x, y, index;
diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp
index 5f9fb3dcc..32ed5c89f 100644
--- a/tdeui/tests/ktabwidgettest.cpp
+++ b/tdeui/tests/ktabwidgettest.cpp
@@ -73,9 +73,9 @@ Test::Test( TQWidget* parent, const char *name )
gridlayout->addWidget( mTabsBottom, 3, 0 );
connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) );
- TQCheckBox * tabtqshape = new TQCheckBox( "Triangular tab tqshape", grid );
- gridlayout->addWidget( tabtqshape, 3, 1 );
- connect( tabtqshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
+ TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid );
+ gridlayout->addWidget( tabshape, 3, 1 );
+ connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid );
gridlayout->addWidget( tabClose, 4, 0 );
diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp
index 9f616496d..7f5b2cc78 100644
--- a/tdeui/tests/kunbalancedgrdtest.cpp
+++ b/tdeui/tests/kunbalancedgrdtest.cpp
@@ -159,7 +159,7 @@ void myTopWidget::rebalance()
if ((otime - itime )> 500)
{
- grds->tqrepaint(false);
+ grds->repaint(false);
itime = time.elapsed();
}
}