Browse Source

Rename a number of old tq methods that are no longer tq specific

pull/1/head
Timothy Pearson 11 years ago
parent
commit
5f20b2e679
  1. 4
      src/app/mainWindow.cpp
  2. 28
      src/part/dialog.ui
  3. 10
      src/part/fileTree.h
  4. 2
      src/part/localLister.cpp
  5. 18
      src/part/part.cpp
  6. 6
      src/part/progressBox.cpp
  7. 12
      src/part/radialMap/builder.cpp
  8. 4
      src/part/radialMap/map.cpp
  9. 10
      src/part/radialMap/segmentTip.cpp
  10. 14
      src/part/radialMap/widget.cpp
  11. 4
      src/part/radialMap/widget.h
  12. 16
      src/part/radialMap/widgetEvents.cpp
  13. 10
      src/part/summaryWidget.cpp

4
src/app/mainWindow.cpp

@ -79,7 +79,7 @@ MainWindow::setupActions() //singleton function
m_combo = new KHistoryCombo( this, "history_combo" );
m_combo->setCompletionObject( new KURLCompletion( KURLCompletion::DirCompletion ) );
m_combo->setAutoDeleteCompletionObject( true );
m_combo->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
m_combo->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
m_combo->setDuplicatesEnabled( false );
KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotScanDirectory()), ac, "scan_directory" );
@ -260,7 +260,7 @@ void setActionMenuTextOnly( KAction *a, TQString const &suffix )
{
TQString const menu_text = suffix.isEmpty()
? a->text()
: i18n( "&Up: /home/mxcl", "%1: %2" ).tqarg( a->text(), suffix );
: i18n( "&Up: /home/mxcl", "%1: %2" ).arg( a->text(), suffix );
for (int i = 0; i < a->containerCount(); ++i) {
TQWidget *w = a->container( i );

28
src/part/dialog.ui

@ -72,7 +72,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -88,7 +88,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>180</width>
<height>21</height>
@ -129,7 +129,7 @@
<property name="name">
<cstring>line1</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>15</height>
@ -153,7 +153,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<grid>
<property name="name">
@ -169,7 +169,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>50</height>
@ -183,13 +183,13 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@ -277,7 +277,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -331,7 +331,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@ -356,7 +356,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -372,7 +372,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -414,7 +414,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
@ -450,7 +450,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -480,7 +480,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>120</width>
<height>30</height>

10
src/part/fileTree.h

@ -197,9 +197,9 @@ private:
class Directory : public Chain<File>, public File
{
public:
Directory( const char *name ) : File( name, 0 ), m_tqchildren( 0 ) {} //DON'T pass the full path!
Directory( const char *name ) : File( name, 0 ), m_children( 0 ) {} //DON'T pass the full path!
uint tqchildren() const { return m_tqchildren; }
uint children() const { return m_children; }
virtual bool isDirectory() const { return true; }
///appends a Directory
@ -209,7 +209,7 @@ public:
delete [] d->m_name;
d->m_name = qstrdup( name ); } //directories that had a fullpath copy just their names this way
m_tqchildren += d->tqchildren(); //doesn't include the dir itself
m_children += d->children(); //doesn't include the dir itself
d->m_parent = this;
append( (File*)d ); //will add 1 to filecount for the dir itself
}
@ -223,12 +223,12 @@ public:
private:
void append( File *p )
{
m_tqchildren++;
m_children++;
m_size += p->size();
Chain<File>::append( p );
}
uint m_tqchildren;
uint m_children;
private:
Directory( const Directory& ); //undefined

2
src/part/localLister.cpp

@ -216,7 +216,7 @@ namespace Filelight
{
debug() << "Tree pre-completed: " << (*it)->name() << "\n";
d = it.remove();
ScanManager::s_files += d->tqchildren();
ScanManager::s_files += d->children();
//**** ideally don't have this redundant extra somehow
cwd->append( d, new_dirname );
}

18
src/part/part.cpp

@ -70,7 +70,7 @@ Part::Part( TQWidget *parentWidget, const char *widgetName, TQObject *parent, co
connect( m_map, TQT_SIGNAL(giveMeTreeFor( const KURL& )), TQT_SLOT(openURL( const KURL& )) );
connect( m_manager, TQT_SIGNAL(completed( Directory* )), TQT_SLOT(scanCompleted( Directory* )) );
connect( m_manager, TQT_SIGNAL(aboutToEmptyCache()), m_map, TQT_SLOT(tqinvalidate()) );
connect( m_manager, TQT_SIGNAL(aboutToEmptyCache()), m_map, TQT_SLOT(invalidate()) );
TQTimer::singleShot( 0, this, TQT_SLOT(postInit()) );
}
@ -119,15 +119,15 @@ Part::openURL( const KURL &u )
}
else if( path[0] != '/' )
{
KMSG( i18n( "Filelight only accepts absolute paths, eg. /%1" ).tqarg( path ) );
KMSG( i18n( "Filelight only accepts absolute paths, eg. /%1" ).arg( path ) );
}
else if( isLocal && access( path8bit, F_OK ) != 0 ) //stat( path, &statbuf ) == 0
{
KMSG( i18n( "Directory not found: %1" ).tqarg( path ) );
KMSG( i18n( "Directory not found: %1" ).arg( path ) );
}
else if( isLocal && access( path8bit, R_OK | X_OK ) != 0 )
{
KMSG( i18n( "Unable to enter: %1\nYou do not have access rights to this location." ).tqarg( path ) );
KMSG( i18n( "Unable to enter: %1\nYou do not have access rights to this location." ).arg( path ) );
}
else
{
@ -192,12 +192,12 @@ Part::start( const KURL &url )
if( m_manager->start( url ) ) {
m_url = url;
const TQString s = i18n( "Scanning: %1" ).tqarg( prettyURL() );
const TQString s = i18n( "Scanning: %1" ).arg( prettyURL() );
stateChanged( "scan_started" );
emit started( 0 ); //as a Part, we have to do this
emit setWindowCaption( s );
statusBar()->message( s );
m_map->tqinvalidate(); //to maintain ui consistency
m_map->invalidate(); //to maintain ui consistency
return true;
}
@ -209,7 +209,7 @@ void
Part::rescan()
{
//FIXME we have to empty the cache because otherwise rescan picks up the old tree..
m_manager->emptyCache(); //causes canvas to tqinvalidate
m_manager->emptyCache(); //causes canvas to invalidate
start( m_url );
}
@ -226,7 +226,7 @@ Part::scanCompleted( Directory *tree )
}
else {
stateChanged( "scan_failed" );
emit canceled( i18n( "Scan failed: %1" ).tqarg( prettyURL() ) );
emit canceled( i18n( "Scan failed: %1" ).arg( prettyURL() ) );
emit setWindowCaption( TQString() );
statusBar()->clear();
@ -246,7 +246,7 @@ Part::mapChanged( const Directory *tree )
ProgressBox *progress = static_cast<ProgressBox *>(TQT_TQWIDGET(statusBar()->child( "ProgressBox" )));
if( progress )
progress->setText( tree->tqchildren() );
progress->setText( tree->children() );
}
} //namespace Filelight

