diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:35:29 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:35:29 -0600 |
commit | d96d16a5d7133f94b2006b78d1e100c0dba81d3b (patch) | |
tree | 4315758705ec1dec8f19c684b0fc349a5f0f08dc /src/part/radialMap | |
parent | c74c9068a8df1cf50ccda88a20dbfad1f9f30545 (diff) | |
download | filelight-d96d16a5d7133f94b2006b78d1e100c0dba81d3b.tar.gz filelight-d96d16a5d7133f94b2006b78d1e100c0dba81d3b.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'src/part/radialMap')
-rw-r--r-- | src/part/radialMap/builder.cpp | 10 | ||||
-rw-r--r-- | src/part/radialMap/map.cpp | 2 | ||||
-rw-r--r-- | src/part/radialMap/segmentTip.cpp | 10 | ||||
-rw-r--r-- | src/part/radialMap/widget.cpp | 14 | ||||
-rw-r--r-- | src/part/radialMap/widget.h | 4 | ||||
-rw-r--r-- | src/part/radialMap/widgetEvents.cpp | 12 |
6 files changed, 26 insertions, 26 deletions
diff --git a/src/part/radialMap/builder.cpp b/src/part/radialMap/builder.cpp index 74b9288..e993453 100644 --- a/src/part/radialMap/builder.cpp +++ b/src/part/radialMap/builder.cpp @@ -84,7 +84,7 @@ RadialMap::Builder::build( const Directory* const dir, const unsigned int depth, { //first iteration: dir == m_root - if( dir->tqchildren() == 0 ) //we do fileCount rather than size to avoid chance of divide by zero later + if( dir->children() == 0 ) //we do fileCount rather than size to avoid chance of divide by zero later return false; uint hiddenSize = 0, hiddenFileCount = 0; @@ -116,13 +116,13 @@ RadialMap::Builder::build( const Directory* const dir, const unsigned int depth, hiddenSize += (*it)->size(); if( (*it)->isDirectory() ) //**** considered virtual, but dir wouldn't count itself! - hiddenFileCount += static_cast<const Directory*>(*it)->tqchildren(); //need to add one to count the dir as well + hiddenFileCount += static_cast<const Directory*>(*it)->children(); //need to add one to count the dir as well ++hiddenFileCount; } } - if( hiddenFileCount == dir->tqchildren() && !Config::showSmallFiles ) + if( hiddenFileCount == dir->children() && !Config::showSmallFiles ) return true; else if( (Config::showSmallFiles && hiddenSize > m_limits[depth]) || (depth == 0 && (hiddenSize > dir->size()/8)) /*|| > size() * 0.75*/ ) @@ -131,8 +131,8 @@ RadialMap::Builder::build( const Directory* const dir, const unsigned int depth, // I dunno how to i18n this const TQString s = i18n( "There can't ever be only 1 file", "%1 files, each about %2" ) - .tqarg( hiddenFileCount ) - .tqarg( File::humanReadableSize( hiddenSize/hiddenFileCount ) ); + .arg( hiddenFileCount ) + .arg( File::humanReadableSize( hiddenSize/hiddenFileCount ) ); (m_signature + depth)->append( new Segment( new File( s.local8Bit(), hiddenSize ), a_start, a_end - a_start, true ) ); } diff --git a/src/part/radialMap/map.cpp b/src/part/radialMap/map.cpp index e106ed7..67c6a5b 100644 --- a/src/part/radialMap/map.cpp +++ b/src/part/radialMap/map.cpp @@ -39,7 +39,7 @@ RadialMap::Map::~Map() } void -RadialMap::Map::tqinvalidate( const bool desaturateTheImage ) +RadialMap::Map::invalidate( const bool desaturateTheImage ) { DEBUG_ANNOUNCE diff --git a/src/part/radialMap/segmentTip.cpp b/src/part/radialMap/segmentTip.cpp index 9a87d68..3fb5d34 100644 --- a/src/part/radialMap/segmentTip.cpp +++ b/src/part/radialMap/segmentTip.cpp @@ -113,7 +113,7 @@ SegmentTip::updateTip( const File* const file, const Directory* const root ) uint maxw = 0; uint h = fontMetrics().height()*2 + 2*MARGIN; - if( pc > 0 ) s2 += TQString( " (%1%)" ).tqarg( loc->formatNumber( pc, 0 ) ); + if( pc > 0 ) s2 += TQString( " (%1%)" ).arg( loc->formatNumber( pc, 0 ) ); m_text = s1; m_text += '\n'; @@ -121,11 +121,11 @@ SegmentTip::updateTip( const File* const file, const Directory* const root ) if( file->isDirectory() ) { - double files = static_cast<const Directory*>(file)->tqchildren(); - const uint pc = uint((100 * files) / (double)root->tqchildren()); - TQString s3 = i18n( "Files: %1" ).tqarg( loc->formatNumber( files, 0 ) ); + double files = static_cast<const Directory*>(file)->children(); + const uint pc = uint((100 * files) / (double)root->children()); + TQString s3 = i18n( "Files: %1" ).arg( loc->formatNumber( files, 0 ) ); - if( pc > 0 ) s3 += TQString( " (%1%)" ).tqarg( loc->formatNumber( pc, 0 ) ); + if( pc > 0 ) s3 += TQString( " (%1%)" ).arg( loc->formatNumber( pc, 0 ) ); maxw = fontMetrics().width( s3 ); h += fontMetrics().height(); diff --git a/src/part/radialMap/widget.cpp b/src/part/radialMap/widget.cpp index fd8ff14..e1b606f 100644 --- a/src/part/radialMap/widget.cpp +++ b/src/part/radialMap/widget.cpp @@ -46,11 +46,11 @@ RadialMap::Widget::url( File const * const file ) const } void -RadialMap::Widget::tqinvalidate( const bool b ) +RadialMap::Widget::invalidate( const bool b ) { if( isValid() ) { - //**** have to check that only way to tqinvalidate is this function frankly + //**** have to check that only way to invalidate is this function frankly //**** otherwise you may get bugs.. //disable mouse tracking @@ -65,7 +65,7 @@ RadialMap::Widget::tqinvalidate( const bool b ) //FIXME move this disablement thing no? // it is confusing in other areas, like the whole createFromCache() thing - m_map.tqinvalidate( b ); //b signifies whether the pixmap is made to look disabled or not + m_map.invalidate( b ); //b signifies whether the pixmap is made to look disabled or not if( b ) update(); @@ -77,10 +77,10 @@ RadialMap::Widget::tqinvalidate( const bool b ) void RadialMap::Widget::create( const Directory *tree ) { - //it is not the responsibility of create() to tqinvalidate first + //it is not the responsibility of create() to invalidate first //skip invalidation at your own risk - //FIXME make it the responsibility of create to tqinvalidate first + //FIXME make it the responsibility of create to invalidate first if( tree ) { @@ -102,8 +102,8 @@ RadialMap::Widget::create( const Directory *tree ) void RadialMap::Widget::createFromCache( const Directory *tree ) { - //no scan was necessary, use cached tree, however we MUST still emit tqinvalidate - tqinvalidate( false ); + //no scan was necessary, use cached tree, however we MUST still emit invalidate + invalidate( false ); create( tree ); } diff --git a/src/part/radialMap/widget.h b/src/part/radialMap/widget.h index 9343830..72ebd3d 100644 --- a/src/part/radialMap/widget.h +++ b/src/part/radialMap/widget.h @@ -28,7 +28,7 @@ namespace RadialMap bool resize( const TQRect& ); bool isNull() const { return ( m_signature == 0 ); } - void tqinvalidate( const bool ); + void invalidate( const bool ); friend class Builder; friend class Widget; @@ -70,7 +70,7 @@ namespace RadialMap void zoomIn(); void zoomOut(); void create( const Directory* ); - void tqinvalidate( const bool = true ); + void invalidate( const bool = true ); void refresh( int ); private slots: diff --git a/src/part/radialMap/widgetEvents.cpp b/src/part/radialMap/widgetEvents.cpp index 4152098..1c45b4c 100644 --- a/src/part/radialMap/widgetEvents.cpp +++ b/src/part/radialMap/widgetEvents.cpp @@ -127,8 +127,8 @@ RadialMap::Widget::mouseMoveEvent( TQMouseEvent *e ) m_tip->updateTip( m_focus->file(), m_tree ); emit mouseHover( m_focus->file()->fullPath() ); - //tqrepaint required to update labels now before transparency is generated - tqrepaint( false ); + //repaint required to update labels now before transparency is generated + repaint( false ); } m_tip->moveTo( e->globalPos(), *this, ( p.y() < 0 ) ); //updates tooltip psuedo-tranparent background @@ -184,12 +184,12 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) switch (popup.exec( e->globalPos(), 1 )) { case Konqueror: //KRun::runCommand will show an error message if there was trouble - KRun::runCommand( TQString( "kfmclient openURL \"%1\"" ).tqarg( url.url() ) ); + KRun::runCommand( TQString( "kfmclient openURL \"%1\"" ).arg( url.url() ) ); break; case Konsole: // --workdir only works for local file paths - KRun::runCommand( TQString( "konsole --workdir \"%1\"" ).tqarg( url.path() ) ); + KRun::runCommand( TQString( "konsole --workdir \"%1\"" ).arg( url.path() ) ); break; case Center: @@ -207,7 +207,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) ? i18n( "<qt>The directory at <i>'%1'</i> will be <b>recursively</b> and <b>permanently</b> deleted." ) : i18n( "<qt><i>'%1'</i> will be <b>permanently</b> deleted." ); const int userIntention = KMessageBox::warningContinueCancel( - this, message.tqarg( url.prettyURL() ), + this, message.arg( url.prettyURL() ), TQString(), KGuiItem( i18n("&Delete"), "editdelete" ) ); if (userIntention == KMessageBox::Continue) { @@ -250,7 +250,7 @@ RadialMap::Widget::deleteJobFinished( KIO::Job *job ) { TQApplication::restoreOverrideCursor(); if( !job->error() ) - tqinvalidate(); + invalidate(); else job->showErrorDialog( this ); } |