TDE
/
krusader
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/krusader
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/krusader@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 34f22092c0
commit aafc63ac62
31 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File

6
krArc/krarc.cpp
Unescape View File

@ -325,7 +325,7 @@ void kio_krarcProtocol::get(const KURL& url, int tries ){
if( !extArcReady && !decompressToFile ) {
if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) || ( arcType != "bzip2" && expectedSize != decompressedLen ) ) {
if( encrypted && tries ) {
tqinvalidatePassword();
invalidatePassword();
get( url, tries - 1 );
return;
}
@ -338,7 +338,7 @@ void kio_krarcProtocol::get(const KURL& url, int tries ){
if( decompressToFile )
TQFile(arcTempDir+file).remove();
if( encrypted && tries ) {
tqinvalidatePassword();
invalidatePassword();
get( url, tries - 1 );
return;
}
@ -1574,7 +1574,7 @@ void kio_krarcProtocol::checkOutputForPassword( KProcess *proc,char *buf,int len
}
}
void kio_krarcProtocol::tqinvalidatePassword() {
void kio_krarcProtocol::invalidatePassword() {
KRDEBUG( arcFile->url().path(-1) + "/" );
if( !encrypted )

2
krArc/krarc.h
Unescape View File

@ -57,7 +57,7 @@ protected:
virtual void parseLine(int lineNo, TQString line, TQFile* temp);
virtual bool setArcFile(const KURL& url);
virtual TQString getPassword();
virtual void tqinvalidatePassword();
virtual void invalidatePassword();
// archive specific commands
TQString cmd; ///< the archiver name.

2
krusader/ActionMan/actionpropertybase.ui
Unescape View File

@ -1104,7 +1104,7 @@ Please consult the handbook to learn more about the syntax.</string>
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>

4
krusader/Dialogs/krmaskchoice.cpp
Unescape View File

@ -1,5 +1,5 @@
/***************************************************************************
krtqmaskchoice.cpp
krmaskchoice.cpp
-------------------
copyright : (C) 2000 by Shie Erlich & Rafi Yanai
e-mail : krusader@users.sourceforge.net
@ -94,7 +94,7 @@ KRMaskChoice::KRMaskChoice( TQWidget* tqparent, const char* name, bool modal, W
preSelections = new TQListBox( Layout6, "preSelections" );
preSelections->setVScrollBarMode( TQListBox::AlwaysOn );
TQWhatsThis::add( preSelections, i18n( "A predefined selection is a file-tqmask which you use often.\nSome examples are: \"*.c, *.h\", \"*.c, *.o\", etc.\nYou can add these tqmasks to the list by typing them and pressing the Add button.\nDelete removes a predefined selection and Clear removes all of them.\nNotice that the line in which you edit the tqmask has it's own history, you can scroll it, if needed." ) );
TQWhatsThis::add( preSelections, i18n( "A predefined selection is a file-tqmask which you use often.\nSome examples are: \"*.c, *.h\", \"*.c, *.o\", etc.\nYou can add these masks to the list by typing them and pressing the Add button.\nDelete removes a predefined selection and Clear removes all of them.\nNotice that the line in which you edit the tqmask has it's own history, you can scroll it, if needed." ) );
hbox_2->addWidget( preSelections );
vbox = new TQVBoxLayout;

2
krusader/Dialogs/krmaskchoice.h
Unescape View File

@ -1,5 +1,5 @@
/***************************************************************************
krtqmaskchoice.h
krmaskchoice.h
-------------------
copyright : (C) 2000 by Shie Erlich & Rafi Yanai
email : krusader@users.sourceforge.net

2
krusader/Dialogs/krspecialwidgets.cpp
Unescape View File

@ -46,7 +46,7 @@ A
/////////////////////////////////////////////////////////////////////////////
// The pie-related widgets use hard-coded coordinates to create the look.
// This is ok since the whole widget is fitted into an existing view and thus
// no re-tqalignments are needed.
// no re-alignments are needed.
#define LEFT 10
#define BOTTOM 150

8
krusader/Dialogs/krspwidgets.cpp
Unescape View File

@ -48,7 +48,7 @@
#include "../resources.h"
///////////////////// initiation of the static members ////////////////////////
TQStrList KRSpWidgets::tqmaskList;
TQStrList KRSpWidgets::maskList;
///////////////////////////////////////////////////////////////////////////////
@ -156,7 +156,7 @@ KRMaskChoiceSub::KRMaskChoiceSub() : KRMaskChoice(0,0,true) {
if (i>0) preSelections->insertStrList(lst);
// the combo-box tweaks
selection->setDuplicatesEnabled(false);
selection->insertStrList(KRSpWidgets::tqmaskList);
selection->insertStrList(KRSpWidgets::maskList);
selection->lineEdit()->setText("*");
selection->lineEdit()->selectAll();
selection->setFocus();
@ -171,7 +171,7 @@ void KRMaskChoiceSub::accept() {
bool add = true;
char *tmp;
// make sure we don't have that already
for ( tmp = KRSpWidgets::tqmaskList.first(); tmp ; tmp = KRSpWidgets::tqmaskList.next() )
for ( tmp = KRSpWidgets::maskList.first(); tmp ; tmp = KRSpWidgets::maskList.next() )
if (TQString(tmp).simplifyWhiteSpace() == selection->currentText().simplifyWhiteSpace()) {
// break if we found one such as this
add = false;
@ -179,7 +179,7 @@ void KRMaskChoiceSub::accept() {
}
if (add)
KRSpWidgets::tqmaskList.insert(0,selection->currentText().local8Bit());
KRSpWidgets::maskList.insert(0,selection->currentText().local8Bit());
// write down the predefined selections list
TQStrList list;
TQListBoxItem *i=preSelections->firstItem();

2
krusader/Dialogs/krspwidgets.h
Unescape View File

@ -52,7 +52,7 @@ public:
static KURL newFTP();
private:
static TQStrList tqmaskList; // used by KRMaskChoiceSub
static TQStrList maskList; // used by KRMaskChoiceSub
};
/////////////////////////// newFTPSub ///////////////////////////////////////

8
krusader/Dialogs/percentalsplitter.cpp
Unescape View File

@ -39,15 +39,15 @@ public:
}
virtual ~PercentalSplitterToolTip() {
remove( tqparentWidget() );
remove( parentWidget() );
}
void maybeTip( const TQPoint & point ) {
if( tqparentWidget()->inherits( "PercentalSplitter" ) ) {
PercentalSplitter *splitter = (PercentalSplitter *)tqparentWidget();
if( parentWidget()->inherits( "PercentalSplitter" ) ) {
PercentalSplitter *splitter = (PercentalSplitter *)parentWidget();
TQString tipString = splitter->toolTipString();
TQRect rect = TQRect( tqparentWidget()->rect() );
TQRect rect = TQRect( parentWidget()->rect() );
if( splitter->orientation() == Qt::Vertical ) {
rect.setY( splitter->sizes()[ 0 ] );

8
krusader/DiskUsage/diskusage.cpp
Unescape View File

@ -250,10 +250,10 @@ void DiskUsage::load( KURL baseDir )
root = new Directory( baseURL.fileName(), vfs::pathOrURL( baseDir ) );
directoryStack.clear();
tqparentStack.clear();
parentStack.clear();
directoryStack.push( "" );
tqparentStack.push( root );
parentStack.push( root );
if( searchVfs )
{
@ -323,7 +323,7 @@ void DiskUsage::slotLoadDirectory()
break;
dirToCheck = directoryStack.pop();
currentParent = tqparentStack.pop();
currentParent = parentStack.pop();
contentMap.insert( dirToCheck, currentParent );
@ -363,7 +363,7 @@ void DiskUsage::slotLoadDirectory()
currentVfile->vfile_getPerm(), currentVfile->vfile_getTime_t(), currentVfile->vfile_isSymLink(),
mime );
directoryStack.push( (dirToCheck.isEmpty() ? "" : dirToCheck + "/" )+ currentVfile->vfile_getName() );
tqparentStack.push( dynamic_cast<Directory *>( newItem ) );
parentStack.push( dynamic_cast<Directory *>( newItem ) );
}
else
{

2
krusader/DiskUsage/diskusage.h
Unescape View File

@ -159,7 +159,7 @@ protected:
bool deleting;
TQValueStack<TQString> directoryStack;
TQPtrStack<Directory> tqparentStack;
TQPtrStack<Directory> parentStack;
vfs * searchVfs;
vfile * currentVfile;

8
krusader/DiskUsage/filelightParts/fileTree.h
Unescape View File

@ -175,10 +175,10 @@ protected:
int m_percent; //< percent flag
public:
File( Directory *tqparentIn, const TQString &nameIn, const TQString &dir, FileSize sizeIn, mode_t modeIn,
File( Directory *parentIn, const TQString &nameIn, const TQString &dir, FileSize sizeIn, mode_t modeIn,
const TQString &ownerIn, const TQString &groupIn, const TQString &permIn, time_t timeIn, bool symLinkIn,
const TQString &mimeTypeIn )
: m_parent( tqparentIn ), m_name( nameIn ), m_directory( dir ), m_size( sizeIn ), m_ownSize( sizeIn ), m_mode( modeIn ),
: m_parent( parentIn ), m_name( nameIn ), m_directory( dir ), m_size( sizeIn ), m_ownSize( sizeIn ), m_mode( modeIn ),
m_owner( ownerIn ), m_group( groupIn ), m_perm( permIn ), m_time( timeIn ), m_symLink( symLinkIn ),
m_mimeType( mimeTypeIn ), m_excluded( false ), m_percent( -1 ) {}
@ -238,10 +238,10 @@ public:
class Directory : public Chain<File>, public File
{
public:
Directory( Directory *tqparentIn, const TQString &nameIn, const TQString &dir, FileSize sizeIn, mode_t modeIn,
Directory( Directory *parentIn, const TQString &nameIn, const TQString &dir, FileSize sizeIn, mode_t modeIn,
const TQString &ownerIn, const TQString &groupIn, const TQString &permIn, time_t timeIn, bool symLinkIn,
const TQString &mimeTypeIn )
: File( tqparentIn, nameIn, dir, sizeIn, modeIn, ownerIn, groupIn, permIn, timeIn, symLinkIn, mimeTypeIn ),
: File( parentIn, nameIn, dir, sizeIn, modeIn, ownerIn, groupIn, permIn, timeIn, symLinkIn, mimeTypeIn ),
m_fileCount( 0 )
{}

2
krusader/DiskUsage/radialMap/segmentTip.cpp
Unescape View File

@ -33,7 +33,7 @@ SegmentTip::moveto( TQPoint p, const TQWidget &canvas, bool placeAbove )
p.rx() -= rect().center().x();
p.ry() -= (placeAbove ? 8 + height() : m_cursorHeight - 8);
const TQRect screen = KGlobalSettings::desktopGeometry( tqparentWidget() );
const TQRect screen = KGlobalSettings::desktopGeometry( parentWidget() );
const int x = p.x();
const int y = p.y();

2
krusader/DiskUsage/radialMap/widget.cpp
Unescape View File

@ -75,7 +75,7 @@ RadialMap::Widget::tqinvalidate( const bool b )
update();
//tell rest of Filelight
emit tqinvalidated( urlInv );
emit invalidated( urlInv );
}
}

2
krusader/DiskUsage/radialMap/widget.h
Unescape View File

@ -80,7 +80,7 @@ namespace RadialMap
signals:
void activated( const KURL& );
void tqinvalidated( const KURL& );
void invalidated( const KURL& );
void created( const Directory* );
void mouseHover( const TQString& );

4
krusader/Konfigurator/konfigurator.cpp
Unescape View File

@ -116,7 +116,7 @@ void Konfigurator::createLayout( int startPage )
newContent(new KgProtocols(firstTime, widget->addPage(i18n("Protocols"),
i18n("Link mimes to protocols"), TQPixmap(krLoader->loadIcon("about_kde",KIcon::Desktop,32)))));
widget->showPage( widget->pageIndex( kgFrames.at( startPage )->tqparentWidget() ) );
widget->showPage( widget->pageIndex( kgFrames.at( startPage )->parentWidget() ) );
slotApplyEnable();
}
@ -154,7 +154,7 @@ int Konfigurator::searchPage( int pageNum )
while( ( page = kgFrames.at( i ) ) )
{
if( pageNum == widget->pageIndex( page->tqparentWidget() ) )
if( pageNum == widget->pageIndex( page->parentWidget() ) )
return i;
i++;

24
krusader/Konfigurator/konfiguratorpage.h
Unescape View File

@ -120,7 +120,7 @@ public:
* <br>The checkbox widget's name is TQString(cls + "/" + name).ascii()<br>
*
* Sample:<br><br>
* KonfiguratorCheckBox *myCheckBox = createCheckBox( "class", "name", false, tqparentWidget );<br>
* KonfiguratorCheckBox *myCheckBox = createCheckBox( "class", "name", false, parentWidget );<br>
* myLayout->addWidget( myCheckBox, 0, 0 );
*
* @param cls The class name used in KConfig (ex. "Archives")
@ -143,7 +143,7 @@ public:
* <br>The spinbox widget's name is TQString(cls + "/" + name).ascii()<br>
*
* Sample:<br><br>
* KonfiguratorSpinBox *mySpinBox = createSpinBox( "class", "name", 10, 1, 100, tqparentWidget );<br>
* KonfiguratorSpinBox *mySpinBox = createSpinBox( "class", "name", 10, 1, 100, parentWidget );<br>
* myLayout->addWidget( mySpinBox, 0, 0 );
*
* @param cls The class name used in KConfig (ex. "Archives")
@ -165,7 +165,7 @@ public:
* <br>The editbox widget's name is TQString(cls + "/" + name).ascii()<br>
*
* Sample:<br><br>
* KonfiguratorEditBox *myEditBox = createEditBox( "class", "name", "default", tqparentWidget );<br>
* KonfiguratorEditBox *myEditBox = createEditBox( "class", "name", "default", parentWidget );<br>
* myLayout->addWidget( myEditBox, 0, 0 );
*
* @param cls The class name used in KConfig (ex. "Archives")
@ -187,7 +187,7 @@ public:
* Sample:<br><br>
* TQStringList valueList;<br>
* valueList += "item";<br>
* KonfiguratorListBox *myListBox = createListBox( "class", "name", valueList, tqparentWidget );<br>
* KonfiguratorListBox *myListBox = createListBox( "class", "name", valueList, parentWidget );<br>
* myLayout->addWidget( myListBox, 0, 0 );
*
* @param cls The class name used in KConfig (ex. "Archives")
@ -207,7 +207,7 @@ public:
* <br>The URL requester widget's name is TQString(cls + "/" + name).ascii()<br>
*
* Sample:<br><br>
* KonfiguratorURLRequester *myURLRequester = createURLRequester( "class", "name", "default", tqparentWidget );<br>
* KonfiguratorURLRequester *myURLRequester = createURLRequester( "class", "name", "default", parentWidget );<br>
* myLayout->addWidget( myURLRequester, 0, 0 );
*
* @param cls The class name used in KConfig (ex. "Archives")
@ -228,7 +228,7 @@ public:
* <br>The font chooser widget's name is TQString(cls + "/" + name).ascii()<br>
*
* Sample:<br><br>
* KonfiguratorFontChooser *myFontChooser = createFontChooser( "class", "name", new TQFont(), tqparentWidget );<br>
* KonfiguratorFontChooser *myFontChooser = createFontChooser( "class", "name", new TQFont(), parentWidget );<br>
* myLayout->addWidget( myFontChooser, 0, 0 );
*
* @param cls The class name used in KConfig (ex. "Archives")
@ -252,7 +252,7 @@ public:
* &nbsp;{{ i18n( "combo text1" ), "value1" },<br>
* &nbsp;&nbsp;{ i18n( "combo text2" ), "value2" },<br>
* &nbsp;&nbsp;{ i18n( "combo text3" ), "value3" }};<br><br>
* KonfiguratorComboBox *myComboBox = createComboBox( "class", "name", "value2", comboInfo, 3, tqparentWidget );<br>
* KonfiguratorComboBox *myComboBox = createComboBox( "class", "name", "value2", comboInfo, 3, parentWidget );<br>
* myLayout->addWidget( myComboBox, 0, 0 );
*
* @param cls The class name used in KConfig (ex. "Archives")
@ -276,7 +276,7 @@ public:
* Creates a frame on the page.
*
* Sample:<br><br>
* TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), tqparentWidget, "frameName" );<br>
* TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), parentWidget, "frameName" );<br>
* myLayout->addWidget( myGroup, 0, 0 );
*
* @param text The text written out onto the frame
@ -292,7 +292,7 @@ public:
* Creates a new TQGridLayout element and sets its margins.
*
* Sample:<br><br>
* TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), tqparentWidget, "frameName" );<br>
* TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), parentWidget, "frameName" );<br>
* TQGridLayout *myLayout = createGridLayout( myGroup->tqlayout() );<br>
* myLayout->addWidget( myGroup, 0, 0 );
*
@ -306,7 +306,7 @@ public:
* Adds a new label to a grid tqlayout.
*
* Sample:<br><br>
* TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), tqparentWidget, "frameName" );<br>
* TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), parentWidget, "frameName" );<br>
* TQGridLayout *myLayout = createGridLayout( myGroup->tqlayout() );<br>
* addLabel( myLayout, 0, 0, i18n( "Hello world!" ), myGroup, "myLabel" );<br>
* mainLayout->addWidget( myGroup, 0, 0 );
@ -441,7 +441,7 @@ public:
* This function is used to remove elements from KonfiguratorPage.
*
* Sample:<br><br>
* KonfiguratorEditBox *myEditBox = createEditBox( "class", "name", "default", tqparentWidget );<br>
* KonfiguratorEditBox *myEditBox = createEditBox( "class", "name", "default", parentWidget );<br>
* myLayout->addWidget( myEditBox, 0, 0 );<br>
* removeObject( myEditBox->extension() );
*
@ -457,7 +457,7 @@ public:
* <br>The chooser's widget's name is TQString(cls + "/" + name).ascii()<br>
*
* Sample:<br><br>
* KonfiguratorColorChooser *myColorChooser = createColorChooser( "class", "name", TQColor( 255, 0, 255 ), tqparentWidget );<br>
* KonfiguratorColorChooser *myColorChooser = createColorChooser( "class", "name", TQColor( 255, 0, 255 ), parentWidget );<br>
* myLayout->addWidget( myColorChooser, 0, 0 );
*
* @param cls The class name used in KConfig (ex. "Archives")

2
krusader/Synchronizer/feedtolistboxdialog.cpp
Unescape View File

@ -188,7 +188,7 @@ void FeedToListBoxDialog::slotOk() {
KURL url = KURL::fromPathOrURL(TQString("virt:/")+ name);
virt_vfs v(0,true);
if( !v.vfs_refresh( url ) ) {
KMessageBox::error( tqparentWidget(), i18n( "Cannot open %1!" ).tqarg( url.prettyURL() ) );
KMessageBox::error( parentWidget(), i18n( "Cannot open %1!" ).tqarg( url.prettyURL() ) );
return;
}
v.vfs_addFiles( &urlList, KIO::CopyJob::Copy, 0 );

6
krusader/Synchronizer/synchronizer.cpp
Unescape View File

@ -78,7 +78,7 @@
Synchronizer::Synchronizer() : displayUpdateCount( 0 ), markEquals( true ),
markDiffers ( true ), markCopyToLeft( true ), markCopyToRight( true ), markDeletable( true ),
stack(), jobMap(), receivedMap(), tqparentWidget( 0 )
stack(), jobMap(), receivedMap(), parentWidget( 0 )
{
resultList.setAutoDelete( true );
stack.setAutoDelete( true );
@ -164,7 +164,7 @@ void Synchronizer::compareLoop() {
SynchronizerTask * entry = stack.at( thread );
if( entry->state() == ST_STATE_NEW )
entry->start( tqparentWidget );
entry->start( parentWidget );
if( entry->inherits("CompareTask") ) {
if( entry->state() == ST_STATE_READY ) {
@ -1445,7 +1445,7 @@ void Synchronizer::synchronizeWithKGet()
p << KrServices::fullPathName( "kget" ) << source << destURL.path();
if (!p.start(KProcess::Block))
KMessageBox::error(tqparentWidget,i18n("Error executing ")+KrServices::fullPathName( "kget" )+" !");
KMessageBox::error(parentWidget,i18n("Error executing ")+KrServices::fullPathName( "kget" )+" !");
else
p.detach();
}

4
krusader/Synchronizer/synchronizer.h
Unescape View File

@ -88,7 +88,7 @@ class Synchronizer : public TQObject
SynchronizerFileItem *getItemAt( unsigned ndx ) {return resultList.at(ndx);}
void setParentWidget( TQWidget * widget ) {tqparentWidget = widget;}
void setParentWidget( TQWidget * widget ) {parentWidget = widget;}
void compareContentResult( SynchronizerFileItem * item, bool result );
signals:
@ -198,7 +198,7 @@ class Synchronizer : public TQObject
int inTaskFinished; // counter of quasy 'threads' in slotTaskFinished
TQStringList selectedFiles; // the selected files to compare
TQWidget *tqparentWidget; // the tqparent widget
TQWidget *parentWidget; // the tqparent widget
TQWidget *syncDlgWidget; // the synchronizer dialog widget
};

6
krusader/Synchronizer/synchronizerdirlist.cpp
Unescape View File

@ -49,7 +49,7 @@
#endif
SynchronizerDirList::SynchronizerDirList( TQWidget *w, bool hidden ) : TQObject(), TQDict<vfile>(), fileIterator( 0 ),
tqparentWidget( w ), busy( false ), result( false ), ignoreHidden( hidden ), currentUrl() {
parentWidget( w ), busy( false ), result( false ), ignoreHidden( hidden ), currentUrl() {
setAutoDelete( true );
}
@ -98,7 +98,7 @@ bool SynchronizerDirList::load( const TQString &urlIn, bool wait ) {
TQString path = url.path( -1 );
DIR* dir = opendir(path.local8Bit());
if(!dir) {
KMessageBox::error(tqparentWidget, i18n("Can't open the %1 directory!").tqarg( path ), i18n("Error"));
KMessageBox::error(parentWidget, i18n("Can't open the %1 directory!").tqarg( path ), i18n("Error"));
emit finished( result = false );
return false;
}
@ -206,7 +206,7 @@ void SynchronizerDirList::slotEntries( KIO::Job * job, const KIO::UDSEntryList&
void SynchronizerDirList::slotListResult( KIO::Job *job ) {
busy = false;
if ( job && job->error() ) {
job->showErrorDialog( tqparentWidget );
job->showErrorDialog( parentWidget );
emit finished( result = false );
return;
}

2
krusader/Synchronizer/synchronizerdirlist.h
Unescape View File

@ -63,7 +63,7 @@ signals:
private:
TQDictIterator<vfile> *fileIterator; //< Point to a dictionary of virtual files (vfile).
TQWidget *tqparentWidget;
TQWidget *parentWidget;
bool busy;
bool result;
bool ignoreHidden;

2
krusader/Synchronizer/synchronizergui.cpp
Unescape View File

@ -2140,7 +2140,7 @@ void SynchronizerGUI::synchronize()
if( !synchronizer.totalSizes( &copyToLeftNr, &copyToLeftSize, &copyToRightNr, &copyToRightSize,
&deleteNr, &deleteSize ) )
{
KMessageBox::sorry(tqparentWidget(), i18n("Synchronizer has nothing to do!"));
KMessageBox::sorry(parentWidget(), i18n("Synchronizer has nothing to do!"));
return;
}

18
krusader/Synchronizer/synchronizertask.cpp
Unescape View File

@ -38,18 +38,18 @@
#include <kmessagebox.h>
#include "../VFS/vfs.h"
CompareTask::CompareTask( SynchronizerFileItem *tqparentIn, const TQString &leftURL,
CompareTask::CompareTask( SynchronizerFileItem *parentIn, const TQString &leftURL,
const TQString &rightURL, const TQString &leftDir,
const TQString &rightDir, bool hidden ) : SynchronizerTask (), m_parent( tqparentIn ),
const TQString &rightDir, bool hidden ) : SynchronizerTask (), m_parent( parentIn ),
m_url( leftURL ), m_dir( leftDir ), m_otherUrl( rightURL ),
m_otherDir( rightDir ), m_duplicate( true ),
m_dirList( 0 ), m_otherDirList( 0 ) {
ignoreHidden = hidden;
}
CompareTask::CompareTask( SynchronizerFileItem *tqparentIn, const TQString &urlIn,
CompareTask::CompareTask( SynchronizerFileItem *parentIn, const TQString &urlIn,
const TQString &dirIn, bool isLeftIn, bool hidden ) : SynchronizerTask (),
m_parent( tqparentIn ), m_url( urlIn ), m_dir( dirIn ),
m_parent( parentIn ), m_url( urlIn ), m_dir( dirIn ),
m_isLeft( isLeftIn ), m_duplicate( false ),
m_dirList( 0 ), m_otherDirList( 0 ) {
ignoreHidden = hidden;
@ -71,12 +71,12 @@ void CompareTask::start() {
m_state = ST_STATE_PENDING;
m_loadFinished = m_otherLoadFinished = false;
m_dirList = new SynchronizerDirList( tqparentWidget, ignoreHidden );
m_dirList = new SynchronizerDirList( parentWidget, ignoreHidden );
connect( m_dirList, TQT_SIGNAL( finished( bool ) ), this, TQT_SLOT( slotFinished( bool ) ));
m_dirList->load( m_url, false );
if( m_duplicate ) {
m_otherDirList = new SynchronizerDirList( tqparentWidget, ignoreHidden );
m_otherDirList = new SynchronizerDirList( parentWidget, ignoreHidden );
connect( m_otherDirList, TQT_SIGNAL( finished( bool ) ), this, TQT_SLOT( slotOtherFinished( bool ) ));
m_otherDirList->load( m_otherUrl, false );
}
@ -131,14 +131,14 @@ void CompareContentTask::start() {
if( leftURL.isLocalFile() && rightURL.isLocalFile() ) {
leftFile = new TQFile( leftURL.path() );
if( !leftFile->open( IO_ReadOnly ) ) {
KMessageBox::error(tqparentWidget, i18n("Error at opening %1!").tqarg( leftURL.path() ));
KMessageBox::error(parentWidget, i18n("Error at opening %1!").tqarg( leftURL.path() ));
m_state = ST_STATE_ERROR;
return;
}
rightFile = new TQFile( rightURL.path() );
if( !rightFile->open( IO_ReadOnly ) ) {
KMessageBox::error(tqparentWidget, i18n("Error at opening %1!").tqarg( rightURL.path() ));
KMessageBox::error(parentWidget, i18n("Error at opening %1!").tqarg( rightURL.path() ));
m_state = ST_STATE_ERROR;
return;
}
@ -299,7 +299,7 @@ void CompareContentTask::slotFinished(KIO::Job *job)
if( job->error() && job->error() != KIO::ERR_USER_CANCELED && !errorPrinted )
{
errorPrinted = true;
KMessageBox::error(tqparentWidget, i18n("IO error at comparing file %1 with %2!")
KMessageBox::error(parentWidget, i18n("IO error at comparing file %1 with %2!")
.tqarg( vfs::pathOrURL( leftURL ) )
.tqarg( vfs::pathOrURL( rightURL ) ) );
}

8
krusader/Synchronizer/synchronizertask.h
Unescape View File

@ -55,7 +55,7 @@ public:
SynchronizerTask() : TQObject(), m_state( ST_STATE_NEW ), m_statusMessage( TQString() ) {}
virtual ~SynchronizerTask() {};
inline int start( TQWidget *tqparentWidget ) { this->tqparentWidget = tqparentWidget; start(); return state(); }
inline int start( TQWidget *parentWidget ) { this->parentWidget = parentWidget; start(); return state(); }
inline int state() { return m_state; }
@ -77,7 +77,7 @@ protected:
virtual void start() {};
int m_state;
TQString m_statusMessage;
TQWidget *tqparentWidget;
TQWidget *parentWidget;
};
@ -86,10 +86,10 @@ class CompareTask : public SynchronizerTask {
TQ_OBJECT
public:
CompareTask( SynchronizerFileItem *tqparentIn, const TQString &leftURL,
CompareTask( SynchronizerFileItem *parentIn, const TQString &leftURL,
const TQString &rightURL, const TQString &leftDir,
const TQString &rightDir, bool ignoreHidden );
CompareTask( SynchronizerFileItem *tqparentIn, const TQString &urlIn,
CompareTask( SynchronizerFileItem *parentIn, const TQString &urlIn,
const TQString &dirIn, bool isLeftIn, bool ignoreHidden );
virtual ~CompareTask();

8
krusader/VFS/vfs.cpp
Unescape View File

@ -42,7 +42,7 @@
#include "../defaults.h"
vfs::vfs(TQObject* panel, bool quiet): vfs_busy(false), quietMode(quiet),disableRefresh(false),postponedRefreshURL(),
tqinvalidated(true),panelConnected(false),vfs_tempFilesP(0),vfileIterator(0),deletePossible( true ),
invalidated(true),panelConnected(false),vfs_tempFilesP(0),vfileIterator(0),deletePossible( true ),
deleteRequested( false ) {
@ -140,7 +140,7 @@ bool vfs::vfs_refresh(){
if( vfs_busy )
return false;
if( tqinvalidated ) // tqinvalidated fs requires total refresh
if( invalidated ) // invalidated fs requires total refresh
return vfs_refresh( vfs_getOrigin() );
if( disableRefresh )
@ -227,7 +227,7 @@ bool vfs::vfs_refresh(const KURL& origin){
return true;
}
if( !tqinvalidated && origin.equals(vfs_getOrigin(),true) ) return vfs_refresh();
if( !invalidated && origin.equals(vfs_getOrigin(),true) ) return vfs_refresh();
vfs_busy = true;
@ -249,7 +249,7 @@ bool vfs::vfs_refresh(const KURL& origin){
emit startUpdate();
tqinvalidated = false;
invalidated = false;
return true;
}

4
krusader/VFS/vfs.h
Unescape View File

@ -124,7 +124,7 @@ public slots:
bool vfs_refresh();
void vfs_setQuiet(bool beQuiet){ quietMode=beQuiet; }
void vfs_enableRefresh(bool enable);
void vfs_tqinvalidate() { tqinvalidated = true; }
void vfs_tqinvalidate() { invalidated = true; }
signals:
void startUpdate(); //< emitted when the VFS starts to refresh its list of vfiles.
@ -160,7 +160,7 @@ protected:
bool disableRefresh; //< true if refresh is disabled
bool isWritable; //< true if it's writable
KURL postponedRefreshURL; //< true if vfs_refresh() was called when refresh is disabled.
bool tqinvalidated; //< the content of the cache is tqinvalidated
bool invalidated; //< the content of the cache is invalidated
bool panelConnected; //< indicates that there's a panel connected. Important for disabling the dir watcher
protected slots:

2
krusader/calc.ui
Unescape View File

@ -263,5 +263,5 @@
<slot>equals()</slot>
<slot>setCap()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
krusader/mount.ui
Unescape View File

@ -193,7 +193,7 @@
<includes>
<include location="local" impldecl="in implementation">mount.ui.h</include>
</includes>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

6
krusader/paneltabbar.cpp
Unescape View File

@ -81,7 +81,7 @@ int PanelTabBar::addPanel(ListPanel *panel, bool setCurrent ) {
// make sure all tabs lengths are correct
for (int i=0; i<count(); i++)
tabAt(i)->setText(squeeze(DISPLAY(dynamic_cast<PanelTab*>(tabAt(i))->panel->virtualPath()), i));
tqlayoutTabs();
layoutTabs();
if( setCurrent )
setCurrentTab(newId);
@ -105,7 +105,7 @@ ListPanel* PanelTabBar::removeCurrentPanel(ListPanel* &panelToDelete) {
for (int i=0; i<count(); i++)
tabAt(i)->setText(squeeze(DISPLAY(dynamic_cast<PanelTab*>(tabAt(i))->panel->virtualPath()), i));
tqlayoutTabs();
layoutTabs();
// setup current one
id = currentTab();
@ -232,7 +232,7 @@ void PanelTabBar::resizeEvent ( TQResizeEvent *e ) {
for (int i=0; i<count(); i++)
tabAt(i)->setText(squeeze(DISPLAY(dynamic_cast<PanelTab*>(tabAt(i))->panel->virtualPath()), i));
tqlayoutTabs();
layoutTabs();
}

2
krusader/recode.ui
Unescape View File

@ -282,7 +282,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

Write Preview
Loading…
Cancel
Save