From f64397c82fa94371ab4a64af28c4d0029f4cd93f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:53:50 -0600 Subject: Remove additional unneeded tq method conversions --- kdm/kfrontend/kdm_greet.c | 4 ++-- kdm/kfrontend/kdm_greet.h | 2 +- kdm/kfrontend/kdmclock.cpp | 6 +++--- kdm/kfrontend/kgreeter.cpp | 12 ++++++------ kdm/kfrontend/krootimage.cpp | 2 +- kdm/kfrontend/sakdlg.cc | 4 ++-- kdm/kfrontend/themer/kdmitem.cpp | 8 ++++---- kdm/kfrontend/themer/kdmitem.h | 6 +++--- kdm/kfrontend/themer/kdmlabel.cpp | 6 +++--- kdm/kfrontend/themer/kdmpixmap.cpp | 4 ++-- 10 files changed, 27 insertions(+), 27 deletions(-) (limited to 'kdm') diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c index 2082b2393..b7841e6a3 100644 --- a/kdm/kfrontend/kdm_greet.c +++ b/kdm/kfrontend/kdm_greet.c @@ -700,11 +700,11 @@ restore_modifiers( void ) } void -setCursor( Display *mdpy, int window, int tqshape ) +setCursor( Display *mdpy, int window, int shape ) { Cursor xcursor; - if ((xcursor = XCreateFontCursor( mdpy, tqshape ))) { + if ((xcursor = XCreateFontCursor( mdpy, shape ))) { XDefineCursor( mdpy, window, xcursor ); XFreeCursor( mdpy, xcursor ); XFlush( mdpy ); diff --git a/kdm/kfrontend/kdm_greet.h b/kdm/kfrontend/kdm_greet.h index d68ee8604..df325c28d 100644 --- a/kdm/kfrontend/kdm_greet.h +++ b/kdm/kfrontend/kdm_greet.h @@ -77,7 +77,7 @@ int PingServer( struct _XDisplay *dpy ); void setup_modifiers( struct _XDisplay *mdpy, int numlock ); void restore_modifiers( void ); -void setCursor( struct _XDisplay *mdpy, int window, int tqshape ); +void setCursor( struct _XDisplay *mdpy, int window, int shape ); extern int rfd; /* for select() loops */ diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp index 3160f0459..88cd53970 100644 --- a/kdm/kfrontend/kdmclock.cpp +++ b/kdm/kfrontend/kdmclock.cpp @@ -76,19 +76,19 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) //setBackgroundOrigin( WindowOrigin ); mBackgroundBrush = backgroundBrush(); setBackgroundMode( NoBackground ); - tqrepaint(); + repaint(); } void KdmClock::showEvent( TQShowEvent * ) { - tqrepaint(); + repaint(); } void KdmClock::timeout() { - tqrepaint(); + repaint(); } void KdmClock::paintEvent( TQPaintEvent * ) diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp index d1d2ea32d..05945348a 100644 --- a/kdm/kfrontend/kgreeter.cpp +++ b/kdm/kfrontend/kgreeter.cpp @@ -243,8 +243,8 @@ void KGreeter::handleInputPipe(void) { currentDisplay = TQString(getenv("DISPLAY")); currentDisplay = currentDisplay.replace(":", ""); displayNumber = currentDisplay.toInt(); - mPipeFilename = TQString(FIFO_FILE).tqarg(displayNumber); - ::unlink((TQString(FIFO_SAK_FILE).tqarg(displayNumber)).ascii()); + mPipeFilename = TQString(FIFO_FILE).arg(displayNumber); + ::unlink((TQString(FIFO_SAK_FILE).arg(displayNumber)).ascii()); /* Create the FIFOs if they do not exist */ umask(0); @@ -338,12 +338,12 @@ class UserListViewItem : public KListViewItem { parent->cachedSizeHint.setWidth( -1 ); } - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { if (((UserListView*)listView())->themed) - TQListViewItem::paintCell(p, cg, column, width, tqalignment); + TQListViewItem::paintCell(p, cg, column, width, alignment); else - KListViewItem::paintCell(p, cg, column, width, tqalignment); + KListViewItem::paintCell(p, cg, column, width, alignment); } TQString login; @@ -422,7 +422,7 @@ KGreeter::insertUser( const TQImage &default_pix, if ( randomFace.isNull() ) { TQStringList::size_type index = 0; for ( size_t i = 0; i < username.length(); ++i ) - index += ( 0x7f - username.tqat( i ).latin1() ) % 37; + index += ( 0x7f - username.at( i ).latin1() ) % 37; randomFace = randomFaces[ index % randomFaces.count() ]; } p.load( _faceDir + "/../pics/users/" + randomFace + ".png" ); diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp index 390601c8d..7d231948f 100644 --- a/kdm/kfrontend/krootimage.cpp +++ b/kdm/kfrontend/krootimage.cpp @@ -73,7 +73,7 @@ MyApplication::renderDone() // ...set it to the desktop widget... TQT_TQWIDGET(desktop())->setBackgroundPixmap( pm ); - TQT_TQWIDGET(desktop())->tqrepaint( true ); + TQT_TQWIDGET(desktop())->repaint( true ); // ...and export it via Esetroot-style so that composition managers can use it! Pixmap bgPm = pm.handle(); // fetch the actual X handle to it diff --git a/kdm/kfrontend/sakdlg.cc b/kdm/kfrontend/sakdlg.cc index 145efe1d6..edf346229 100644 --- a/kdm/kfrontend/sakdlg.cc +++ b/kdm/kfrontend/sakdlg.cc @@ -157,8 +157,8 @@ void SAKDlg::handleInputPipe(void) { currentDisplay = TQString(getenv("DISPLAY")); currentDisplay = currentDisplay.replace(":", ""); displayNumber = currentDisplay.toInt(); - mPipeFilename = TQString(FIFO_SAK_FILE).tqarg(displayNumber); - ::unlink((TQString(FIFO_FILE).tqarg(displayNumber)).ascii()); + mPipeFilename = TQString(FIFO_SAK_FILE).arg(displayNumber); + ::unlink((TQString(FIFO_FILE).arg(displayNumber)).ascii()); /* Create the FIFOs if they do not exist */ umask(0); diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp index 9b066f750..1c859d101 100644 --- a/kdm/kfrontend/themer/kdmitem.cpp +++ b/kdm/kfrontend/themer/kdmitem.cpp @@ -280,7 +280,7 @@ KdmItem::setGeometry( const TQRect &newGeometry, bool force ) if (fixedManager && !fixedManager->isEmpty()) fixedManager->update( newGeometry, force ); - // TODO send *selective* tqrepaint signal + // TODO send *selective* repaint signal } void @@ -299,7 +299,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect ) if ((_compositor.isEmpty()) || (!argb_visual_available)) { // Software blend only (no compositing support) TQPixmap copy( myWidget->size() ); - kdDebug() << myWidget->tqgeometry() << " " << area << " " << myWidget->size() << endl; + kdDebug() << myWidget->geometry() << " " << area << " " << myWidget->size() << endl; bitBlt( ©, TQPoint( 0, 0), p->device(), myWidget->geometry(), TQt::CopyROP ); // Lighten it slightly TQImage lightVersion; @@ -592,7 +592,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType ) } else { // int value dType = DTpixel; TQString sCopy = s; - if (sCopy.tqat( 0 ) == '-') { + if (sCopy.at( 0 ) == '-') { sCopy.remove( 0, 1 ); dType = DTnpixel; } @@ -616,7 +616,7 @@ KdmItem::parseFont( const TQString &s, TQFont &font ) void KdmItem::parseColor( const TQString &s, TQColor &color ) { - if (s.tqat( 0 ) != '#') + if (s.at( 0 ) != '#') return; bool ok; TQString sCopy = s; diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h index c76222914..230ed71c4 100644 --- a/kdm/kfrontend/themer/kdmitem.h +++ b/kdm/kfrontend/themer/kdmitem.h @@ -96,7 +96,7 @@ public: /** * Fixup the geometry of an item and its children (even if fixed - * or boxed ones). Note that this will generate tqrepaint signals + * or boxed ones). Note that this will generate repaint signals * when needed. The default implementation should fit all needs. */ virtual void setGeometry( const TQRect &newGeometry, bool force ); @@ -109,7 +109,7 @@ public: void paint( TQPainter *painter, const TQRect &boundaries ); /** - * Update representation of contents and tqrepaint. + * Update representation of contents and repaint. */ virtual void update(); @@ -195,7 +195,7 @@ protected: /** * Called when item changes its 'state' variable. This must - * handle item's tqrepaint. + * handle item's repaint. */ virtual void statusChanged(); diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp index b110adf78..4959bec7b 100644 --- a/kdm/kfrontend/themer/kdmlabel.cpp +++ b/kdm/kfrontend/themer/kdmlabel.cpp @@ -116,7 +116,7 @@ KdmLabel::setTextInt( const TQString &txt) if (cAccel != -1) { cText.remove('&'); myAccel = new TQAccel(parentWidget()); - myAccel->insertItem(ALT + UNICODE_ACCEL + cText.tqat(cAccel).lower().tqunicode()); + myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().tqunicode()); connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel())); } } @@ -177,8 +177,8 @@ KdmLabel::drawContents( TQPainter *p, const TQRect &/*r*/ ) TQFont f(l->font); f.setUnderline(true); p->setFont ( f ); - p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.tqat(cAccel))); - tarea.rLeft() += fm.width(cText.tqat(cAccel)); + p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.at(cAccel))); + tarea.rLeft() += fm.width(cText.at(cAccel)); p->setFont( l->font ); p->drawText( tarea, AlignLeft | SingleLine, right); } else { diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp index c11ae8426..8020bd1e1 100644 --- a/kdm/kfrontend/themer/kdmpixmap.cpp +++ b/kdm/kfrontend/themer/kdmpixmap.cpp @@ -138,7 +138,7 @@ KdmPixmap::fullPath( const TQString &fileName) return TQString::null; TQString fullName = fileName; - if (fullName.tqat( 0 ) != '/') + if (fullName.at( 0 ) != '/') fullName = baseDir() + "/" + fileName; return fullName; } @@ -177,7 +177,7 @@ KdmPixmap::loadPixmap( PixmapStruct::PixmapClass *pClass ) TQString ext = fullpath.right(fullpath.length() - index); fullpath = fullpath.left(index); kdDebug() << timestamp() << " ext " << ext << " " << fullpath << endl; - TQString testpath = TQString("-%1x%2").tqarg(area.width()).arg(area.height()) + ext; + TQString testpath = TQString("-%1x%2").arg(area.width()).arg(area.height()) + ext; kdDebug() << timestamp() << " testing for " << fullpath + testpath << endl; if (KStandardDirs::exists(fullpath + testpath)) pClass->pixmap.load(fullpath + testpath); -- cgit v1.2.1