summaryrefslogtreecommitdiffstats
path: root/src/part/radialMap
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 09:55:44 -0600
committerTimothy Pearson <[email protected]>2011-12-16 09:55:44 -0600
commit9b21afd056f51a1dba015292a5472a146de967bd (patch)
tree0c642c457dea43eb9af17b865bad4dbc43f9fc57 /src/part/radialMap
parent5f20b2e679037af4b18ac901bdf78a08e5c0da39 (diff)
downloadfilelight-9b21afd056f51a1dba015292a5472a146de967bd.tar.gz
filelight-9b21afd056f51a1dba015292a5472a146de967bd.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 5f20b2e679037af4b18ac901bdf78a08e5c0da39.
Diffstat (limited to 'src/part/radialMap')
-rw-r--r--src/part/radialMap/builder.cpp12
-rw-r--r--src/part/radialMap/map.cpp4
-rw-r--r--src/part/radialMap/segmentTip.cpp10
-rw-r--r--src/part/radialMap/widget.cpp14
-rw-r--r--src/part/radialMap/widget.h4
-rw-r--r--src/part/radialMap/widgetEvents.cpp16
6 files changed, 30 insertions, 30 deletions
diff --git a/src/part/radialMap/builder.cpp b/src/part/radialMap/builder.cpp
index e993453..bae6626 100644
--- a/src/part/radialMap/builder.cpp
+++ b/src/part/radialMap/builder.cpp
@@ -40,7 +40,7 @@ RadialMap::Builder::Builder( RadialMap::Map *m, const Directory* const d, bool f
void
RadialMap::Builder::findVisibleDepth( const Directory* const dir, const unsigned int depth )
{
- //**** because I don't use the same minimumSize criteria as in the visual function
+ //**** because I don't use the same tqminimumSize criteria as in the visual function
// this can lead to incorrect visual representation
//**** BUT, you can't set those limits until you know m_depth!
@@ -84,7 +84,7 @@ RadialMap::Builder::build( const Directory* const dir, const unsigned int depth,
{
//first iteration: dir == m_root
- if( dir->children() == 0 ) //we do fileCount rather than size to avoid chance of divide by zero later
+ if( dir->tqchildren() == 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)->children(); //need to add one to count the dir as well
+ hiddenFileCount += static_cast<const Directory*>(*it)->tqchildren(); //need to add one to count the dir as well
++hiddenFileCount;
}
}
- if( hiddenFileCount == dir->children() && !Config::showSmallFiles )
+ if( hiddenFileCount == dir->tqchildren() && !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" )
- .arg( hiddenFileCount )
- .arg( File::humanReadableSize( hiddenSize/hiddenFileCount ) );
+ .tqarg( hiddenFileCount )
+ .tqarg( 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 725b3f8..e106ed7 100644
--- a/src/part/radialMap/map.cpp
+++ b/src/part/radialMap/map.cpp
@@ -39,7 +39,7 @@ RadialMap::Map::~Map()
}
void
-RadialMap::Map::invalidate( const bool desaturateTheImage )
+RadialMap::Map::tqinvalidate( const bool desaturateTheImage )
{
DEBUG_ANNOUNCE
@@ -193,7 +193,7 @@ RadialMap::Map::colorise()
case 2000: //HACK for summary view
if( (*it)->file()->name() == "Used" ) {
- cb = TQApplication::palette().active().color( TQColorGroup::Highlight );
+ cb = TQApplication::tqpalette().active().color( TQColorGroup::Highlight );
cb.getHsv( &h, &s1, &v1 );
if( s1 > 80 )
diff --git a/src/part/radialMap/segmentTip.cpp b/src/part/radialMap/segmentTip.cpp
index 3fb5d34..9a87d68 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%)" ).arg( loc->formatNumber( pc, 0 ) );
+ if( pc > 0 ) s2 += TQString( " (%1%)" ).tqarg( 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)->children();
- const uint pc = uint((100 * files) / (double)root->children());
- TQString s3 = i18n( "Files: %1" ).arg( loc->formatNumber( files, 0 ) );
+ 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 ) );
- if( pc > 0 ) s3 += TQString( " (%1%)" ).arg( loc->formatNumber( pc, 0 ) );
+ if( pc > 0 ) s3 += TQString( " (%1%)" ).tqarg( 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 e1b606f..fd8ff14 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::invalidate( const bool b )
+RadialMap::Widget::tqinvalidate( const bool b )
{
if( isValid() )
{
- //**** have to check that only way to invalidate is this function frankly
+ //**** have to check that only way to tqinvalidate is this function frankly
//**** otherwise you may get bugs..
//disable mouse tracking
@@ -65,7 +65,7 @@ RadialMap::Widget::invalidate( const bool b )
//FIXME move this disablement thing no?
// it is confusing in other areas, like the whole createFromCache() thing
- m_map.invalidate( b ); //b signifies whether the pixmap is made to look disabled or not
+ m_map.tqinvalidate( b ); //b signifies whether the pixmap is made to look disabled or not
if( b )
update();
@@ -77,10 +77,10 @@ RadialMap::Widget::invalidate( const bool b )
void
RadialMap::Widget::create( const Directory *tree )
{
- //it is not the responsibility of create() to invalidate first
+ //it is not the responsibility of create() to tqinvalidate first
//skip invalidation at your own risk
- //FIXME make it the responsibility of create to invalidate first
+ //FIXME make it the responsibility of create to tqinvalidate 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 invalidate
- invalidate( false );
+ //no scan was necessary, use cached tree, however we MUST still emit tqinvalidate
+ tqinvalidate( false );
create( tree );
}
diff --git a/src/part/radialMap/widget.h b/src/part/radialMap/widget.h
index 72ebd3d..9343830 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 invalidate( const bool );
+ void tqinvalidate( const bool );
friend class Builder;
friend class Widget;
@@ -70,7 +70,7 @@ namespace RadialMap
void zoomIn();
void zoomOut();
void create( const Directory* );
- void invalidate( const bool = true );
+ void tqinvalidate( const bool = true );
void refresh( int );
private slots:
diff --git a/src/part/radialMap/widgetEvents.cpp b/src/part/radialMap/widgetEvents.cpp
index 2f0e4c9..4152098 100644
--- a/src/part/radialMap/widgetEvents.cpp
+++ b/src/part/radialMap/widgetEvents.cpp
@@ -16,7 +16,7 @@
#include <krun.h> //::mousePressEvent()
#include <kurldrag.h>
#include <tqapplication.h>//TQApplication::setOverrideCursor()
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqpainter.h>
#include <tqtimer.h> //::resizeEvent()
@@ -127,8 +127,8 @@ RadialMap::Widget::mouseMoveEvent( TQMouseEvent *e )
m_tip->updateTip( m_focus->file(), m_tree );
emit mouseHover( m_focus->file()->fullPath() );
- //repaint required to update labels now before transparency is generated
- repaint( false );
+ //tqrepaint required to update labels now before transparency is generated
+ tqrepaint( 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\"" ).arg( url.url() ) );
+ KRun::runCommand( TQString( "kfmclient openURL \"%1\"" ).tqarg( url.url() ) );
break;
case Konsole:
// --workdir only works for local file paths
- KRun::runCommand( TQString( "konsole --workdir \"%1\"" ).arg( url.path() ) );
+ KRun::runCommand( TQString( "konsole --workdir \"%1\"" ).tqarg( url.path() ) );
break;
case Center:
@@ -197,7 +197,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e )
goto section_two;
case Copy:
- TQApplication::clipboard()->setData( new KURLDrag( KURL::List( url ) ) );
+ TQApplication::tqclipboard()->setData( new KURLDrag( KURL::List( url ) ) );
break;
case Delete:
@@ -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.arg( url.prettyURL() ),
+ this, message.tqarg( 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() )
- invalidate();
+ tqinvalidate();
else
job->showErrorDialog( this );
}