6
src/part/progressBox.cpp

@ -15,12 +15,12 @@ ProgressBox::ProgressBox( TQWidget *parent, TQObject *part )
{
hide();
tqsetAlignment( TQt::AlignCenter );
setAlignment( TQt::AlignCenter );
setFont( KGlobalSettings::fixedFont() );
tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
setText( 999999 );
setMinimumWidth( tqsizeHint().width() );
setMinimumWidth( sizeHint().width() );
connect( &m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(report()) );
connect( part, TQT_SIGNAL(started( KIO::Job* )), TQT_SLOT(start()) );

12
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 tqminimumSize criteria as in the visual function
//**** because I don't use the same minimumSize 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->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 ) );
}

4
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
@ -193,7 +193,7 @@ RadialMap::Map::colorise()
case 2000: //HACK for summary view
if( (*it)->file()->name() == "Used" ) {
cb = TQApplication::tqpalette().active().color( TQColorGroup::Highlight );
cb = TQApplication::palette().active().color( TQColorGroup::Highlight );
cb.getHsv( &h, &s1, &v1 );
if( s1 > 80 )

10
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();

14
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 );
}

4
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:

16
src/part/radialMap/widgetEvents.cpp

@ -16,7 +16,7 @@
#include <krun.h> //::mousePressEvent()
#include <kurldrag.h>
#include <tqapplication.h>//TQApplication::setOverrideCursor()
#include <tqclipboard.h>
#include <clipboard.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() );
//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:
@ -197,7 +197,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e )
goto section_two;
case Copy:
TQApplication::tqclipboard()->setData( new KURLDrag( KURL::List( url ) ) );
TQApplication::clipboard()->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.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 );
}

10
src/part/summaryWidget.cpp

@ -9,8 +9,8 @@
#include <kiconloader.h>
#include <klocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqtextstream.h>
#include <layout.h>
#include <textstream.h>
#include <tqvbox.h>
#include "radialMap/radialMap.h"
#include "radialMap/widget.h"
@ -123,10 +123,10 @@ SummaryWidget::createDiskMaps()
<< "<i>(" << disk.device << ")</i>";
TQLabel *label = new TQLabel( text, box );
label->tqsetAlignment( TQt::AlignCenter );
label->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Maximum );
label->setAlignment( TQt::AlignCenter );
label->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Maximum );
box->show(); // will show its tqchildren too
box->show(); // will show its children too
Directory *tree = new Directory( disk.mount.local8Bit() );
tree->append( free, disk.free );

Loading…
Cancel
Save