diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:07 -0600 |
| commit | 644e85d451b96982107f4e70977f0ff08b91291d (patch) | |
| tree | 1d48dc166787231440da12a553a0195177858d8d | |
| parent | 44ec35d6f3ec0bf8067f31896d7721ac3082f66f (diff) | |
| download | krusader-644e85d4.tar.gz krusader-644e85d4.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 44ec35d6f3ec0bf8067f31896d7721ac3082f66f.
134 files changed, 917 insertions, 917 deletions
diff --git a/iso/iso.cpp b/iso/iso.cpp index 3a66edc..24023ca 100644 --- a/iso/iso.cpp +++ b/iso/iso.cpp @@ -150,7 +150,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star path.truncate( len - 1 ); } else - path = TQString::fromLatin1("/"); + path = TQString::tqfromLatin1("/"); kdDebug() << "Found. isoFile=" << isoFile << " path=" << path << endl; break; } @@ -259,10 +259,10 @@ void kio_isoProtocol::listDir( const KURL & url ) if ( path.isEmpty() ) { - KURL redir( TQString::fromLatin1( "iso:/") ); + KURL redir( TQString::tqfromLatin1( "iso:/") ); kdDebug() << "url.path()==" << url.path() << endl; if (url.hasRef()) redir.setRef(url.htmlRef()); - redir.setPath( url.path() + TQString::fromLatin1("/") ); + redir.setPath( url.path() + TQString::tqfromLatin1("/") ); kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl; redirection( redir ); finished(); @@ -274,7 +274,7 @@ void kio_isoProtocol::listDir( const KURL & url ) const KArchiveDirectory* dir; if (!path.isEmpty() && path != "/") { - kdDebug() << TQString("Looking for entry %1").arg(path) << endl; + kdDebug() << TQString("Looking for entry %1").tqarg(path) << endl; const KArchiveEntry* e = root->entry( path ); if ( !e ) { @@ -356,7 +356,7 @@ void kio_isoProtocol::stat( const KURL & url ) const KArchiveEntry* isoEntry; if ( path.isEmpty() ) { - path = TQString::fromLatin1( "/" ); + path = TQString::tqfromLatin1( "/" ); isoEntry = root; } else { isoEntry = root->entry( path ); diff --git a/iso/kiso.cpp b/iso/kiso.cpp index 0fe4655..9f87d5f 100644 --- a/iso/kiso.cpp +++ b/iso/kiso.cpp @@ -55,7 +55,7 @@ //////////////////////////////////////////////////////////////////////// /** - * puts the track layout of the device 'fname' into 'tracks' + * puts the track tqlayout of the device 'fname' into 'tracks' * tracks structure: start sector, track number, ... * tracks should be 100*2 entry long (this is the maximum in the CD-ROM standard) * currently it's linux only, porters are welcome @@ -359,7 +359,7 @@ bool KIso::openArchive( int mode ) memset(&buf,0,sizeof(struct stat)); buf.st_mode=0777; } else { - /* If it's a block device, try to query the track layout (for multisession) */ + /* If it's a block device, try to query the track tqlayout (for multisession) */ if (m_startsec == -1 && S_ISBLK(buf.st_mode)) trackno=getTracks(m_filename.latin1(),(int*) &tracks); } diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp index 6ff1ca0..435821e 100644 --- a/krArc/krarc.cpp +++ b/krArc/krarc.cpp @@ -86,7 +86,7 @@ kio_krarcProtocol::kio_krarcProtocol(const TQCString &pool_socket, const TQCStri dirDict.setAutoDelete(true); arcTempDir = locateLocal("tmp",TQString()); - TQString dirName = "krArc"+TQDateTime::currentDateTime().toString(Qt::ISODate); + TQString dirName = "krArc"+TQDateTime::tqcurrentDateTime().toString(Qt::ISODate); dirName.replace(TQRegExp(":"),"_"); TQDir(arcTempDir).mkdir(dirName); arcTempDir = arcTempDir+dirName+"/"; @@ -124,7 +124,7 @@ void kio_krarcProtocol::mkdir(const KURL& url,int permissions){ if( putCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, - i18n("Creating directories is not supported with %1 archives").arg(arcType) ); + i18n("Creating directories is not supported with %1 archives").tqarg(arcType) ); return; } @@ -154,14 +154,14 @@ void kio_krarcProtocol::mkdir(const KURL& url,int permissions){ // pack the directory KrShellProcess proc; proc << putCmd << convertName( arcFile->url().path() ) + " " << convertFileName( tmpDir.mid(arcTempDir.length()) ); - infoMessage(i18n("Creating %1 ...").arg( url.fileName() ) ); + infoMessage(i18n("Creating %1 ...").tqarg( url.fileName() ) ); TQDir::setCurrent(arcTempDir); proc.start(KProcess::Block,KProcess::AllOutput); // delete the temp directory TQDir().rmdir(arcTempDir); - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) { + if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) ) { error(ERR_COULD_NOT_WRITE,url.path() + "\n\n" + proc.getErrorMsg() ); return; } @@ -184,7 +184,7 @@ void kio_krarcProtocol::put(const KURL& url,int permissions,bool overwrite,bool if( putCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, - i18n("Writing to %1 archives is not supported").arg(arcType) ); + i18n("Writing to %1 archives is not supported").tqarg(arcType) ); return; } if( !overwrite && findFileEntry(url) ){ @@ -225,13 +225,13 @@ void kio_krarcProtocol::put(const KURL& url,int permissions,bool overwrite,bool // pack the file KrShellProcess proc; proc << putCmd << convertName( arcFile->url().path() )+ " " <<convertFileName( tmpFile.mid(arcTempDir.length()) ); - infoMessage(i18n("Packing %1 ...").arg( url.fileName() ) ); + infoMessage(i18n("Packing %1 ...").tqarg( url.fileName() ) ); TQDir::setCurrent(arcTempDir); proc.start(KProcess::Block,KProcess::AllOutput); // remove the file TQFile::remove(tmpFile); - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) { + if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) ) { error(ERR_COULD_NOT_WRITE,url.path() + "\n\n" + proc.getErrorMsg() ); return; } @@ -259,7 +259,7 @@ void kio_krarcProtocol::get(const KURL& url, int tries ){ if( getCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, - i18n("Retrieving data from %1 archives is not supported").arg(arcType) ); + i18n("Retrieving data from %1 archives is not supported").tqarg(arcType) ); return; } UDSEntry* entry = findFileEntry(url); @@ -317,13 +317,13 @@ void kio_krarcProtocol::get(const KURL& url, int tries ){ connect(&proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), this,TQT_SLOT(receivedData(KProcess*,char*,int)) ); } - infoMessage(i18n("Unpacking %1 ...").arg( url.fileName() ) ); + infoMessage(i18n("Unpacking %1 ...").tqarg( url.fileName() ) ); // change the working directory to our arcTempDir TQDir::setCurrent(arcTempDir); proc.start(KProcess::Block,KProcess::AllOutput); if( !extArcReady && !decompressToFile ) { - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) || ( arcType != "bzip2" && expectedSize != decompressedLen ) ) { + if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) || ( arcType != "bzip2" && expectedSize != decompressedLen ) ) { if( encrypted && tries ) { invalidatePassword(); get( url, tries - 1 ); @@ -334,7 +334,7 @@ void kio_krarcProtocol::get(const KURL& url, int tries ){ } } else{ - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) || !TQFileInfo( arcTempDir+file ).exists() ) { + if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) || !TQFileInfo( arcTempDir+file ).exists() ) { if( decompressToFile ) TQFile(arcTempDir+file).remove(); if( encrypted && tries ) { @@ -439,7 +439,7 @@ void kio_krarcProtocol::del(KURL const & url, bool isFile){ if( delCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, - i18n("Deleting files from %1 archives is not supported").arg(arcType) ); + i18n("Deleting files from %1 archives is not supported").tqarg(arcType) ); return; } if( !findFileEntry(url) ){ @@ -455,9 +455,9 @@ void kio_krarcProtocol::del(KURL const & url, bool isFile){ } KrShellProcess proc; proc << delCmd << convertName( arcFile->url().path() )+" " << convertFileName( file ); - infoMessage(i18n("Deleting %1 ...").arg( url.fileName() ) ); + infoMessage(i18n("Deleting %1 ...").tqarg( url.fileName() ) ); proc.start(KProcess::Block, KProcess::AllOutput); - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) { + if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) ) { error(ERR_COULD_NOT_WRITE,url.path() + "\n\n" + proc.getErrorMsg() ); return; } @@ -479,7 +479,7 @@ void kio_krarcProtocol::stat( const KURL & url ){ if( listCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, - i18n("Accessing files is not supported with the %1 archives").arg(arcType) ); + i18n("Accessing files is not supported with the %1 archives").tqarg(arcType) ); return; } TQString path = url.path(-1); @@ -551,9 +551,9 @@ void kio_krarcProtocol::copy (const KURL &url, const KURL &dest, int, bool overw if( arcType == "ace" && TQFile( "/dev/ptmx" ).exists() ) // Don't remove, unace crashes if missing!!! proc << "<" << "/dev/ptmx"; - infoMessage(i18n("Unpacking %1 ...").arg( url.fileName() ) ); + infoMessage(i18n("Unpacking %1 ...").tqarg( url.fileName() ) ); proc.start(KProcess::Block, KProcess::AllOutput); - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) { + if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) ) { error(KIO::ERR_COULD_NOT_WRITE, dest.path(-1) + "\n\n" + proc.getErrorMsg() ); return; } @@ -579,7 +579,7 @@ void kio_krarcProtocol::listDir(const KURL& url){ } if( listCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, - i18n("Listing directories is not supported for %1 archives").arg(arcType) ); + i18n("Listing directories is not supported for %1 archives").tqarg(arcType) ); return; } TQString path = url.path(); @@ -712,7 +712,7 @@ bool kio_krarcProtocol::initDirDict(const KURL&url, bool forced){ if( arcType == "ace" && TQFile( "/dev/ptmx" ).exists() ) // Don't remove, unace crashes if missing!!! proc << "<" << "/dev/ptmx"; proc.start(KProcess::Block,KProcess::AllOutput); - if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) return false; + if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) ) return false; } // clear the dir dictionary dirDict.clear(); @@ -983,13 +983,13 @@ void kio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) { if( perm.length() == 7 ) // windows rar permission format { - bool isDir = ( perm.at(1).lower() == 'd' ); - bool isReadOnly = ( perm.at(2).lower() == 'r' ); + bool isDir = ( perm.tqat(1).lower() == 'd' ); + bool isReadOnly = ( perm.tqat(2).lower() == 'r' ); perm = isDir ? "drwxr-xr-x" : "-rw-r--r--"; if( isReadOnly ) - perm.at( 2 ) = '-'; + perm.tqat( 2 ) = '-'; } if(perm.length() != 10) perm = (perm.at(0)=='d')? "drwxr-xr-x" : "-rw-r--r--" ; @@ -1073,7 +1073,7 @@ void kio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) { // date & time int month = (TQStringList::split(',', "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec")).findIndex( nextWord(line) ) + 1; int day = nextWord(line).toInt(); - int year = TQDate::currentDate().year(); + int year = TQDate::tqcurrentDate().year(); TQString third = nextWord(line); TQTime qtime; @@ -1141,11 +1141,11 @@ void kio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) { // permissions perm = nextWord(line); - bool isDir = ( perm.at(0).lower() == 'd' ); - bool isReadOnly = ( perm.at(1).lower() == 'r' ); + bool isDir = ( perm.tqat(0).lower() == 'd' ); + bool isReadOnly = ( perm.tqat(1).lower() == 'r' ); perm = isDir ? "drwxr-xr-x" : "-rw-r--r--"; if( isReadOnly ) - perm.at( 2 ) = '-'; + perm.tqat( 2 ) = '-'; mode = parsePermString(perm); @@ -1369,14 +1369,14 @@ bool kio_krarcProtocol::initArcParameters() { if( KStandardDirs::findExe(cmd).isEmpty() ){ error( KIO::ERR_CANNOT_LAUNCH_PROCESS, cmd+ - i18n("\nMake sure that the %1 binary are installed properly on your system.").arg(cmd)); + i18n("\nMake sure that the %1 binary are installed properly on your system.").tqarg(cmd)); KRDEBUG("Failed to find cmd: " << cmd); return false; } return true; } -bool kio_krarcProtocol::checkStatus( int exitCode ) { +bool kio_krarcProtocol::checktqStatus( int exitCode ) { KRDEBUG( exitCode ); if( arcType == "zip" || arcType == "rar" || arcType == "7z" ) diff --git a/krArc/krarc.h b/krArc/krarc.h index 98e4524..9ea56fd 100644 --- a/krArc/krarc.h +++ b/krArc/krarc.h @@ -70,7 +70,7 @@ protected: private: void get(const KURL& url, int tries); /** checks if the exit code is OK. */ - bool checkStatus( int exitCode ); + bool checktqStatus( int exitCode ); /** service function for parseLine. */ TQString nextWord(TQString &s,char d=' '); /** translate permittion string to mode_t. */ diff --git a/krusader/ActionMan/actionpropertybase.cpp b/krusader/ActionMan/actionpropertybase.cpp index d5fd5ea..9a53e76 100644 --- a/krusader/ActionMan/actionpropertybase.cpp +++ b/krusader/ActionMan/actionpropertybase.cpp @@ -26,7 +26,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <klistbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include "klineedit.h" @@ -57,17 +57,17 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tabLayout->addWidget( ButtonAddStartpath, 8, 3 ); LabelDescription = new TQLabel( tab, "LabelDescription" ); - LabelDescription->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, LabelDescription->sizePolicy().hasHeightForWidth() ) ); + LabelDescription->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, LabelDescription->sizePolicy().hasHeightForWidth() ) ); tabLayout->addWidget( LabelDescription, 4, 0 ); bgAccept = new TQButtonGroup( tab, "bgAccept" ); - bgAccept->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgAccept->sizePolicy().hasHeightForWidth() ) ); + bgAccept->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgAccept->sizePolicy().hasHeightForWidth() ) ); bgAccept->setColumnLayout(0, Qt::Vertical ); - bgAccept->layout()->setSpacing( 6 ); - bgAccept->layout()->setMargin( 11 ); - bgAcceptLayout = new TQGridLayout( bgAccept->layout() ); - bgAcceptLayout->setAlignment( TQt::AlignTop ); + bgAccept->tqlayout()->setSpacing( 6 ); + bgAccept->tqlayout()->setMargin( 11 ); + bgAcceptLayout = new TQGridLayout( bgAccept->tqlayout() ); + bgAcceptLayout->tqsetAlignment( TQt::AlignTop ); radioLocal = new TQRadioButton( bgAccept, "radioLocal" ); radioLocal->setChecked( TRUE ); @@ -85,37 +85,37 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tabLayout->addMultiCellWidget( leTitle, 2, 2, 1, 3 ); LabelTitle = new TQLabel( tab, "LabelTitle" ); - LabelTitle->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelTitle->sizePolicy().hasHeightForWidth() ) ); + LabelTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelTitle->sizePolicy().hasHeightForWidth() ) ); tabLayout->addWidget( LabelTitle, 2, 0 ); - layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); + tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); - layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); + tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); leDistinctName = new KLineEdit( tab, "leDistinctName" ); - layout2->addWidget( leDistinctName ); + tqlayout2->addWidget( leDistinctName ); cbCategory = new KComboBox( FALSE, tab, "cbCategory" ); cbCategory->setEditable( TRUE ); - layout2->addWidget( cbCategory ); - layout3->addLayout( layout2 ); + tqlayout2->addWidget( cbCategory ); + tqlayout3->addLayout( tqlayout2 ); ButtonIcon = new KIconButton( tab, "ButtonIcon" ); - ButtonIcon->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, ButtonIcon->sizePolicy().hasHeightForWidth() ) ); + ButtonIcon->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, ButtonIcon->sizePolicy().hasHeightForWidth() ) ); ButtonIcon->setMinimumSize( TQSize( 50, 50 ) ); ButtonIcon->setMaximumSize( TQSize( 50, 50 ) ); - layout3->addWidget( ButtonIcon ); + tqlayout3->addWidget( ButtonIcon ); - tabLayout->addMultiCellLayout( layout3, 0, 1, 1, 3 ); + tabLayout->addMultiCellLayout( tqlayout3, 0, 1, 1, 3 ); LabelDistinctName = new TQLabel( tab, "LabelDistinctName" ); - LabelDistinctName->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelDistinctName->sizePolicy().hasHeightForWidth() ) ); + LabelDistinctName->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelDistinctName->sizePolicy().hasHeightForWidth() ) ); tabLayout->addWidget( LabelDistinctName, 0, 0 ); LabelCommandline = new TQLabel( tab, "LabelCommandline" ); - LabelCommandline->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, LabelCommandline->sizePolicy().hasHeightForWidth() ) ); + LabelCommandline->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, LabelCommandline->sizePolicy().hasHeightForWidth() ) ); tabLayout->addWidget( LabelCommandline, 7, 0 ); @@ -128,7 +128,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tabLayout->addMultiCellWidget( leStartpath, 8, 8, 1, 2 ); LabelTooltip = new TQLabel( tab, "LabelTooltip" ); - LabelTooltip->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelTooltip->sizePolicy().hasHeightForWidth() ) ); + LabelTooltip->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelTooltip->sizePolicy().hasHeightForWidth() ) ); tabLayout->addWidget( LabelTooltip, 3, 0 ); @@ -137,12 +137,12 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tabLayout->addMultiCellWidget( leCommandline, 7, 7, 1, 2 ); LabelCategory = new TQLabel( tab, "LabelCategory" ); - LabelCategory->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelCategory->sizePolicy().hasHeightForWidth() ) ); + LabelCategory->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelCategory->sizePolicy().hasHeightForWidth() ) ); tabLayout->addWidget( LabelCategory, 1, 0 ); ButtonAddPlaceholder = new TQToolButton( tab, "ButtonAddPlaceholder" ); - ButtonAddPlaceholder->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, ButtonAddPlaceholder->sizePolicy().hasHeightForWidth() ) ); + ButtonAddPlaceholder->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, ButtonAddPlaceholder->sizePolicy().hasHeightForWidth() ) ); ButtonAddPlaceholder->setMinimumSize( TQSize( 0, 0 ) ); tabLayout->addWidget( ButtonAddPlaceholder, 7, 3 ); @@ -153,31 +153,31 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tabLayout->addMultiCellWidget( textDescription, 4, 6, 1, 3 ); LabelStartpath = new TQLabel( tab, "LabelStartpath" ); - LabelStartpath->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, LabelStartpath->sizePolicy().hasHeightForWidth() ) ); + LabelStartpath->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, LabelStartpath->sizePolicy().hasHeightForWidth() ) ); tabLayout->addWidget( LabelStartpath, 8, 0 ); spacer = new TQSpacerItem( 80, 19, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout->addItem( spacer, 6, 0 ); - layout4 = new TQHBoxLayout( 0, 0, 6, "layout4"); + tqlayout4 = new TQHBoxLayout( 0, 0, 6, "tqlayout4"); LabelShortcut = new TQLabel( tab, "LabelShortcut" ); - layout4->addWidget( LabelShortcut ); + tqlayout4->addWidget( LabelShortcut ); spacer6_2 = new TQSpacerItem( 161, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - layout4->addItem( spacer6_2 ); + tqlayout4->addItem( spacer6_2 ); KeyButtonShortcut = new KKeyButton( tab, "KeyButtonShortcut" ); - layout4->addWidget( KeyButtonShortcut ); + tqlayout4->addWidget( KeyButtonShortcut ); - tabLayout->addMultiCellLayout( layout4, 10, 10, 2, 3 ); + tabLayout->addMultiCellLayout( tqlayout4, 10, 10, 2, 3 ); bgExecType = new TQButtonGroup( tab, "bgExecType" ); - bgExecType->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgExecType->sizePolicy().hasHeightForWidth() ) ); + bgExecType->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgExecType->sizePolicy().hasHeightForWidth() ) ); bgExecType->setColumnLayout(0, Qt::Vertical ); - bgExecType->layout()->setSpacing( 6 ); - bgExecType->layout()->setMargin( 11 ); - bgExecTypeLayout = new TQGridLayout( bgExecType->layout() ); - bgExecTypeLayout->setAlignment( TQt::AlignTop ); + bgExecType->tqlayout()->setSpacing( 6 ); + bgExecType->tqlayout()->setMargin( 11 ); + bgExecTypeLayout = new TQGridLayout( bgExecType->tqlayout() ); + bgExecTypeLayout->tqsetAlignment( TQt::AlignTop ); radioCollectOutput = new TQRadioButton( bgExecType, "radioCollectOutput" ); @@ -198,18 +198,18 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla bgExecTypeLayout->addWidget( radioTerminal, 1, 0 ); tabLayout->addMultiCellWidget( bgExecType, 9, 10, 0, 1 ); - tabWidget3->insertTab( tab, TQString::fromLatin1("") ); + tabWidget3->insertTab( tab, TQString::tqfromLatin1("") ); tab_2 = new TQWidget( tabWidget3, "tab_2" ); tabLayout_2 = new TQGridLayout( tab_2, 1, 1, 11, 6, "tabLayout_2"); gbShowonly = new TQGroupBox( tab_2, "gbShowonly" ); - gbShowonly->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, gbShowonly->sizePolicy().hasHeightForWidth() ) ); + gbShowonly->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, gbShowonly->sizePolicy().hasHeightForWidth() ) ); gbShowonly->setColumnLayout(0, Qt::Vertical ); - gbShowonly->layout()->setSpacing( 6 ); - gbShowonly->layout()->setMargin( 11 ); - gbShowonlyLayout = new TQGridLayout( gbShowonly->layout() ); - gbShowonlyLayout->setAlignment( TQt::AlignTop ); + gbShowonly->tqlayout()->setSpacing( 6 ); + gbShowonly->tqlayout()->setMargin( 11 ); + gbShowonlyLayout = new TQGridLayout( gbShowonly->tqlayout() ); + gbShowonlyLayout->tqsetAlignment( TQt::AlignTop ); tabShowonly = new TQTabWidget( gbShowonly, "tabShowonly" ); tabShowonly->setTabPosition( TQTabWidget::Top ); @@ -219,14 +219,14 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla TabPageLayout = new TQGridLayout( TabPage, 1, 1, 11, 6, "TabPageLayout"); ButtonNewProtocol = new TQToolButton( TabPage, "ButtonNewProtocol" ); - ButtonNewProtocol->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonNewProtocol->sizePolicy().hasHeightForWidth() ) ); + ButtonNewProtocol->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonNewProtocol->sizePolicy().hasHeightForWidth() ) ); ButtonNewProtocol->setMinimumSize( TQSize( 0, 0 ) ); ButtonNewProtocol->setMaximumSize( TQSize( 32767, 32767 ) ); TabPageLayout->addWidget( ButtonNewProtocol, 0, 1 ); ButtonEditProtocol = new TQToolButton( TabPage, "ButtonEditProtocol" ); - ButtonEditProtocol->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditProtocol->sizePolicy().hasHeightForWidth() ) ); + ButtonEditProtocol->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditProtocol->sizePolicy().hasHeightForWidth() ) ); ButtonEditProtocol->setMinimumSize( TQSize( 0, 0 ) ); ButtonEditProtocol->setMaximumSize( TQSize( 32767, 32767 ) ); @@ -235,7 +235,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla TabPageLayout->addItem( spacer6_3, 3, 1 ); ButtonRemoveProtocol = new TQToolButton( TabPage, "ButtonRemoveProtocol" ); - ButtonRemoveProtocol->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemoveProtocol->sizePolicy().hasHeightForWidth() ) ); + ButtonRemoveProtocol->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemoveProtocol->sizePolicy().hasHeightForWidth() ) ); ButtonRemoveProtocol->setMinimumSize( TQSize( 0, 0 ) ); ButtonRemoveProtocol->setMaximumSize( TQSize( 32767, 32767 ) ); @@ -244,7 +244,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla lbShowonlyProtocol = new KListBox( TabPage, "lbShowonlyProtocol" ); TabPageLayout->addMultiCellWidget( lbShowonlyProtocol, 0, 3, 0, 0 ); - tabShowonly->insertTab( TabPage, TQString::fromLatin1("") ); + tabShowonly->insertTab( TabPage, TQString::tqfromLatin1("") ); tab_3 = new TQWidget( tabShowonly, "tab_3" ); tabLayout_3 = new TQGridLayout( tab_3, 1, 1, 11, 6, "tabLayout_3"); @@ -254,28 +254,28 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tabLayout_3->addMultiCellWidget( lbShowonlyPath, 0, 3, 0, 0 ); ButtonAddPath = new TQToolButton( tab_3, "ButtonAddPath" ); - ButtonAddPath->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonAddPath->sizePolicy().hasHeightForWidth() ) ); + ButtonAddPath->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonAddPath->sizePolicy().hasHeightForWidth() ) ); ButtonAddPath->setMinimumSize( TQSize( 0, 0 ) ); ButtonAddPath->setMaximumSize( TQSize( 32767, 32767 ) ); tabLayout_3->addWidget( ButtonAddPath, 0, 1 ); ButtonEditPath = new TQToolButton( tab_3, "ButtonEditPath" ); - ButtonEditPath->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditPath->sizePolicy().hasHeightForWidth() ) ); + ButtonEditPath->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditPath->sizePolicy().hasHeightForWidth() ) ); ButtonEditPath->setMinimumSize( TQSize( 0, 0 ) ); ButtonEditPath->setMaximumSize( TQSize( 32767, 32767 ) ); tabLayout_3->addWidget( ButtonEditPath, 1, 1 ); ButtonRemovePath = new TQToolButton( tab_3, "ButtonRemovePath" ); - ButtonRemovePath->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemovePath->sizePolicy().hasHeightForWidth() ) ); + ButtonRemovePath->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemovePath->sizePolicy().hasHeightForWidth() ) ); ButtonRemovePath->setMinimumSize( TQSize( 0, 0 ) ); ButtonRemovePath->setMaximumSize( TQSize( 32767, 32767 ) ); tabLayout_3->addWidget( ButtonRemovePath, 2, 1 ); spacer4 = new TQSpacerItem( 21, 61, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout_3->addItem( spacer4, 3, 1 ); - tabShowonly->insertTab( tab_3, TQString::fromLatin1("") ); + tabShowonly->insertTab( tab_3, TQString::tqfromLatin1("") ); tab_4 = new TQWidget( tabShowonly, "tab_4" ); tabLayout_4 = new TQGridLayout( tab_4, 1, 1, 11, 6, "tabLayout_4"); @@ -285,28 +285,28 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tabLayout_4->addMultiCellWidget( lbShowonlyMime, 0, 3, 0, 0 ); ButtonAddMime = new TQToolButton( tab_4, "ButtonAddMime" ); - ButtonAddMime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonAddMime->sizePolicy().hasHeightForWidth() ) ); + ButtonAddMime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonAddMime->sizePolicy().hasHeightForWidth() ) ); ButtonAddMime->setMinimumSize( TQSize( 0, 0 ) ); ButtonAddMime->setMaximumSize( TQSize( 32767, 32767 ) ); tabLayout_4->addWidget( ButtonAddMime, 0, 1 ); ButtonEditMime = new TQToolButton( tab_4, "ButtonEditMime" ); - ButtonEditMime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditMime->sizePolicy().hasHeightForWidth() ) ); + ButtonEditMime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditMime->sizePolicy().hasHeightForWidth() ) ); ButtonEditMime->setMinimumSize( TQSize( 0, 0 ) ); ButtonEditMime->setMaximumSize( TQSize( 32767, 32767 ) ); tabLayout_4->addWidget( ButtonEditMime, 1, 1 ); ButtonRemoveMime = new TQToolButton( tab_4, "ButtonRemoveMime" ); - ButtonRemoveMime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemoveMime->sizePolicy().hasHeightForWidth() ) ); + ButtonRemoveMime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemoveMime->sizePolicy().hasHeightForWidth() ) ); ButtonRemoveMime->setMinimumSize( TQSize( 0, 0 ) ); ButtonRemoveMime->setMaximumSize( TQSize( 32767, 32767 ) ); tabLayout_4->addWidget( ButtonRemoveMime, 2, 1 ); spacer5 = new TQSpacerItem( 21, 41, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout_4->addItem( spacer5, 3, 1 ); - tabShowonly->insertTab( tab_4, TQString::fromLatin1("") ); + tabShowonly->insertTab( tab_4, TQString::tqfromLatin1("") ); TabPage_2 = new TQWidget( tabShowonly, "TabPage_2" ); TabPageLayout_2 = new TQGridLayout( TabPage_2, 1, 1, 11, 6, "TabPageLayout_2"); @@ -316,28 +316,28 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla TabPageLayout_2->addMultiCellWidget( lbShowonlyFile, 0, 3, 0, 0 ); ButtonNewFile = new TQToolButton( TabPage_2, "ButtonNewFile" ); - ButtonNewFile->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonNewFile->sizePolicy().hasHeightForWidth() ) ); + ButtonNewFile->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonNewFile->sizePolicy().hasHeightForWidth() ) ); ButtonNewFile->setMinimumSize( TQSize( 0, 0 ) ); ButtonNewFile->setMaximumSize( TQSize( 32767, 32767 ) ); TabPageLayout_2->addWidget( ButtonNewFile, 0, 1 ); ButtonEditFile = new TQToolButton( TabPage_2, "ButtonEditFile" ); - ButtonEditFile->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditFile->sizePolicy().hasHeightForWidth() ) ); + ButtonEditFile->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditFile->sizePolicy().hasHeightForWidth() ) ); ButtonEditFile->setMinimumSize( TQSize( 0, 0 ) ); ButtonEditFile->setMaximumSize( TQSize( 32767, 32767 ) ); TabPageLayout_2->addWidget( ButtonEditFile, 1, 1 ); ButtonRemoveFile = new TQToolButton( TabPage_2, "ButtonRemoveFile" ); - ButtonRemoveFile->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemoveFile->sizePolicy().hasHeightForWidth() ) ); + ButtonRemoveFile->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemoveFile->sizePolicy().hasHeightForWidth() ) ); ButtonRemoveFile->setMinimumSize( TQSize( 0, 0 ) ); ButtonRemoveFile->setMaximumSize( TQSize( 32767, 32767 ) ); TabPageLayout_2->addWidget( ButtonRemoveFile, 2, 1 ); spacer6 = new TQSpacerItem( 21, 41, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); TabPageLayout_2->addItem( spacer6, 3, 1 ); - tabShowonly->insertTab( TabPage_2, TQString::fromLatin1("") ); + tabShowonly->insertTab( TabPage_2, TQString::tqfromLatin1("") ); gbShowonlyLayout->addWidget( tabShowonly, 0, 0 ); @@ -357,11 +357,11 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tabLayout_2->addWidget( leDifferentUser, 2, 1 ); spacer3 = new TQSpacerItem( 161, 102, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout_2->addMultiCell( spacer3, 3, 3, 0, 1 ); - tabWidget3->insertTab( tab_2, TQString::fromLatin1("") ); + tabWidget3->insertTab( tab_2, TQString::tqfromLatin1("") ); ActionPropertyBaseLayout->addWidget( tabWidget3, 0, 0 ); languageChange(); - resize( TQSize(485, 470).expandedTo(minimumSizeHint()) ); + resize( TQSize(485, 470).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/krusader/ActionMan/actionpropertybase.ui b/krusader/ActionMan/actionpropertybase.ui index 9ecfd94..0c6f47a 100644 --- a/krusader/ActionMan/actionpropertybase.ui +++ b/krusader/ActionMan/actionpropertybase.ui @@ -142,7 +142,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="3"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -150,7 +150,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> @@ -189,13 +189,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>50</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>50</height> @@ -328,7 +328,7 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -381,7 +381,7 @@ Please consult the handbook to learn more about the syntax.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>19</height> @@ -390,7 +390,7 @@ Please consult the handbook to learn more about the syntax.</string> </spacer> <widget class="TQLayoutWidget" row="10" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -414,7 +414,7 @@ Please consult the handbook to learn more about the syntax.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>161</width> <height>21</height> @@ -567,13 +567,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -595,13 +595,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -621,7 +621,7 @@ Please consult the handbook to learn more about the syntax.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>58</height> @@ -640,13 +640,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -697,13 +697,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -725,13 +725,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -753,13 +753,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -779,7 +779,7 @@ Please consult the handbook to learn more about the syntax.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>61</height> @@ -819,13 +819,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -847,13 +847,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -875,13 +875,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -901,7 +901,7 @@ Please consult the handbook to learn more about the syntax.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>41</height> @@ -941,13 +941,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -969,13 +969,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -997,13 +997,13 @@ Please consult the handbook to learn more about the syntax.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -1023,7 +1023,7 @@ Please consult the handbook to learn more about the syntax.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>41</height> @@ -1078,7 +1078,7 @@ Please consult the handbook to learn more about the syntax.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>161</width> <height>102</height> diff --git a/krusader/ActionMan/addplaceholderpopup.cpp b/krusader/ActionMan/addplaceholderpopup.cpp index c7db052..983c39e 100644 --- a/krusader/ActionMan/addplaceholderpopup.cpp +++ b/krusader/ActionMan/addplaceholderpopup.cpp @@ -23,7 +23,7 @@ #include "../BookMan/krbookmarkbutton.h" #include "../GUI/profilemanager.h" -#include <layout.h> +#include <tqlayout.h> #include <tqhbox.h> #include <tqlabel.h> #include <tqtoolbutton.h> @@ -136,9 +136,9 @@ ParameterDialog::ParameterDialog( const exp_placeholder* currentPlaceholder, TQW _parameter.clear(); _parameterCount = currentPlaceholder->parameterCount(); - TQVBoxLayout* layout = new TQVBoxLayout( plainPage() ); - layout->setAutoAdd( true ); - layout->setSpacing( 11 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage() ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 11 ); new TQLabel( i18n("This placeholder allows some parameter:"), plainPage(), "intro" ); @@ -220,9 +220,9 @@ void ParameterDialog::slotOk() { ///////////// ParameterText ParameterText::ParameterText( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _lineEdit = new KLineEdit( parameter.preset(), this ); @@ -247,9 +247,9 @@ bool ParameterText::valid() { ///////////// ParameterPlaceholder ParameterPlaceholder::ParameterPlaceholder( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); TQHBox * hbox = new TQHBox( this ); @@ -284,9 +284,9 @@ void ParameterPlaceholder::addPlaceholder() { ///////////// ParameterYes ParameterYes::ParameterYes( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); _checkBox = new TQCheckBox( i18n( parameter.description().utf8() ), this ); _checkBox->setChecked( true ); @@ -310,9 +310,9 @@ bool ParameterYes::valid() { ///////////// ParameterNo ParameterNo::ParameterNo( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); _checkBox = new TQCheckBox( i18n( parameter.description().utf8() ), this ); _checkBox->setChecked( false ); @@ -336,9 +336,9 @@ bool ParameterNo::valid() { ///////////// ParameterFile ParameterFile::ParameterFile( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); TQHBox * hbox = new TQHBox( this ); @@ -372,9 +372,9 @@ void ParameterFile::addFile() { ///////////// ParameterChoose ParameterChoose::ParameterChoose( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); @@ -396,9 +396,9 @@ bool ParameterChoose::valid() { ///////////// ParameterSelect ParameterSelect::ParameterSelect( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); @@ -428,9 +428,9 @@ bool ParameterSelect::valid() { ///////////// ParameterGoto ParameterGoto::ParameterGoto( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); TQHBox * hbox = new TQHBox( this ); @@ -474,9 +474,9 @@ void ParameterGoto::addPlaceholder() { ///////////// ParameterSyncprofile ParameterSyncprofile::ParameterSyncprofile( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); @@ -499,9 +499,9 @@ bool ParameterSyncprofile::valid() { ///////////// ParameterSearch ParameterSearch::ParameterSearch( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); @@ -524,9 +524,9 @@ bool ParameterSearch::valid() { ///////////// ParameterPanelprofile ParameterPanelprofile::ParameterPanelprofile( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); @@ -549,9 +549,9 @@ bool ParameterPanelprofile::valid() { ///////////// ParameterInt ParameterInt::ParameterInt( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQHBoxLayout* layout = new TQHBoxLayout( this ); - layout->setAutoAdd( true ); - layout->setSpacing( 6 ); + TQHBoxLayout* tqlayout = new TQHBoxLayout( this ); + tqlayout->setAutoAdd( true ); + tqlayout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _spinbox = new KIntSpinBox( this ); @@ -569,7 +569,7 @@ TQString ParameterInt::text() { return _spinbox->text(); } TQString ParameterInt::preset() { - return TQString( "%1" ).arg( _default ); + return TQString( "%1" ).tqarg( _default ); } void ParameterInt::reset() { return _spinbox->setValue( _default ); diff --git a/krusader/ActionMan/useractionlistview.cpp b/krusader/ActionMan/useractionlistview.cpp index f129ea0..aa910e8 100644 --- a/krusader/ActionMan/useractionlistview.cpp +++ b/krusader/ActionMan/useractionlistview.cpp @@ -46,7 +46,7 @@ UserActionListView::~UserActionListView() { } -TQSize UserActionListView::sizeHint() const { +TQSize UserActionListView::tqsizeHint() const { return TQSize(200, 400); } diff --git a/krusader/ActionMan/useractionlistview.h b/krusader/ActionMan/useractionlistview.h index 2fc0f94..e05e42e 100644 --- a/krusader/ActionMan/useractionlistview.h +++ b/krusader/ActionMan/useractionlistview.h @@ -26,7 +26,7 @@ class UserActionListView : public KListView { public: UserActionListView( TQWidget* parent = 0, const char* name = 0 ); ~UserActionListView(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; void update(); void update( KrAction* action ); diff --git a/krusader/ActionMan/useractionpage.cpp b/krusader/ActionMan/useractionpage.cpp index 7e0cf1a..86c49f7 100644 --- a/krusader/ActionMan/useractionpage.cpp +++ b/krusader/ActionMan/useractionpage.cpp @@ -12,7 +12,7 @@ #include "useractionpage.h" #include <tqsplitter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtoolbutton.h> #include <tqtooltip.h> #include <klineedit.h> @@ -37,10 +37,10 @@ static const char* FILE_FILTER = I18N_NOOP("*.xml|xml-files\n*|all files"); UserActionPage::UserActionPage( TQWidget* parent ) : TQWidget( parent, "UserActionPage" ) { - TQVBoxLayout* layout = new TQVBoxLayout( this, 0, 6, "UserActionPageLayout" ); // 0px margin, 6px item-spacing + TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, 6, "UserActionPageLayout" ); // 0px margin, 6px item-spacing // ======== pseudo-toolbar start ======== - TQHBoxLayout* toolbarLayout = new TQHBoxLayout( layout, 0, 0 ); // neither margin nor spacing for the toolbar with autoRaise + TQHBoxLayout* toolbarLayout = new TQHBoxLayout( tqlayout, 0, 0 ); // neither margin nor spacing for the toolbar with autoRaise newButton = new TQToolButton( this, "newButton" ); newButton->setPixmap( ICON("filenew") ); @@ -93,7 +93,7 @@ UserActionPage::UserActionPage( TQWidget* parent ) ); */ TQSplitter *split = new TQSplitter( this, "useractionpage splitter"); - layout->addWidget( split, 1000 ); // again a very large stretch-factor to fix the height of the toolbar + tqlayout->addWidget( split, 1000 ); // again a very large stretch-factor to fix the height of the toolbar actionTree = new UserActionListView( split, "actionTree" ); actionProperties = new ActionProperty( split, "actionProperties" ); @@ -268,7 +268,7 @@ void UserActionPage::slotExport() { bool success = UserAction::writeToFile( doc, filename ); if ( ! success ) KMessageBox::error( this, - i18n("Can't open %1 for writing!\nNothing exported.").arg(filename), + i18n("Can't open %1 for writing!\nNothing exported.").tqarg(filename), i18n("Export failed!") ); } @@ -278,12 +278,12 @@ void UserActionPage::slotToClip() { return; TQDomDocument doc = actionTree->dumpSelectedActions(); - KApplication::clipboard()->setText( doc.toString() ); + KApplication::tqclipboard()->setText( doc.toString() ); } void UserActionPage::slotFromClip() { TQDomDocument doc( ACTION_DOCTYPE ); - if ( doc.setContent( KApplication::clipboard()->text() ) ) { + if ( doc.setContent( KApplication::tqclipboard()->text() ) ) { TQDomElement root = doc.documentElement(); UserAction::KrActionList newActions; krUserAction->readFromElement( root, UserAction::renameDoublicated, &newActions ); diff --git a/krusader/BookMan/kraddbookmarkdlg.cpp b/krusader/BookMan/kraddbookmarkdlg.cpp index fbbab35..e6f5032 100644 --- a/krusader/BookMan/kraddbookmarkdlg.cpp +++ b/krusader/BookMan/kraddbookmarkdlg.cpp @@ -3,7 +3,7 @@ #include "krbookmarkhandler.h" #include <klocale.h> #include <tqheader.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <kinputdialog.h> #include <kiconloader.h> @@ -21,33 +21,33 @@ KrAddBookmarkDlg::KrAddBookmarkDlg(TQWidget *parent, KURL url): TQWidget *page = new TQWidget(this); setMainWidget(page); - TQGridLayout *layout = new TQGridLayout(page, 1, 1, 0, spacingHint()); // expanding + TQGridLayout *tqlayout = new TQGridLayout(page, 1, 1, 0, spacingHint()); // expanding // name and url TQLabel *lb1 = new TQLabel(i18n("Name:"), page); _name = new KLineEdit(page); _name->setText(url.prettyURL()); // default name is the url _name->selectAll(); // make the text selected - layout->addWidget(lb1, 0, 0); - layout->addWidget(_name, 0, 1); + tqlayout->addWidget(lb1, 0, 0); + tqlayout->addWidget(_name, 0, 1); TQLabel *lb2 = new TQLabel(i18n("URL:"), page); _url = new KLineEdit(page); - layout->addWidget(lb2, 1, 0); - layout->addWidget(_url, 1, 1); + tqlayout->addWidget(lb2, 1, 0); + tqlayout->addWidget(_url, 1, 1); _url->setText(url.prettyURL()); // set the url in the field // create in linedit and button TQLabel *lb3 = new TQLabel(i18n("Create in:"), page); _folder = new KLineEdit(page); - layout->addWidget(lb3, 2, 0); - layout->addWidget(_folder, 2, 1); + tqlayout->addWidget(lb3, 2, 0); + tqlayout->addWidget(_folder, 2, 1); _folder->setReadOnly(true); _createInBtn = new TQToolButton(page); _createInBtn->setPixmap(krLoader->loadIcon("down", KIcon::Small)); _createInBtn->setToggleButton(true); connect(_createInBtn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleCreateIn(bool ))); - layout->addWidget(_createInBtn, 2, 2); + tqlayout->addWidget(_createInBtn, 2, 2); setDetailsWidget(createInWidget()); @@ -88,7 +88,7 @@ void KrAddBookmarkDlg::createInSelection(TQListViewItem *item) { } void KrAddBookmarkDlg::populateCreateInWidget(KrBookmark *root, KListViewItem *parent) { - for (KrBookmark *bm = root->children().first(); bm; bm = root->children().next()) { + for (KrBookmark *bm = root->tqchildren().first(); bm; bm = root->tqchildren().next()) { if (bm->isFolder()) { KListViewItem *item = new KListViewItem(parent, bm->text()); item->setOpen(true); diff --git a/krusader/BookMan/krbookmark.cpp b/krusader/BookMan/krbookmark.cpp index 6a05606..4b664c7 100644 --- a/krusader/BookMan/krbookmark.cpp +++ b/krusader/BookMan/krbookmark.cpp @@ -34,7 +34,7 @@ KrBookmark::KrBookmark(TQString name, KURL url, KActionCollection *parent, TQStr } } - _children.setAutoDelete(true); + _tqchildren.setAutoDelete(true); } KrBookmark::KrBookmark(TQString name, TQString icon): diff --git a/krusader/BookMan/krbookmark.h b/krusader/BookMan/krbookmark.h index 1cf5c71..5f27094 100644 --- a/krusader/BookMan/krbookmark.h +++ b/krusader/BookMan/krbookmark.h @@ -19,7 +19,7 @@ public: inline void setURL(const KURL& url) { _url = url; } inline bool isFolder() const { return _folder; } inline bool isSeparator() const { return _separator; } - TQPtrList<KrBookmark>& children() { return _children; } + TQPtrList<KrBookmark>& tqchildren() { return _tqchildren; } static KrBookmark* getExistingBookmark(TQString actionName, KActionCollection *collection); // ----- special bookmarks @@ -40,7 +40,7 @@ private: TQString _icon; bool _folder; bool _separator; - TQPtrList<KrBookmark> _children; + TQPtrList<KrBookmark> _tqchildren; }; #endif // KRBOOKMARK_H diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp index 980f049..b6e7a99 100644 --- a/krusader/BookMan/krbookmarkhandler.cpp +++ b/krusader/BookMan/krbookmarkhandler.cpp @@ -68,7 +68,7 @@ void KrBookmarkHandler::addBookmark(KrBookmark *bm, KrBookmark *folder) { folder = _root; // add to the list (bottom) - folder->children().append(bm); + folder->tqchildren().append(bm); exportToFile(); } @@ -84,15 +84,15 @@ void KrBookmarkHandler::deleteBookmark(KrBookmark *bm) { } void KrBookmarkHandler::removeReferences( KrBookmark *root, KrBookmark *bmToRemove ) { - int index = root->children().find( bmToRemove ); + int index = root->tqchildren().find( bmToRemove ); if( index >= 0 ) - root->children().take( index ); + root->tqchildren().take( index ); - KrBookmark *bm = root->children().first(); + KrBookmark *bm = root->tqchildren().first(); while (bm) { if (bm->isFolder()) removeReferences(bm, bmToRemove); - bm = root->children().next(); + bm = root->tqchildren().next(); } } @@ -117,7 +117,7 @@ void KrBookmarkHandler::exportToFileBookmark(TQDomDocument &doc, TQDomElement &w } void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &parent, KrBookmark *folder) { - for (KrBookmark *bm = folder->children().first(); bm; bm = folder->children().next()) { + for (KrBookmark *bm = folder->tqchildren().first(); bm; bm = folder->tqchildren().next()) { if (bm->isFolder()) { TQDomElement newFolder = doc.createElement("folder"); newFolder.setAttribute("icon", bm->icon()); @@ -169,7 +169,7 @@ void KrBookmarkHandler::exportToFile() { stream << doc.toString(); file.close(); } else { - KMessageBox::error(krApp, i18n("Unable to write to %1").arg(filename), i18n("Error")); + KMessageBox::error(krApp, i18n("Unable to write to %1").tqarg(filename), i18n("Error")); } } @@ -199,7 +199,7 @@ bool KrBookmarkHandler::importFromFileBookmark(TQDomElement &e, KrBookmark *pare KrBookmark *bm = KrBookmark::getExistingBookmark(path+name, _collection); if (!bm) { bm = new KrBookmark(name, vfs::fromPathOrURL( url ), _collection, icon, path+name); - parent->children().append(bm); + parent->tqchildren().append(bm); } return true; @@ -223,13 +223,13 @@ bool KrBookmarkHandler::importFromFileFolder(TQDomNode &first, KrBookmark *paren return false; } else name = tmp.text(); KrBookmark *folder = new KrBookmark(name, iconName); - parent->children().append(folder); + parent->tqchildren().append(folder); TQDomNode nextOne = tmp.nextSibling(); if (!importFromFileFolder(nextOne, folder, path + name + "/", errorMsg)) return false; } else if (e.tagName() == "separator") { - parent->children().append(KrBookmark::separator()); + parent->tqchildren().append(KrBookmark::separator()); } n = n.nextSibling(); } @@ -258,14 +258,14 @@ void KrBookmarkHandler::importFromFile() { n = n.nextSibling(); if (n.isNull() || n.toElement().tagName()!="xbel") { - errorMsg = i18n("%1 doesn't seem to be a valid Bookmarks file").arg(filename); + errorMsg = i18n("%1 doesn't seem to be a valid Bookmarks file").tqarg(filename); goto ERROR; } else n = n.firstChild(); // skip the xbel part importFromFileFolder(n, _root, "", &errorMsg); goto SUCCESS; ERROR: - KMessageBox::error(krApp, i18n("Error reading bookmarks file: %1").arg(errorMsg), i18n( "Error" )); + KMessageBox::error(krApp, i18n("Error reading bookmarks file: %1").tqarg(errorMsg), i18n( "Error" )); SUCCESS: file.close(); @@ -284,7 +284,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) { // run the loop twice, in order to put the folders on top. stupid but easy :-) // note: this code drops the separators put there by the user - for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) { + for (KrBookmark *bm = parent->tqchildren().first(); bm; bm = parent->tqchildren().next()) { if (!bm->isFolder()) continue; KPopupMenu *newMenu = new KPopupMenu(menu); int id = menu->insertItem(TQIconSet(krLoader->loadIcon(bm->icon(), KIcon::Small)), @@ -298,7 +298,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) { buildMenu(bm, newMenu); --inSecondaryMenu; } - for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) { + for (KrBookmark *bm = parent->tqchildren().first(); bm; bm = parent->tqchildren().next()) { if (bm->isFolder()) continue; if (bm->isSeparator() ) { menu->insertSeparator(); @@ -411,7 +411,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) { } void KrBookmarkHandler::clearBookmarks(KrBookmark *root) { - KrBookmark *bm = root->children().first(); + KrBookmark *bm = root->tqchildren().first(); while (bm) { if (bm->isFolder()) clearBookmarks(bm); @@ -420,9 +420,9 @@ void KrBookmarkHandler::clearBookmarks(KrBookmark *root) { delete bm; } - bm = root->children().next(); + bm = root->tqchildren().next(); } - root->children().clear(); + root->tqchildren().clear(); } void KrBookmarkHandler::bookmarksChanged(const TQString&, const TQString&) { diff --git a/krusader/Dialogs/checksumdlg.cpp b/krusader/Dialogs/checksumdlg.cpp index f2e75ae..ed76eaa 100644 --- a/krusader/Dialogs/checksumdlg.cpp +++ b/krusader/Dialogs/checksumdlg.cpp @@ -1,7 +1,7 @@ #include "checksumdlg.h" #include "../krusader.h" #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <klineedit.h> @@ -10,7 +10,7 @@ #include <kcursor.h> #include <kmessagebox.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kfiledialog.h> #include <tqframe.h> #include <kiconloader.h> @@ -222,40 +222,40 @@ CreateChecksumDlg::CreateChecksumDlg(const TQStringList& files, bool containFold return; } - TQGridLayout *layout = new TQGridLayout( plainPage(), 1, 1, + TQGridLayout *tqlayout = new TQGridLayout( plainPage(), 1, 1, KDialogBase::marginHint(), KDialogBase::spacingHint()); int row=0; // title (icon+text) - TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); TQLabel *p = new TQLabel(plainPage()); p->setPixmap(krLoader->loadIcon("binary", KIcon::Desktop, 32)); - hlayout->addWidget(p); + htqlayout->addWidget(p); TQLabel *l1 = new TQLabel(i18n("About to calculate checksum for the following files") + (containFolders ? i18n(" and folders:") : ":"), plainPage()); - hlayout->addWidget(l1); - layout->addMultiCellLayout(hlayout, row, row, 0, 1, TQt::AlignLeft); + htqlayout->addWidget(l1); + tqlayout->addMultiCellLayout(htqlayout, row, row, 0, 1, TQt::AlignLeft); ++row; // file list KListBox *lb = new KListBox(plainPage()); lb->insertStringList(files); - layout->addMultiCellWidget(lb, row, row, 0, 1); + tqlayout->addMultiCellWidget(lb, row, row, 0, 1); ++row; // checksum method - TQHBoxLayout *hlayout2 = new TQHBoxLayout(layout, KDialogBase::spacingHint()); + TQHBoxLayout *htqlayout2 = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); TQLabel *l2 = new TQLabel(i18n("Select the checksum method:"), plainPage()); - hlayout2->addWidget(l2); + htqlayout2->addWidget(l2); KComboBox *method = new KComboBox(plainPage()); // -- fill the combo with available methods uint i; for ( i=0; i<tools.count(); ++i ) method->insertItem( cs_typeToText[tools.at(i)->type], i); method->setFocus(); - hlayout2->addWidget(method); - layout->addMultiCellLayout(hlayout2, row, row, 0, 1, TQt::AlignLeft); + htqlayout2->addWidget(method); + tqlayout->addMultiCellLayout(htqlayout2, row, row, 0, 1, TQt::AlignLeft); ++row; if (exec() != Accepted) return; @@ -282,7 +282,7 @@ CreateChecksumDlg::CreateChecksumDlg(const TQStringList& files, bool containFold krApp->stopWait(); TQApplication::restoreOverrideCursor(); if (!r || !proc.normalExit()) { - KMessageBox::error(0, i18n("<qt>There was an error while running <b>%1</b>.</qt>").arg(mytool->binary)); + KMessageBox::error(0, i18n("<qt>There was an error while running <b>%1</b>.</qt>").tqarg(mytool->binary)); return; } @@ -323,45 +323,45 @@ MatchChecksumDlg::MatchChecksumDlg(const TQStringList& files, bool containFolder return; } - TQGridLayout *layout = new TQGridLayout( plainPage(), 1, 1, + TQGridLayout *tqlayout = new TQGridLayout( plainPage(), 1, 1, KDialogBase::marginHint(), KDialogBase::spacingHint()); int row=0; // title (icon+text) - TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); TQLabel *p = new TQLabel(plainPage()); p->setPixmap(krLoader->loadIcon("binary", KIcon::Desktop, 32)); - hlayout->addWidget(p); + htqlayout->addWidget(p); TQLabel *l1 = new TQLabel(i18n("About to verify checksum for the following files") + (containFolders ? i18n(" and folders:") : ":"), plainPage()); - hlayout->addWidget(l1); - layout->addMultiCellLayout(hlayout, row, row, 0, 1, TQt::AlignLeft); + htqlayout->addWidget(l1); + tqlayout->addMultiCellLayout(htqlayout, row, row, 0, 1, TQt::AlignLeft); ++row; // file list KListBox *lb = new KListBox(plainPage()); lb->insertStringList(files); - layout->addMultiCellWidget(lb, row, row, 0, 1); + tqlayout->addMultiCellWidget(lb, row, row, 0, 1); ++row; // checksum file - TQHBoxLayout *hlayout2 = new TQHBoxLayout(layout, KDialogBase::spacingHint()); + TQHBoxLayout *htqlayout2 = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); TQLabel *l2 = new TQLabel(i18n("Checksum file:"), plainPage()); - hlayout2->addWidget(l2); + htqlayout2->addWidget(l2); KURLRequester *checksumFileReq = new KURLRequester( plainPage() ); if (!checksumFile.isEmpty()) checksumFileReq->setURL(checksumFile); checksumFileReq->fileDialog()->setURL(path); checksumFileReq->setFocus(); - hlayout2->addWidget(checksumFileReq); - layout->addMultiCellLayout(hlayout2, row, row, 0, 1, TQt::AlignLeft); + htqlayout2->addWidget(checksumFileReq); + tqlayout->addMultiCellLayout(htqlayout2, row, row, 0, 1, TQt::AlignLeft); if (exec() != Accepted) return; TQString file = checksumFileReq->url(); TQString extension; if (!verifyChecksumFile(file, extension)) { - KMessageBox::error(0, i18n("<qt>Error reading checksum file <i>%1</i>.<br />Please specify a valid checksum file.</qt>").arg(file)); + KMessageBox::error(0, i18n("<qt>Error reading checksum file <i>%1</i>.<br />Please specify a valid checksum file.</qt>").tqarg(file)); return; } @@ -374,7 +374,7 @@ MatchChecksumDlg::MatchChecksumDlg(const TQStringList& files, bool containFolder break; } if (!mytool) { - KMessageBox::error(0, i18n("<qt>Krusader can't find a checksum tool that handles %1 on your system. Please check the <b>Dependencies</b> page in Krusader's settings.</qt>").arg(extension)); + KMessageBox::error(0, i18n("<qt>Krusader can't find a checksum tool that handles %1 on your system. Please check the <b>Dependencies</b> page in Krusader's settings.</qt>").tqarg(extension)); return; } @@ -396,7 +396,7 @@ MatchChecksumDlg::MatchChecksumDlg(const TQStringList& files, bool containFolder } }; if (!r || !proc.normalExit()) { - KMessageBox::error(0, i18n("<qt>There was an error while running <b>%1</b>.</qt>").arg(mytool->binary)); + KMessageBox::error(0, i18n("<qt>There was an error while running <b>%1</b>.</qt>").tqarg(mytool->binary)); return; } TQApplication::restoreOverrideCursor(); @@ -428,31 +428,31 @@ bool MatchChecksumDlg::verifyChecksumFile(TQString path, TQString& extension) { // ------------- VerifyResultDlg VerifyResultDlg::VerifyResultDlg(const TQStringList& failed): KDialogBase(Plain, i18n("Verify Checksum"), Close, Close, krApp) { - TQGridLayout *layout = new TQGridLayout( plainPage(), 1, 1, + TQGridLayout *tqlayout = new TQGridLayout( plainPage(), 1, 1, KDialogBase::marginHint(), KDialogBase::spacingHint()); bool errors = failed.size()>0; int row = 0; // create the icon and title - TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); TQLabel p(plainPage()); p.setPixmap(krLoader->loadIcon(errors ? "messagebox_critical" : "messagebox_info", KIcon::Desktop, 32)); - hlayout->addWidget(&p); + htqlayout->addWidget(&p); TQLabel *l1 = new TQLabel((errors ? i18n("Errors were detected while verifying the checksums") : i18n("Checksums were verified successfully")), plainPage()); - hlayout->addWidget(l1); - layout->addMultiCellLayout(hlayout,row,row,0,1, TQt::AlignLeft); + htqlayout->addWidget(l1); + tqlayout->addMultiCellLayout(htqlayout,row,row,0,1, TQt::AlignLeft); ++row; if (errors) { TQLabel *l3 = new TQLabel(i18n("The following files have failed:"), plainPage()); - layout->addMultiCellWidget(l3, row, row, 0, 1); + tqlayout->addMultiCellWidget(l3, row, row, 0, 1); ++row; KListBox *lb2 = new KListBox(plainPage()); lb2->insertStringList(failed); - layout->addMultiCellWidget(lb2, row, row, 0, 1); + tqlayout->addMultiCellWidget(lb2, row, row, 0, 1); ++row; } @@ -464,7 +464,7 @@ VerifyResultDlg::VerifyResultDlg(const TQStringList& failed): ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStringList& stdErr, const TQString& suggestedFilename, const TQString& binary, const TQString& /* type */, bool standardFormat): KDialogBase(Plain, i18n("Create Checksum"), Ok | Cancel, Ok, krApp), _binary(binary) { - TQGridLayout *layout = new TQGridLayout( plainPage(), 1, 1, + TQGridLayout *tqlayout = new TQGridLayout( plainPage(), 1, 1, KDialogBase::marginHint(), KDialogBase::spacingHint()); // md5 tools display errors into stderr, so we'll use that to determine the result of the job @@ -473,21 +473,21 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin int row = 0; // create the icon and title - TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); TQLabel p(plainPage()); p.setPixmap(krLoader->loadIcon(errors ? "messagebox_critical" : "messagebox_info", KIcon::Desktop, 32)); - hlayout->addWidget(&p); + htqlayout->addWidget(&p); TQLabel *l1 = new TQLabel((errors ? i18n("Errors were detected while creating the checksums") : i18n("Checksums were created successfully")), plainPage()); - hlayout->addWidget(l1); - layout->addMultiCellLayout(hlayout,row,row,0,1, TQt::AlignLeft); + htqlayout->addWidget(l1); + tqlayout->addMultiCellLayout(htqlayout,row,row,0,1, TQt::AlignLeft); ++row; if (successes) { if (errors) { TQLabel *l2 = new TQLabel(i18n("Here are the calculated checksums:"), plainPage()); - layout->addMultiCellWidget(l2, row, row, 0, 1); + tqlayout->addMultiCellWidget(l2, row, row, 0, 1); ++row; } KListView *lv = new KListView(plainPage()); @@ -507,7 +507,7 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin new KListViewItem(lv, line); } } - layout->addMultiCellWidget(lv, row, row, 0, 1); + tqlayout->addMultiCellWidget(lv, row, row, 0, 1); ++row; } @@ -516,15 +516,15 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin line1->setGeometry( TQRect( 60, 210, 501, 20 ) ); line1->setFrameShape( TQFrame::HLine ); line1->setFrameShadow( TQFrame::Sunken ); - layout->addMultiCellWidget(line1, row, row, 0, 1); + tqlayout->addMultiCellWidget(line1, row, row, 0, 1); ++row; TQLabel *l3 = new TQLabel(i18n("Here are the errors received:"), plainPage()); - layout->addMultiCellWidget(l3, row, row, 0, 1); + tqlayout->addMultiCellWidget(l3, row, row, 0, 1); ++row; KListBox *lb = new KListBox(plainPage()); lb->insertStringList(stdErr); - layout->addMultiCellWidget(lb, row, row, 0, 1); + tqlayout->addMultiCellWidget(lb, row, row, 0, 1); ++row; } @@ -532,14 +532,14 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin KURLRequester *checksumFile=0; TQCheckBox *saveFileCb=0; if (successes) { - TQHBoxLayout *hlayout2 = new TQHBoxLayout(layout, KDialogBase::spacingHint()); + TQHBoxLayout *htqlayout2 = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); saveFileCb = new TQCheckBox(i18n("Save checksum to file:"), plainPage()); saveFileCb->setChecked(true); - hlayout2->addWidget(saveFileCb); + htqlayout2->addWidget(saveFileCb); checksumFile = new KURLRequester( suggestedFilename, plainPage() ); - hlayout2->addWidget(checksumFile, TQt::AlignLeft); - layout->addMultiCellLayout(hlayout2, row, row,0,1, TQt::AlignLeft); + htqlayout2->addWidget(checksumFile, TQt::AlignLeft); + tqlayout->addMultiCellLayout(htqlayout2, row, row,0,1, TQt::AlignLeft); ++row; connect(saveFileCb, TQT_SIGNAL(toggled(bool)), checksumFile, TQT_SLOT(setEnabled(bool))); checksumFile->setFocus(); @@ -553,7 +553,7 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin connect(onePerFile, TQT_SIGNAL(toggled(bool)), saveFileCb, TQT_SLOT(toggle())); connect(onePerFile, TQT_SIGNAL(toggled(bool)), saveFileCb, TQT_SLOT(setDisabled(bool))); connect(onePerFile, TQT_SIGNAL(toggled(bool)), checksumFile, TQT_SLOT(setDisabled(bool))); - layout->addMultiCellWidget(onePerFile, row, row,0,1, TQt::AlignLeft); + tqlayout->addMultiCellWidget(onePerFile, row, row,0,1, TQt::AlignLeft); ++row; } @@ -569,7 +569,7 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin bool ChecksumResultsDlg::saveChecksum(const TQStringList& data, TQString filename) { if (TQFile::exists(filename) && KMessageBox::warningContinueCancel(this, - i18n("File %1 already exists.\nAre you sure you want to overwrite it?").arg(filename), + i18n("File %1 already exists.\nAre you sure you want to overwrite it?").tqarg(filename), i18n("Warning"), i18n("Overwrite")) != KMessageBox::Continue) { // find a better name to save to filename = KFileDialog::getSaveFileName(TQString(), "*", 0, i18n("Select a file to save to")); @@ -577,7 +577,7 @@ bool ChecksumResultsDlg::saveChecksum(const TQStringList& data, TQString filenam } TQFile file(filename); if (!file.open(IO_WriteOnly)) { - KMessageBox::detailedError(0, i18n("Error saving file %1").arg(filename), + KMessageBox::detailedError(0, i18n("Error saving file %1").tqarg(filename), file.errorString()); return false; } diff --git a/krusader/Dialogs/krdialogs.cpp b/krusader/Dialogs/krdialogs.cpp index 2687c54..ad003ec 100644 --- a/krusader/Dialogs/krdialogs.cpp +++ b/krusader/Dialogs/krdialogs.cpp @@ -141,7 +141,7 @@ KURLRequesterDlgForCopy::KURLRequesterDlgForCopy( const TQString& urlName, const topLayout->addWidget( label ); urlRequester_ = new KURLRequester( urlName, plainPage(), "urlRequester" ); - urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 ); + urlRequester_->setMinimumWidth( urlRequester_->tqsizeHint().width() * 3 ); topLayout->addWidget( urlRequester_ ); preserveAttrsCB = new TQCheckBox(i18n("Preserve attributes (only for local targets)"), plainPage()); preserveAttrsCB->setChecked( presAttrs ); @@ -158,7 +158,7 @@ KURLRequesterDlgForCopy::KURLRequesterDlgForCopy( const TQString& urlName, const new TQLabel( i18n("Base URL:"), hbox, "baseURLLabel" ); baseUrlCombo = new TQComboBox( hbox, "baseUrlRequester" ); - baseUrlCombo->setMinimumWidth( baseUrlCombo->sizeHint().width() * 3 ); + baseUrlCombo->setMinimumWidth( baseUrlCombo->tqsizeHint().width() * 3 ); baseUrlCombo->setEnabled( copyDirStructureCB->isChecked() ); KURL temp = baseURL, tempOld; do { @@ -230,10 +230,10 @@ KURL KURLRequesterDlgForCopy::baseURL() const { KRGetDate::KRGetDate(TQDate date, TQWidget *parent, const char *name) : KDialog(parent, name,true,WStyle_DialogBorder) { dateWidget = new KDatePicker(this, date); - dateWidget->resize(dateWidget->sizeHint()); - setMinimumSize(dateWidget->sizeHint()); - setMaximumSize(dateWidget->sizeHint()); - resize(minimumSize()); + dateWidget->resize(dateWidget->tqsizeHint()); + setMinimumSize(dateWidget->tqsizeHint()); + setMaximumSize(dateWidget->tqsizeHint()); + resize(tqminimumSize()); connect(dateWidget, TQT_SIGNAL(dateSelected(TQDate)), this, TQT_SLOT(setDate(TQDate))); connect(dateWidget, TQT_SIGNAL(dateEntered(TQDate)), this, TQT_SLOT(setDate(TQDate))); diff --git a/krusader/Dialogs/krdialogs.h b/krusader/Dialogs/krdialogs.h index f5c7d76..f250744 100644 --- a/krusader/Dialogs/krdialogs.h +++ b/krusader/Dialogs/krdialogs.h @@ -39,7 +39,7 @@ #include <kdialogbase.h> // QT includes #include <tqlineedit.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqdatetime.h> @@ -103,7 +103,7 @@ class KRGetDate : public KDialog { Q_OBJECT TQ_OBJECT public: - KRGetDate(TQDate date=TQDate::currentDate(), TQWidget *parent = 0, const char *name = 0); + KRGetDate(TQDate date=TQDate::tqcurrentDate(), TQWidget *parent = 0, const char *name = 0); TQDate getDate(); private slots: diff --git a/krusader/Dialogs/krkeydialog.cpp b/krusader/Dialogs/krkeydialog.cpp index 748abba..24e5e61 100644 --- a/krusader/Dialogs/krkeydialog.cpp +++ b/krusader/Dialogs/krkeydialog.cpp @@ -11,7 +11,7 @@ // #include "krkeydialog.h" -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> #include <kpushbutton.h> @@ -32,11 +32,11 @@ static const char* FILE_FILTER = I18N_NOOP("*.keymap|Krusader keymaps\n*|all fil KrKeyDialog::KrKeyDialog( TQWidget * parent ) : KKeyDialog( false /* allow letter shortcuts */, parent ) { insert( krApp->actionCollection() ); - // HACK This fetches the layout of the buttonbox from KDialogBase, although it is not accessable with KDialogBase's API + // HACK This fetches the tqlayout of the buttonbox from KDialogBase, although it is not accessable with KDialogBase's API // None the less it's quite save to use since this implementation hasn't changed since KDE-3.3 (I haven't looked at earlier // versions since we don't support them) and now all work is done in KDE-4. TQWidget* buttonBox = TQT_TQWIDGET( actionButton(KDialogBase::Ok)->parent() ); - TQBoxLayout* buttonBoxLayout = static_cast<TQBoxLayout*>( buttonBox->layout() ); + TQBoxLayout* buttonBoxLayout = static_cast<TQBoxLayout*>( buttonBox->tqlayout() ); KPushButton* importButton = new KPushButton( i18n("Import shortcuts"), buttonBox ); TQWhatsThis::add( importButton, i18n( "Load a keybinding profile, e.g., total_commander.keymap" ) ); @@ -131,7 +131,7 @@ void KrKeyDialog::slotExportShortcuts() { TQFile f( filename ); if ( f.exists() && KMessageBox::warningContinueCancel( this, - i18n("<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>").arg(filename), + i18n("<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>").tqarg(filename), i18n("Warning"), i18n("Overwrite") ) != KMessageBox::Continue) return; @@ -140,7 +140,7 @@ void KrKeyDialog::slotExportShortcuts() { // Additionaly this prevents merging if the file already contains some shortcuts f.close(); else { - KMessageBox::error( this, i18n("<qt>Can't open <b>%1</b> for writing!</qt>").arg(filename) ); + KMessageBox::error( this, i18n("<qt>Can't open <b>%1</b> for writing!</qt>").tqarg(filename) ); return; } diff --git a/krusader/Dialogs/krmaskchoice.cpp b/krusader/Dialogs/krmaskchoice.cpp index ea2efae..261366e 100644 --- a/krusader/Dialogs/krmaskchoice.cpp +++ b/krusader/Dialogs/krmaskchoice.cpp @@ -34,7 +34,7 @@ #include <tqlabel.h> #include <tqlistbox.h> #include <tqpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvariant.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -56,7 +56,7 @@ KRMaskChoice::KRMaskChoice( TQWidget* parent, const char* name, bool modal, WFl setName( "KRMaskChoice" ); resize( 401, 314 ); setCaption( i18n( "Choose Files" ) ); - setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5 ) ); + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5 ) ); selection = new TQComboBox( FALSE, this, "selection" ); int height = TQFontMetrics( selection->font() ).height(); diff --git a/krusader/Dialogs/krprogress.cpp b/krusader/Dialogs/krprogress.cpp index 3153658..3f00175 100644 --- a/krusader/Dialogs/krprogress.cpp +++ b/krusader/Dialogs/krprogress.cpp @@ -17,7 +17,7 @@ */ #include <tqtimer.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqdatetime.h> @@ -81,9 +81,9 @@ KrProgress::KrProgress( KIO::Job* job ) hBox->addWidget(resumeLabel); progressLabel = new TQLabel( this ); -/* progressLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, +/* progressLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ) );*/ - progressLabel->setAlignment( TQLabel::AlignRight ); + progressLabel->tqsetAlignment( TQLabel::AlignRight ); hBox->addWidget( progressLabel ); hBox = new TQHBoxLayout(); @@ -106,8 +106,8 @@ KrProgress::KrProgress( KIO::Job* job ) connect( pb, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) ); hBox->addWidget( pb ); - resize( sizeHint() ); - setMaximumHeight(sizeHint().height()); + resize( tqsizeHint() ); + setMaximumHeight(tqsizeHint().height()); setCaption(i18n("Krusader Progress")); // show something better than kio_uiserver @@ -169,7 +169,7 @@ void KrProgress::showTotals(){ } void KrProgress::slotPercent( KIO::Job*, unsigned long percent ){ - TQString tmp(i18n( "%1% of %2 ").arg( percent ).arg( KIO::convertSize(m_iTotalSize))); + TQString tmp(i18n( "%1% of %2 ").tqarg( percent ).tqarg( KIO::convertSize(m_iTotalSize))); m_pProgressBar->setValue( percent ); tmp.append(i18n(" (Reading)")); @@ -180,7 +180,7 @@ void KrProgress::slotPercent( KIO::Job*, unsigned long percent ){ void KrProgress::slotInfoMessage( KIO::Job*, const TQString & msg ) { speedLabel->setText( msg ); - speedLabel->setAlignment( speedLabel->alignment() & ~TQt::WordBreak ); + speedLabel->tqsetAlignment( speedLabel->tqalignment() & ~TQt::WordBreak ); } @@ -188,7 +188,7 @@ void KrProgress::slotProcessedSize( KIO::Job*, KIO::filesize_t bytes ) { m_iProcessedSize = bytes; TQString tmp; - tmp = i18n( "%1 of %2 complete").arg( KIO::convertSize(bytes) ).arg( KIO::convertSize(m_iTotalSize)); + tmp = i18n( "%1 of %2 complete").tqarg( KIO::convertSize(bytes) ).tqarg( KIO::convertSize(m_iTotalSize)); sizeLabel->setText( tmp ); } @@ -198,9 +198,9 @@ void KrProgress::slotProcessedDirs( KIO::Job*, unsigned long dirs ) m_iProcessedDirs = dirs; TQString tmps; - tmps = i18n("%1 / %n directory", "%1 / %n directories", m_iTotalDirs).arg( m_iProcessedDirs ); + tmps = i18n("%1 / %n directory", "%1 / %n directories", m_iTotalDirs).tqarg( m_iProcessedDirs ); tmps += " "; - tmps += i18n("%1 / %n file", "%1 / %n files", m_iTotalFiles).arg( m_iProcessedFiles ); + tmps += i18n("%1 / %n file", "%1 / %n files", m_iTotalFiles).tqarg( m_iProcessedFiles ); progressLabel->setText( tmps ); } @@ -211,10 +211,10 @@ void KrProgress::slotProcessedFiles( KIO::Job*, unsigned long files ) TQString tmps; if ( m_iTotalDirs > 1 ) { - tmps = i18n("%1 / %n directory", "%1 / %n directories", m_iTotalDirs).arg( m_iProcessedDirs ); + tmps = i18n("%1 / %n directory", "%1 / %n directories", m_iTotalDirs).tqarg( m_iProcessedDirs ); tmps += " "; } - tmps += i18n("%1 / %n file", "%1 / %n files", m_iTotalFiles).arg( m_iProcessedFiles ); + tmps += i18n("%1 / %n file", "%1 / %n files", m_iTotalFiles).tqarg( m_iProcessedFiles ); progressLabel->setText( tmps ); } @@ -230,7 +230,7 @@ void KrProgress::slotSpeed( KIO::Job*, unsigned long bytes_per_second ) #else TQString remaining = KIO::calculateRemaining( m_iTotalSize, m_iProcessedSize, bytes_per_second ).toString(); #endif - speedLabel->setText( i18n( "%1/s ( %2 remaining )").arg( KIO::convertSize( bytes_per_second )).arg( remaining ) ); + speedLabel->setText( i18n( "%1/s ( %2 remaining )").tqarg( KIO::convertSize( bytes_per_second )).tqarg( remaining ) ); } } diff --git a/krusader/Dialogs/krspwidgets.cpp b/krusader/Dialogs/krspwidgets.cpp index ef9014d..8fb19ba 100644 --- a/krusader/Dialogs/krspwidgets.cpp +++ b/krusader/Dialogs/krspwidgets.cpp @@ -297,7 +297,7 @@ void QuickNavLineEdit::mouseMoveEvent( TQMouseEvent *m) { if (idx == -1 && !_dummyDisplayed) { // pointing on or after the current directory if (_pop) delete _pop; _pop = KPassivePopup::message( i18n("Quick Navigation"), - "<qt>" + i18n("Already at <i>%1</i>").arg(tx.left(idx)) + "</qt>", + "<qt>" + i18n("Already at <i>%1</i>").tqarg(tx.left(idx)) + "</qt>", *(KCursor::handCursor().bitmap()), this); _dummyDisplayed=true; @@ -308,7 +308,7 @@ void QuickNavLineEdit::mouseMoveEvent( TQMouseEvent *m) { _dummyDisplayed=false; _pop = KPassivePopup::message( i18n("Quick Navigation"), - "<qt>" + i18n("Click to go to <i>%1</i>").arg(tx.left(idx)) + "</qt>", + "<qt>" + i18n("Click to go to <i>%1</i>").tqarg(tx.left(idx)) + "</qt>", *(KCursor::handCursor().bitmap()), this ); } KLineEdit::mouseMoveEvent(m); diff --git a/krusader/Dialogs/kurllistrequester.cpp b/krusader/Dialogs/kurllistrequester.cpp index 1ab50db..7e3cf1c 100644 --- a/krusader/Dialogs/kurllistrequester.cpp +++ b/krusader/Dialogs/kurllistrequester.cpp @@ -32,7 +32,7 @@ #include "../VFS/vfs.h" #include <tqpixmap.h> #include <tqcursor.h> -#include <layout.h> +#include <tqlayout.h> #include <kfiledialog.h> #include <kpopupmenu.h> #include <kiconloader.h> diff --git a/krusader/Dialogs/newftpgui.cpp b/krusader/Dialogs/newftpgui.cpp index f2db4f5..d121e03 100644 --- a/krusader/Dialogs/newftpgui.cpp +++ b/krusader/Dialogs/newftpgui.cpp @@ -12,7 +12,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqspinbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqhbox.h> #include <tqgrid.h> #include <tqvariant.h> @@ -40,15 +40,15 @@ newFTPGUI::newFTPGUI( TQWidget* parent, const char* name, bool modal, WFlags fl ) : TQDialog( parent, name, modal, fl ){ - TQVBoxLayout * layout = new TQVBoxLayout( this, 11, 6, "newFTPGUI_layout" ); - layout->setAutoAdd(true); + TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 11, 6, "newFTPGUI_layout" ); + tqlayout->setAutoAdd(true); if ( !name ) setName( "newFTPGUI" ); resize( 342, 261 ); setCaption( i18n( "New Network Connection" ) ); // setSizeGripEnabled( TRUE ); - setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, sizePolicy().hasHeightForWidth() ) ); + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, sizePolicy().hasHeightForWidth() ) ); setMinimumSize( TQSize( 342, 261 ) ); @@ -57,7 +57,7 @@ newFTPGUI::newFTPGUI( TQWidget* parent, const char* name, bool modal, WFlags fl PixmapLabel1 = new TQLabel( hbox_image, "PixmapLabel1" ); PixmapLabel1->setPixmap( krLoader->loadIcon("network", KIcon::Desktop, 32) ); - PixmapLabel1->setSizePolicy( SIZE_MINIMUM ); + PixmapLabel1->tqsetSizePolicy( SIZE_MINIMUM ); TextLabel3 = new TQLabel( i18n( "About to connect to..." ), hbox_image, "TextLabel3" ); TQFont TextLabel3_font( TextLabel3->font() ); @@ -84,7 +84,7 @@ newFTPGUI::newFTPGUI( TQWidget* parent, const char* name, bool modal, WFlags fl prefix->insertItem( i18n( "sftp://" )); prefix->setAcceptDrops( FALSE ); prefix->setEnabled( TRUE ); - prefix->setSizePolicy( SIZE_MINIMUM ); + prefix->tqsetSizePolicy( SIZE_MINIMUM ); connect( prefix,TQT_SIGNAL(activated(const TQString& )), this,TQT_SLOT(slotTextChanged(const TQString& ))); @@ -104,7 +104,7 @@ newFTPGUI::newFTPGUI( TQWidget* parent, const char* name, bool modal, WFlags fl port = new TQSpinBox( grid_host, "port" ); port->setMaxValue( 65535 ); port->setValue( 21 ); - port->setSizePolicy( SIZE_MINIMUM ); + port->tqsetSizePolicy( SIZE_MINIMUM ); TextLabel1_2 = new TQLabel( i18n( "Username:" ), this, "TextLabel1_2" ); diff --git a/krusader/Dialogs/packgui.cpp b/krusader/Dialogs/packgui.cpp index 5677471..ba9df23 100644 --- a/krusader/Dialogs/packgui.cpp +++ b/krusader/Dialogs/packgui.cpp @@ -50,7 +50,7 @@ PackGUI::PackGUI(TQString defaultName, TQString defaultPath, int noOfFiles, TQSt PackGUIBase(0,0,true) { // first, fill the WhatToPack textfield with information if(noOfFiles == 1) - TextLabel1->setText( i18n("Pack %1").arg(filename) ); + TextLabel1->setText( i18n("Pack %1").tqarg(filename) ); else TextLabel1->setText( i18n("Pack %n file", "Pack %n files", noOfFiles) ); diff --git a/krusader/Dialogs/packguibase.cpp b/krusader/Dialogs/packguibase.cpp index b1aa922..34e888b 100644 --- a/krusader/Dialogs/packguibase.cpp +++ b/krusader/Dialogs/packguibase.cpp @@ -35,7 +35,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvariant.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -82,7 +82,7 @@ PackGUIBase::PackGUIBase( TQWidget* parent, const char* name, bool modal, WFlag hbox->addWidget( nameData ); typeData = new TQComboBox( FALSE, this, "typeData" ); - typeData->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0 ) ); + typeData->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0 ) ); connect( typeData, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( checkConsistency() ) ); connect( typeData, TQT_SIGNAL( highlighted( const TQString & ) ), this, TQT_SLOT( checkConsistency() ) ); hbox->addWidget( typeData ); @@ -115,7 +115,7 @@ PackGUIBase::PackGUIBase( TQWidget* parent, const char* name, bool modal, WFlag PixmapLabel1 = new TQLabel( this, "PixmapLabel1" ); PixmapLabel1->setPixmap( krLoader->loadIcon("package", KIcon::Desktop, 32) ); PixmapLabel1->setScaledContents( TRUE ); - PixmapLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0 ) ); + PixmapLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0 ) ); hbox_3->addWidget( PixmapLabel1 ); TextLabel1 = new TQLabel( this, "TextLabel1" ); @@ -188,7 +188,7 @@ PackGUIBase::PackGUIBase( TQWidget* parent, const char* name, bool modal, WFlag TQHBox * minmaxHBox = new TQHBox( sliderVBox ); minLabel = new TQLabel( i18n("MIN"), minmaxHBox ); maxLabel = new TQLabel( i18n("MAX"), minmaxHBox ); - maxLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + maxLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); sliderHbox->addWidget( sliderVBox ); @@ -249,7 +249,7 @@ PackGUIBase::PackGUIBase( TQWidget* parent, const char* name, bool modal, WFlag hbox_7->setMargin( 0 ); TextLabel8 = new TQLabel( i18n( "Command line switches:" ), advancedWidget, "TextLabel8" ); - TextLabel8->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + TextLabel8->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); hbox_7->addWidget( TextLabel8 ); commandLineSwitches = new KHistoryCombo( advancedWidget, "commandLineSwitches" ); @@ -320,8 +320,8 @@ void PackGUIBase::expand() { advancedWidget->show(); else { advancedWidget->hide(); - layout()->activate(); - TQSize minSize = minimumSize(); + tqlayout()->activate(); + TQSize minSize = tqminimumSize(); resize( width(), minSize.height() ); } show(); @@ -412,7 +412,7 @@ bool PackGUIBase::extraProperties( TQMap<TQString,TQString> & inMap ) { } if( setCompressionLevel->isEnabled() && setCompressionLevel->isChecked() ) { - inMap[ "CompressionLevel" ] = TQString("%1").arg( compressionSlider->value() ); + inMap[ "CompressionLevel" ] = TQString("%1").tqarg( compressionSlider->value() ); } TQString cmdArgs = commandLineSwitches->currentText().stripWhiteSpace(); diff --git a/krusader/Dialogs/percentalsplitter.cpp b/krusader/Dialogs/percentalsplitter.cpp index ecf6597..27c2267 100644 --- a/krusader/Dialogs/percentalsplitter.cpp +++ b/krusader/Dialogs/percentalsplitter.cpp @@ -77,7 +77,7 @@ TQString PercentalSplitter::toolTipString( int p ) { if( p < 0 ) p = values[ 0 ]; int percent = (int)(((double)p / (double)( values[ 0 ] + values[ 1 ] )) * 10000. + 0.5); - return TQString( "%1.%2%3" ).arg( percent / 100 ).arg( ( percent / 10 )%10 ).arg( percent % 10 ) + "%"; + return TQString( "%1.%2%3" ).tqarg( percent / 100 ).tqarg( ( percent / 10 )%10 ).tqarg( percent % 10 ) + "%"; } return TQString(); } @@ -136,7 +136,7 @@ void PercentalSplitter::setRubberband ( int p ) { label->setAutoMask( FALSE ); label->setFrameStyle( TQFrame::Plain | TQFrame::Box ); label->setLineWidth( 1 ); - label->setAlignment( AlignAuto | AlignTop ); + label->tqsetAlignment( AlignAuto | AlignTop ); label->setIndent(0); TQFontMetrics fm = label->fontMetrics(); diff --git a/krusader/Dialogs/popularurls.cpp b/krusader/Dialogs/popularurls.cpp index 6cad3d3..a6ae087 100644 --- a/krusader/Dialogs/popularurls.cpp +++ b/krusader/Dialogs/popularurls.cpp @@ -5,7 +5,7 @@ #include <kiconloader.h> #include <klistviewsearchline.h> #include <tqheader.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <ktoolbarbutton.h> #include "../krusader.h" @@ -228,7 +228,7 @@ void PopularUrls::showDialog() { // ===================================== PopularUrlsDlg ====================================== PopularUrlsDlg::PopularUrlsDlg(): KDialogBase(Plain, i18n("Popular Urls"), Close, KDialogBase::NoDefault, krApp) { - TQGridLayout *layout = new TQGridLayout( plainPage(), 0, KDialog::spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( plainPage(), 0, KDialog::spacingHint() ); // listview to contain the urls urls = new KListView(plainPage()); @@ -244,10 +244,10 @@ PopularUrlsDlg::PopularUrlsDlg(): search->setTrapReturnKey(true); TQLabel *lbl = new TQLabel(search, i18n(" &Search: "), plainPage()); - layout->addWidget(btn,0,0); - layout->addWidget(lbl,0,1); - layout->addWidget(search,0,2); - layout->addMultiCellWidget(urls,1,1,0,2); + tqlayout->addWidget(btn,0,0); + tqlayout->addWidget(lbl,0,1); + tqlayout->addWidget(search,0,2); + tqlayout->addMultiCellWidget(urls,1,1,0,2); setMaximumSize(600, 500); setTabOrder(search, urls); @@ -296,7 +296,7 @@ void PopularUrlsDlg::run(KURL::List list) { } //urls->setCurrentItem(urls->firstChild()); //urls->setSelected(urls->firstChild(), true); - setMinimumSize(urls->sizeHint().width()+45, 400); + setMinimumSize(urls->tqsizeHint().width()+45, 400); search->clear(); search->setFocus(); diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp index 0e70a67..b9088da 100644 --- a/krusader/DiskUsage/diskusage.cpp +++ b/krusader/DiskUsage/diskusage.cpp @@ -29,7 +29,7 @@ ***************************************************************************/ #include <time.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kpopupmenu.h> #include <kmimetype.h> @@ -89,18 +89,18 @@ LoaderWidget::LoaderWidget( TQWidget *parent, const char *name ) : TQScrollView( loaderBox->setFrameShape( TQGroupBox::Box ); loaderBox->setFrameShadow( TQGroupBox::Sunken ); loaderBox->setColumnLayout(0, Qt::Vertical ); - loaderBox->layout()->setSpacing( 0 ); - loaderBox->layout()->setMargin( 0 ); - loaderBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + loaderBox->tqlayout()->setSpacing( 0 ); + loaderBox->tqlayout()->setMargin( 0 ); + loaderBox->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); loaderBox->setFrameStyle( TQFrame::Panel + TQFrame::Raised ); loaderBox->setLineWidth( 2 ); - TQGridLayout *synchGrid = new TQGridLayout( loaderBox->layout() ); + TQGridLayout *synchGrid = new TQGridLayout( loaderBox->tqlayout() ); synchGrid->setSpacing( 6 ); synchGrid->setMargin( 11 ); TQLabel *titleLabel = new TQLabel( i18n( "Loading Usage Information" ), loaderBox, "titleLabel" ); - titleLabel->setAlignment( TQt::AlignHCenter ); + titleLabel->tqsetAlignment( TQt::AlignHCenter ); synchGrid->addMultiCellWidget( titleLabel, 0, 0, 0, 1 ); TQLabel *filesLabel = new TQLabel( i18n( "Files:" ), loaderBox, "filesLabel" ); @@ -121,19 +121,19 @@ LoaderWidget::LoaderWidget( TQWidget *parent, const char *name ) : TQScrollView( files = new TQLabel( loaderBox, "files" ); files->setFrameShape( TQLabel::StyledPanel ); files->setFrameShadow( TQLabel::Sunken ); - files->setAlignment( TQt::AlignRight ); + files->tqsetAlignment( TQt::AlignRight ); synchGrid->addWidget( files, 1, 1 ); directories = new TQLabel( loaderBox, "directories" ); directories->setFrameShape( TQLabel::StyledPanel ); directories->setFrameShadow( TQLabel::Sunken ); - directories->setAlignment( TQt::AlignRight ); + directories->tqsetAlignment( TQt::AlignRight ); synchGrid->addWidget( directories, 2, 1 ); totalSize = new TQLabel( loaderBox, "totalSize" ); totalSize->setFrameShape( TQLabel::StyledPanel ); totalSize->setFrameShadow( TQLabel::Sunken ); - totalSize->setAlignment( TQt::AlignRight ); + totalSize->tqsetAlignment( TQt::AlignRight ); synchGrid->addWidget( totalSize, 3, 1 ); int width; @@ -150,7 +150,7 @@ LoaderWidget::LoaderWidget( TQWidget *parent, const char *name ) : TQScrollView( TQHBox *hbox = new TQHBox( loaderBox, "hbox" ); TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - hbox->layout()->addItem( spacer ); + hbox->tqlayout()->addItem( spacer ); TQPushButton *cancelButton = new TQPushButton( hbox, "cancelButton" ); cancelButton->setText( i18n( "Cancel" ) ); synchGrid->addWidget( hbox, 6, 1 ); @@ -186,9 +186,9 @@ void LoaderWidget::setCurrentURL( KURL url ) void LoaderWidget::setValues( int fileNum, int dirNum, KIO::filesize_t total ) { - files->setText( TQString("%1").arg( fileNum ) ); - directories->setText( TQString("%1").arg( dirNum ) ); - totalSize->setText( TQString("%1").arg( KRpermHandler::parseSize( total ).stripWhiteSpace() ) ); + files->setText( TQString("%1").tqarg( fileNum ) ); + directories->setText( TQString("%1").tqarg( dirNum ) ); + totalSize->setText( TQString("%1").tqarg( KRpermHandler::parseSize( total ).stripWhiteSpace() ) ); } void LoaderWidget::slotCancelled() @@ -411,7 +411,7 @@ void DiskUsage::dirUp() if( KMessageBox::questionYesNo( this, i18n( "Stepping into the parent directory requires " "loading the content of the \"%1\" URL. Do you wish " "to continue?" ) - .arg( vfs::pathOrURL( up ) ), + .tqarg( vfs::pathOrURL( up ) ), i18n( "Krusader::DiskUsage" ), KStdGuiItem::yes(), KStdGuiItem::no(), "DiskUsageLoadParentDir" ) == KMessageBox::Yes ) @@ -530,7 +530,7 @@ int DiskUsage::exclude( File *file, bool calcPercents, int depth ) { calculateSizes( root, true ); calculatePercents( true ); - createStatus(); + createtqStatus(); } if( depth == 0 && changeNr != 0 ) @@ -572,7 +572,7 @@ void DiskUsage::includeAll() include( root ); calculateSizes( root, true ); calculatePercents( true ); - createStatus(); + createtqStatus(); } int DiskUsage::del( File *file, bool calcPercents, int depth ) @@ -608,7 +608,7 @@ int DiskUsage::del( File *file, bool calcPercents, int depth ) return 0; } - emit status( i18n( "Deleting %1..." ).arg( file->name() ) ); + emit status( i18n( "Deleting %1..." ).tqarg( file->name() ) ); } if( file == currentDirectory ) @@ -668,13 +668,13 @@ int DiskUsage::del( File *file, bool calcPercents, int depth ) delete file; if( depth == 0 ) - createStatus(); + createtqStatus(); if( calcPercents ) { calculateSizes( root, true ); calculatePercents( true ); - createStatus(); + createtqStatus(); emit enteringDirectory( currentDirectory ); } @@ -713,7 +713,7 @@ void DiskUsage::removeProperty( File *item, TQString key ) propertyMap.remove( item ); } -void DiskUsage::createStatus() +void DiskUsage::createtqStatus() { Directory *dirEntry = currentDirectory; @@ -725,9 +725,9 @@ void DiskUsage::createStatus() url.addPath( dirEntry->directory() ); emit status( i18n( "Current directory:%1, Total size:%2, Own size:%3" ) - .arg( vfs::pathOrURL( url, -1 ) ) - .arg( " "+KRpermHandler::parseSize( dirEntry->size() ) ) - .arg( " "+KRpermHandler::parseSize( dirEntry->ownSize() ) ) ); + .tqarg( vfs::pathOrURL( url, -1 ) ) + .tqarg( " "+KRpermHandler::parseSize( dirEntry->size() ) ) + .tqarg( " "+KRpermHandler::parseSize( dirEntry->ownSize() ) ) ); } void DiskUsage::changeDirectory( Directory *dir ) @@ -737,7 +737,7 @@ void DiskUsage::changeDirectory( Directory *dir ) currentSize = dir->size(); calculatePercents( true, dir ); - createStatus(); + createtqStatus(); emit enteringDirectory( dir ); } diff --git a/krusader/DiskUsage/diskusage.h b/krusader/DiskUsage/diskusage.h index 6a1162b..b256d9c 100644 --- a/krusader/DiskUsage/diskusage.h +++ b/krusader/DiskUsage/diskusage.h @@ -136,7 +136,7 @@ protected: int calculateSizes( Directory *dir = 0, bool emitSig = false, int depth = 0 ); int calculatePercents( bool emitSig = false, Directory *dir = 0 , int depth = 0 ); int include( Directory *dir, int depth = 0 ); - void createStatus(); + void createtqStatus(); void executeAction( int, File * = 0 ); KURL baseURL; //< the base URL of loading diff --git a/krusader/DiskUsage/diskusagegui.cpp b/krusader/DiskUsage/diskusagegui.cpp index accd9f4..e2c7e3e 100644 --- a/krusader/DiskUsage/diskusagegui.cpp +++ b/krusader/DiskUsage/diskusagegui.cpp @@ -53,7 +53,7 @@ DiskUsageGUI::DiskUsageGUI( KURL openDir, TQWidget* parent, const char *name ) duGrid->setMargin( 11 ); TQHBox *duTools = new TQHBox( this, "duTools" ); - duTools->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + duTools->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); btnNewSearch = new TQToolButton( duTools, "btnNewSearch" ); btnNewSearch->setIconSet( TQIconSet(krLoader->loadIcon("fileopen",KIcon::Desktop)) ); @@ -86,9 +86,9 @@ DiskUsageGUI::DiskUsageGUI( KURL openDir, TQWidget* parent, const char *name ) TQToolTip::add( btnFilelight, i18n( "Filelight view" ) ); TQWidget *spacerWidget = new TQWidget( duTools, "spacerWidget" ); - TQHBoxLayout *hboxlayout = new TQHBoxLayout( spacerWidget ); + TQHBoxLayout *hboxtqlayout = new TQHBoxLayout( spacerWidget ); TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - hboxlayout->addItem( spacer ); + hboxtqlayout->addItem( spacer ); duGrid->addWidget( duTools, 0, 0 ); @@ -100,7 +100,7 @@ DiskUsageGUI::DiskUsageGUI( KURL openDir, TQWidget* parent, const char *name ) status->setFrameShadow( TQLabel::Sunken ); duGrid->addWidget( status, 2, 0 ); - connect( diskUsage, TQT_SIGNAL( status( TQString ) ), this, TQT_SLOT( setStatus( TQString ) ) ); + connect( diskUsage, TQT_SIGNAL( status( TQString ) ), this, TQT_SLOT( settqStatus( TQString ) ) ); connect( diskUsage, TQT_SIGNAL( viewChanged( int ) ), this, TQT_SLOT( slotViewChanged( int ) ) ); connect( diskUsage, TQT_SIGNAL( newSearch() ), this, TQT_SLOT( newSearch() ) ); connect( diskUsage, TQT_SIGNAL( loadFinished( bool ) ), this, TQT_SLOT( slotLoadFinished( bool ) ) ); @@ -178,7 +178,7 @@ void DiskUsageGUI::loadUsageInfo() diskUsage->load( baseDirectory ); } -void DiskUsageGUI::setStatus( TQString stat ) +void DiskUsageGUI::settqStatus( TQString stat ) { status->setText( stat ); } diff --git a/krusader/DiskUsage/diskusagegui.h b/krusader/DiskUsage/diskusagegui.h index 9d3d1c2..319cc88 100644 --- a/krusader/DiskUsage/diskusagegui.h +++ b/krusader/DiskUsage/diskusagegui.h @@ -32,7 +32,7 @@ #define __DISK_USAGE_GUI_H__ #include <tqdialog.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtoolbutton.h> #include <kurl.h> #include <ksqueezedtextlabel.h> @@ -52,7 +52,7 @@ public: public slots: void loadUsageInfo(); bool newSearch(); - void setStatus( TQString ); + void settqStatus( TQString ); void selectLinesView() { diskUsage->setView( VIEW_LINES ); } void selectListView() { diskUsage->setView( VIEW_DETAILED ); } diff --git a/krusader/DiskUsage/dufilelight.cpp b/krusader/DiskUsage/dufilelight.cpp index 62e61e8..57922db 100644 --- a/krusader/DiskUsage/dufilelight.cpp +++ b/krusader/DiskUsage/dufilelight.cpp @@ -59,7 +59,7 @@ void DUFilelight::slotDirChanged( Directory *dir ) { currentDir = dir; - invalidate( false ); + tqinvalidate( false ); create( dir ); refreshNeeded = false; } @@ -67,7 +67,7 @@ void DUFilelight::slotDirChanged( Directory *dir ) void DUFilelight::clear() { - invalidate( false ); + tqinvalidate( false ); currentDir = 0; } @@ -208,7 +208,7 @@ void DUFilelight::slotAboutToShow( TQWidget *widget ) refreshNeeded = false; if( ( currentDir = diskUsage->getCurrentDir() ) != 0 ) { - invalidate( false ); + tqinvalidate( false ); create( currentDir ); } } @@ -222,7 +222,7 @@ void DUFilelight::slotRefresh() refreshNeeded = false; if( currentDir && currentDir == diskUsage->getCurrentDir() ) { - invalidate( false ); + tqinvalidate( false ); create( currentDir ); } } diff --git a/krusader/DiskUsage/dulines.cpp b/krusader/DiskUsage/dulines.cpp index bff8a50..f7a87da 100644 --- a/krusader/DiskUsage/dulines.cpp +++ b/krusader/DiskUsage/dulines.cpp @@ -201,7 +201,7 @@ void DULinesToolTip::maybeTip( const TQPoint &pos ) int width = item->width( TQFontMetrics( view->font() ), view, col ); - TQRect r = view->itemRect( item ); + TQRect r = view->tqitemRect( item ); int headerPos = view->header()->sectionPos( col ); r.setLeft( headerPos ); r.setRight( headerPos + view->header()->sectionSize( col ) ); diff --git a/krusader/DiskUsage/radialMap/builder.cpp b/krusader/DiskUsage/radialMap/builder.cpp index 099d23a..b31aed0 100644 --- a/krusader/DiskUsage/radialMap/builder.cpp +++ b/krusader/DiskUsage/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! @@ -131,7 +131,7 @@ RadialMap::Builder::build( const Directory* const dir, const unsigned int depth, { //append a segment for unrepresented space - a "fake" segment - const TQString s = i18n( "%1 files: ~ %2" ).arg( KGlobal::locale()->formatNumber( hiddenFileCount, 0 ) ).arg( File::humanReadableSize( hiddenSize/hiddenFileCount ) ); + const TQString s = i18n( "%1 files: ~ %2" ).tqarg( KGlobal::locale()->formatNumber( hiddenFileCount, 0 ) ).tqarg( File::humanReadableSize( hiddenSize/hiddenFileCount ) ); (m_signature + depth)->append( new Segment( new File( s, hiddenSize ), a_start, a_end - a_start, true ) ); } diff --git a/krusader/DiskUsage/radialMap/map.cpp b/krusader/DiskUsage/radialMap/map.cpp index c1c7faf..93a45c5 100644 --- a/krusader/DiskUsage/radialMap/map.cpp +++ b/krusader/DiskUsage/radialMap/map.cpp @@ -37,7 +37,7 @@ RadialMap::Map::~Map() } void -RadialMap::Map::invalidate( const bool desaturateTheImage ) +RadialMap::Map::tqinvalidate( const bool desaturateTheImage ) { delete [] m_signature; m_signature = 0; @@ -173,7 +173,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.hsv( &h, &s1, &v1 ); if( s1 > 80 ) diff --git a/krusader/DiskUsage/radialMap/segmentTip.cpp b/krusader/DiskUsage/radialMap/segmentTip.cpp index 2dd4aaf..11d1e9f 100644 --- a/krusader/DiskUsage/radialMap/segmentTip.cpp +++ b/krusader/DiskUsage/radialMap/segmentTip.cpp @@ -90,7 +90,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'; @@ -100,9 +100,9 @@ SegmentTip::updateTip( const File* const file, const Directory* const root ) { double files = static_cast<const Directory*>(file)->fileCount(); const uint pc = uint((100 * files) / (double)root->fileCount()); - TQString s3 = i18n( "Files: %1" ).arg( loc->formatNumber( files, 0 ) ); + 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/krusader/DiskUsage/radialMap/widget.cpp b/krusader/DiskUsage/radialMap/widget.cpp index ded5c58..96b94c0 100644 --- a/krusader/DiskUsage/radialMap/widget.cpp +++ b/krusader/DiskUsage/radialMap/widget.cpp @@ -49,11 +49,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 @@ -70,7 +70,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(); @@ -82,10 +82,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 ) { @@ -108,8 +108,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/krusader/DiskUsage/radialMap/widget.h b/krusader/DiskUsage/radialMap/widget.h index c77e457..4d78301 100644 --- a/krusader/DiskUsage/radialMap/widget.h +++ b/krusader/DiskUsage/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; @@ -69,7 +69,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/krusader/DiskUsage/radialMap/widgetEvents.cpp b/krusader/DiskUsage/radialMap/widgetEvents.cpp index 6436a79..4f39232 100644 --- a/krusader/DiskUsage/radialMap/widgetEvents.cpp +++ b/krusader/DiskUsage/radialMap/widgetEvents.cpp @@ -122,8 +122,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 @@ -174,11 +174,11 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) switch( popup.exec( e->globalPos(), 1 ) ) { case 0: //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 1: - KRun::runCommand( TQString( "konsole --workdir '%1'" ).arg( url.url() ) ); + KRun::runCommand( TQString( "konsole --workdir '%1'" ).tqarg( url.url() ) ); break; case 2: @@ -190,7 +190,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) const KURL url = Widget::url( m_focus->file() ); const TQString message = ( m_focus->file()->isDir() ? i18n( "<qt>The directory at <i>'%1'</i> will be <b>recursively</b> and <b>permanently</b> deleted!</qt>" ) - : i18n( "<qt><i>'%1'</i> will be <b>permanently</b> deleted!</qt>" )).arg( url.prettyURL() ); + : i18n( "<qt><i>'%1'</i> will be <b>permanently</b> deleted!</qt>" )).tqarg( url.prettyURL() ); const int userIntention = KMessageBox::warningContinueCancel( this, message, TQString(), KGuiItem( i18n("&Delete"), "editdelete" ) ); if( userIntention == KMessageBox::Continue ) { @@ -235,7 +235,7 @@ RadialMap::Widget::deleteJobFinished( KIO::Job *job ) { TQApplication::restoreOverrideCursor(); if( !job->error() ) - invalidate(); + tqinvalidate(); else job->showErrorDialog( this ); } diff --git a/krusader/Filter/advancedfilter.cpp b/krusader/Filter/advancedfilter.cpp index ac7d133..116269f 100644 --- a/krusader/Filter/advancedfilter.cpp +++ b/krusader/Filter/advancedfilter.cpp @@ -34,7 +34,7 @@ #include <tqgroupbox.h> #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqfile.h> @@ -55,13 +55,13 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * // Options for size TQGroupBox *sizeGroup = new TQGroupBox( this, "sizeGroup" ); - sizeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, sizeGroup->sizePolicy().hasHeightForWidth() ) ); + sizeGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, sizeGroup->sizePolicy().hasHeightForWidth() ) ); sizeGroup->setTitle( i18n( "Size" ) ); sizeGroup->setColumnLayout(0, Qt::Vertical ); - sizeGroup->layout()->setSpacing( 0 ); - sizeGroup->layout()->setMargin( 0 ); - TQGridLayout *sizeLayout = new TQGridLayout( sizeGroup->layout() ); - sizeLayout->setAlignment( TQt::AlignTop ); + sizeGroup->tqlayout()->setSpacing( 0 ); + sizeGroup->tqlayout()->setMargin( 0 ); + TQGridLayout *sizeLayout = new TQGridLayout( sizeGroup->tqlayout() ); + sizeLayout->tqsetAlignment( TQt::AlignTop ); sizeLayout->setSpacing( 6 ); sizeLayout->setMargin( 11 ); @@ -71,7 +71,7 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * biggerThanAmount = new TQLineEdit( sizeGroup, "biggerThanAmount" ); biggerThanAmount->setEnabled( false ); - biggerThanAmount->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, biggerThanAmount->sizePolicy().hasHeightForWidth() ) ); + biggerThanAmount->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, biggerThanAmount->sizePolicy().hasHeightForWidth() ) ); sizeLayout->addWidget( biggerThanAmount, 0, 1 ); biggerThanType = new KComboBox( false, sizeGroup, "biggerThanType" ); @@ -87,7 +87,7 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * smallerThanAmount = new TQLineEdit( sizeGroup, "smallerThanAmount" ); smallerThanAmount->setEnabled( false ); - smallerThanAmount->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, smallerThanAmount->sizePolicy().hasHeightForWidth() ) ); + smallerThanAmount->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, smallerThanAmount->sizePolicy().hasHeightForWidth() ) ); sizeLayout->addWidget( smallerThanAmount, 0, 4 ); smallerThanType = new KComboBox( false, sizeGroup, "smallerThanType" ); @@ -113,10 +113,10 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * dateGroup->setTitle( i18n( "Date" ) ); dateGroup->setExclusive( true ); dateGroup->setColumnLayout(0, Qt::Vertical ); - dateGroup->layout()->setSpacing( 0 ); - dateGroup->layout()->setMargin( 0 ); - TQGridLayout *dateLayout = new TQGridLayout( dateGroup->layout() ); - dateLayout->setAlignment( TQt::AlignTop ); + dateGroup->tqlayout()->setSpacing( 0 ); + dateGroup->tqlayout()->setMargin( 0 ); + TQGridLayout *dateLayout = new TQGridLayout( dateGroup->tqlayout() ); + dateLayout->tqsetAlignment( TQt::AlignTop ); dateLayout->setSpacing( 6 ); dateLayout->setMargin( 11 ); @@ -212,10 +212,10 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * TQGroupBox *ownershipGroup = new TQGroupBox( this, "ownershipGroup" ); ownershipGroup->setTitle( i18n( "Ownership" ) ); ownershipGroup->setColumnLayout(0, Qt::Vertical ); - ownershipGroup->layout()->setSpacing( 0 ); - ownershipGroup->layout()->setMargin( 0 ); - TQGridLayout *ownershipLayout = new TQGridLayout( ownershipGroup->layout() ); - ownershipLayout->setAlignment( TQt::AlignTop ); + ownershipGroup->tqlayout()->setSpacing( 0 ); + ownershipGroup->tqlayout()->setMargin( 0 ); + TQGridLayout *ownershipLayout = new TQGridLayout( ownershipGroup->tqlayout() ); + ownershipLayout->tqsetAlignment( TQt::AlignTop ); ownershipLayout->setSpacing( 6 ); ownershipLayout->setMargin( 11 ); @@ -423,7 +423,7 @@ void AdvancedFilter::notModifiedAfterSetDate() void AdvancedFilter::changeDate(TQLineEdit *p) { // check if the current date is valid TQDate d = KGlobal::locale()->readDate(p->text()); - if (!d.isValid()) d = TQDate::currentDate(); + if (!d.isValid()) d = TQDate::tqcurrentDate(); KRGetDate *gd = new KRGetDate(d, this); d = gd->getDate(); @@ -472,7 +472,7 @@ void AdvancedFilter::invalidDateMessage(TQLineEdit *p) { // FIXME p->text() is empty sometimes (to reproduce, set date to "13.09.005") KMessageBox::detailedError(this, i18n("Invalid date entered."), - i18n("The date %1 is not valid according to your locale. Please re-enter a valid date (use the date button for easy access).").arg(p->text()) ); + i18n("The date %1 is not valid according to your locale. Please re-enter a valid date (use the date button for easy access).").tqarg(p->text()) ); p->setFocus(); } @@ -547,7 +547,7 @@ bool AdvancedFilter::fillQuery( KRQuery *query ) } else if (modifiedInTheLastEnabled->isChecked()) { if ( !(modifiedInTheLastData->text().simplifyWhiteSpace().isEmpty() && notModifiedInTheLastData->text().simplifyWhiteSpace().isEmpty()) ) { - TQDate d1 = TQDate::currentDate(); TQDate d2 = TQDate::currentDate(); + TQDate d1 = TQDate::tqcurrentDate(); TQDate d2 = TQDate::tqcurrentDate(); if (!modifiedInTheLastData->text().simplifyWhiteSpace().isEmpty()) { int tmp1 = modifiedInTheLastData->text().simplifyWhiteSpace().toInt(); switch (modifiedInTheLastType->currentItem()) { diff --git a/krusader/Filter/filterdialog.cpp b/krusader/Filter/filterdialog.cpp index 10c43c8..d308e02 100644 --- a/krusader/Filter/filterdialog.cpp +++ b/krusader/Filter/filterdialog.cpp @@ -37,7 +37,7 @@ FilterDialog::FilterDialog( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n("Krusader::Choose Files"), Ok|Cancel ) { - TQGridLayout *filterGrid = new TQGridLayout( this->layout() ); + TQGridLayout *filterGrid = new TQGridLayout( this->tqlayout() ); filterGrid->setSpacing( 6 ); filterGrid->setMargin( 11 ); diff --git a/krusader/Filter/generalfilter.cpp b/krusader/Filter/generalfilter.cpp index 9d6ff81..c3303b1 100644 --- a/krusader/Filter/generalfilter.cpp +++ b/krusader/Filter/generalfilter.cpp @@ -54,10 +54,10 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *nameGroup = new TQGroupBox( this, "nameGroup" ); nameGroup->setTitle( i18n( "File name" ) ); nameGroup->setColumnLayout(0, Qt::Vertical ); - nameGroup->layout()->setSpacing( 0 ); - nameGroup->layout()->setMargin( 0 ); - TQGridLayout *nameGroupLayout = new TQGridLayout( nameGroup->layout() ); - nameGroupLayout->setAlignment( TQt::AlignTop ); + nameGroup->tqlayout()->setSpacing( 0 ); + nameGroup->tqlayout()->setMargin( 0 ); + TQGridLayout *nameGroupLayout = new TQGridLayout( nameGroup->tqlayout() ); + nameGroupLayout->tqsetAlignment( TQt::AlignTop ); nameGroupLayout->setSpacing( 6 ); nameGroupLayout->setMargin( 11 ); @@ -71,7 +71,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent nameGroupLayout->addWidget( searchForLabel, 0, 0 ); searchFor = new KHistoryCombo( false, nameGroup, "searchFor" ); - searchFor->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, searchFor->sizePolicy().hasHeightForWidth() ) ); + searchFor->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, searchFor->sizePolicy().hasHeightForWidth() ) ); searchFor->setEditable( true ); searchFor->setDuplicatesEnabled( false ); searchFor->setMaxCount( 25 ); @@ -87,7 +87,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent nameGroupLayout->addWidget( searchType, 1, 0 ); ofType = new KComboBox( false, nameGroup, "ofType" ); - ofType->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, ofType->sizePolicy().hasHeightForWidth() ) ); + ofType->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, ofType->sizePolicy().hasHeightForWidth() ) ); ofType->setEditable( false ); searchType->setBuddy(ofType); ofType->insertItem(i18n("All Files")); @@ -114,10 +114,10 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *profileHandler = new TQGroupBox( this, "profileHandler" ); profileHandler->setTitle( i18n( "&Profile handler" ) ); profileHandler->setColumnLayout(0, Qt::Vertical ); - profileHandler->layout()->setSpacing( 0 ); - profileHandler->layout()->setMargin( 0 ); - TQGridLayout *profileLayout = new TQGridLayout( profileHandler->layout() ); - profileLayout->setAlignment( TQt::AlignTop ); + profileHandler->tqlayout()->setSpacing( 0 ); + profileHandler->tqlayout()->setMargin( 0 ); + TQGridLayout *profileLayout = new TQGridLayout( profileHandler->tqlayout() ); + profileLayout->tqsetAlignment( TQt::AlignTop ); profileLayout->setSpacing( 6 ); profileLayout->setMargin( 11 ); @@ -154,10 +154,10 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *searchInGroup = new TQGroupBox( this, "searchInGroup" ); searchInGroup->setTitle( i18n( "&Search in" ) ); searchInGroup->setColumnLayout(0, Qt::Vertical ); - searchInGroup->layout()->setSpacing( 0 ); - searchInGroup->layout()->setMargin( 0 ); - TQGridLayout *searchInLayout = new TQGridLayout( searchInGroup->layout() ); - searchInLayout->setAlignment( TQt::AlignTop ); + searchInGroup->tqlayout()->setSpacing( 0 ); + searchInGroup->tqlayout()->setMargin( 0 ); + TQGridLayout *searchInLayout = new TQGridLayout( searchInGroup->tqlayout() ); + searchInLayout->tqsetAlignment( TQt::AlignTop ); searchInLayout->setSpacing( 6 ); searchInLayout->setMargin( 11 ); @@ -174,10 +174,10 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *dontSearchInGroup = new TQGroupBox( this, "dontSearchInGroup" ); dontSearchInGroup->setTitle( i18n( "&Don't search in" ) ); dontSearchInGroup->setColumnLayout(0, Qt::Vertical ); - dontSearchInGroup->layout()->setSpacing( 0 ); - dontSearchInGroup->layout()->setMargin( 0 ); - TQGridLayout *dontSearchInLayout = new TQGridLayout( dontSearchInGroup->layout() ); - dontSearchInLayout->setAlignment( TQt::AlignTop ); + dontSearchInGroup->tqlayout()->setSpacing( 0 ); + dontSearchInGroup->tqlayout()->setMargin( 0 ); + TQGridLayout *dontSearchInLayout = new TQGridLayout( dontSearchInGroup->tqlayout() ); + dontSearchInLayout->tqsetAlignment( TQt::AlignTop ); dontSearchInLayout->setSpacing( 6 ); dontSearchInLayout->setMargin( 11 ); @@ -194,10 +194,10 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *containsGroup = new TQGroupBox( this, "containsGroup" ); containsGroup->setTitle( i18n( "Containing text" ) ); containsGroup->setColumnLayout(0, Qt::Vertical ); - containsGroup->layout()->setSpacing( 0 ); - containsGroup->layout()->setMargin( 0 ); - TQGridLayout *containsLayout = new TQGridLayout( containsGroup->layout() ); - containsLayout->setAlignment( TQt::AlignTop ); + containsGroup->tqlayout()->setSpacing( 0 ); + containsGroup->tqlayout()->setMargin( 0 ); + TQGridLayout *containsLayout = new TQGridLayout( containsGroup->tqlayout() ); + containsLayout->tqsetAlignment( TQt::AlignTop ); containsLayout->setSpacing( 6 ); containsLayout->setMargin( 11 ); @@ -206,12 +206,12 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent containsTextLayout->setMargin( 0 ); TQLabel *containsLabel = new TQLabel( containsGroup, "containsLabel" ); - containsLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, containsLabel->sizePolicy().hasHeightForWidth() ) ); + containsLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, containsLabel->sizePolicy().hasHeightForWidth() ) ); containsLabel->setText( i18n( "&Text:" ) ); containsTextLayout->addWidget( containsLabel ); containsText = new KHistoryCombo( false, containsGroup, "containsText" ); - containsText->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, containsText->sizePolicy().hasHeightForWidth() ) ); + containsText->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, containsText->sizePolicy().hasHeightForWidth() ) ); containsText->setDuplicatesEnabled( false ); containsText->setMaxCount( 25 ); containsTextLayout->addWidget( containsText ); @@ -226,7 +226,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent containsCbsLayout->addItem( cbSpacer ); remoteContentSearch = new TQCheckBox( containsGroup, "remoteContentSearch" ); - remoteContentSearch->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, remoteContentSearch->sizePolicy().hasHeightForWidth() ) ); + remoteContentSearch->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, remoteContentSearch->sizePolicy().hasHeightForWidth() ) ); remoteContentSearch->setText( i18n( "&Remote content search" ) ); remoteContentSearch->setChecked( false ); containsCbsLayout->addWidget( remoteContentSearch ); @@ -234,13 +234,13 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent remoteContentSearch->hide(); containsWholeWord = new TQCheckBox( containsGroup, "containsWholeWord" ); - containsWholeWord->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, containsWholeWord->sizePolicy().hasHeightForWidth() ) ); + containsWholeWord->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, containsWholeWord->sizePolicy().hasHeightForWidth() ) ); containsWholeWord->setText( i18n( "&Match whole word only" ) ); containsWholeWord->setChecked( false ); containsCbsLayout->addWidget( containsWholeWord ); containsTextCase = new TQCheckBox( containsGroup, "containsTextCase" ); - containsTextCase->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, containsTextCase->sizePolicy().hasHeightForWidth() ) ); + containsTextCase->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, containsTextCase->sizePolicy().hasHeightForWidth() ) ); containsTextCase->setText( i18n( "Cas&e sensitive" ) ); containsTextCase->setChecked( true ); containsCbsLayout->addWidget( containsTextCase ); diff --git a/krusader/Filter/generalfilter.h b/krusader/Filter/generalfilter.h index 131c3c1..18742f6 100644 --- a/krusader/Filter/generalfilter.h +++ b/krusader/Filter/generalfilter.h @@ -37,7 +37,7 @@ #include "../GUI/profilemanager.h" #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/krusader/GUI/kcmdline.cpp b/krusader/GUI/kcmdline.cpp index 541da91..e29f3a6 100644 --- a/krusader/GUI/kcmdline.cpp +++ b/krusader/GUI/kcmdline.cpp @@ -58,19 +58,19 @@ #include <ktempfile.h> KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout * layout = new TQGridLayout( this, 1, 4 ); + TQGridLayout * tqlayout = new TQGridLayout( this, 1, 4 ); path = new TQLabel( this ); TQWhatsThis::add ( path, i18n( "Name of directory where command will be processed." ) ); - path->setAlignment( TQt::AlignRight ); + path->tqsetAlignment( TQt::AlignRight ); path->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); path->setLineWidth( 1 ); path->setFont( KGlobalSettings::generalFont() ); int height = TQFontMetrics( KGlobalSettings::generalFont() ).height(); height = height + 5*(height > 14) + 6; path->setMaximumHeight( height ); - path->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); - layout->addWidget( path, 0, 0 ); + path->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); + tqlayout->addWidget( path, 0, 0 ); // and editable command line completion.setMode( KURLCompletion::FileCompletion ); @@ -80,7 +80,7 @@ KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, nam cmdLine->setFont( KGlobalSettings::generalFont() ); cmdLine->setMaximumHeight( height ); cmdLine->setCompletionObject( &completion ); - cmdLine->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); + cmdLine->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); // load the history KConfigGroupSaver grpSvr( krConfig, "Private" ); TQStringList list = krConfig->readListEntry( "cmdline history" ); @@ -92,7 +92,7 @@ KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, nam TQWhatsThis::add ( cmdLine, i18n( "<qt><p>Well, it's actually quite simple: You type your command here and Krusader obeys.</p><p><b>Tip</b>: Move within command line history with <Up> and <Down> arrows.</p></qt>" ) ); - layout->addWidget( cmdLine, 0, 1 ); + tqlayout->addWidget( cmdLine, 0, 1 ); buttonAddPlaceholder = new TQToolButton( this, "ButtonAddPlaceholder" ); buttonAddPlaceholder->setFixedSize(22,20); @@ -101,13 +101,13 @@ KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, nam connect( buttonAddPlaceholder, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addPlaceholder() ) ); TQWhatsThis::add( buttonAddPlaceholder, i18n( "Add <b>Placeholders</b> for the selected files in the panel." ) ); - layout->addWidget( buttonAddPlaceholder, 0, 2 ); + tqlayout->addWidget( buttonAddPlaceholder, 0, 2 ); // a run in terminal button terminal = new KCMDModeButton( this ); - layout->addWidget( terminal, 0, 3 ); + tqlayout->addWidget( terminal, 0, 3 ); - layout->activate(); + tqlayout->activate(); } void KCMDLine::addPlaceholder() { diff --git a/krusader/GUI/kcmdline.h b/krusader/GUI/kcmdline.h index c6ca791..adc22f5 100644 --- a/krusader/GUI/kcmdline.h +++ b/krusader/GUI/kcmdline.h @@ -36,7 +36,7 @@ // QT includes #include <tqwidget.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtoolbutton.h> // KDE includes diff --git a/krusader/GUI/kfnkeys.cpp b/krusader/GUI/kfnkeys.cpp index 6129f40..554630b 100644 --- a/krusader/GUI/kfnkeys.cpp +++ b/krusader/GUI/kfnkeys.cpp @@ -46,7 +46,7 @@ KFnKeys::KFnKeys(TQWidget *parent, char *name): TQWidget(parent,name) { } setFont( KGlobalSettings::generalFont() ); - layout=new TQGridLayout(this,1,9); // 9 keys + tqlayout=new TQGridLayout(this,1,9); // 9 keys F2=new TQPushButton( i18n("F2 Term ") ,this); TQToolTip::add( F2, "<qt>" + i18n( "<p>Open terminal in current directory.</p>" "<p>The terminal can be defined in Konfigurator, " @@ -104,17 +104,17 @@ KFnKeys::KFnKeys(TQWidget *parent, char *name): TQWidget(parent,name) { F8->setMaximumHeight(h); F9->setMaximumHeight(h); F10->setMaximumHeight(h); - layout->addWidget(F2,0,0); - layout->addWidget(F3,0,1); - layout->addWidget(F4,0,2); - layout->addWidget(F5,0,3); - layout->addWidget(F6,0,4); - layout->addWidget(F7,0,5); - layout->addWidget(F8,0,6); - layout->addWidget(F9,0,7); - layout->addWidget(F10,0,8); + tqlayout->addWidget(F2,0,0); + tqlayout->addWidget(F3,0,1); + tqlayout->addWidget(F4,0,2); + tqlayout->addWidget(F5,0,3); + tqlayout->addWidget(F6,0,4); + tqlayout->addWidget(F7,0,5); + tqlayout->addWidget(F8,0,6); + tqlayout->addWidget(F9,0,7); + tqlayout->addWidget(F10,0,8); - layout->activate(); + tqlayout->activate(); } void KFnKeys::updateShortcuts() { diff --git a/krusader/GUI/kfnkeys.h b/krusader/GUI/kfnkeys.h index cb4a165..5613b64 100644 --- a/krusader/GUI/kfnkeys.h +++ b/krusader/GUI/kfnkeys.h @@ -33,7 +33,7 @@ #define KFNKEYS_H #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> // Function Keys widget @@ -49,7 +49,7 @@ public: private: TQPushButton *F2 ,*F3,*F4,*F5,*F6,*F7,*F8,*F9,*F10; - TQGridLayout *layout; + TQGridLayout *tqlayout; }; #endif diff --git a/krusader/GUI/krremoteencodingmenu.cpp b/krusader/GUI/krremoteencodingmenu.cpp index c6a726f..5f3ec0d 100644 --- a/krusader/GUI/krremoteencodingmenu.cpp +++ b/krusader/GUI/krremoteencodingmenu.cpp @@ -41,7 +41,7 @@ #include "krremoteencodingmenu.h" -#define DATA_KEY TQString::fromLatin1("Charset") +#define DATA_KEY TQString::tqfromLatin1("Charset") KrRemoteEncodingMenu::KrRemoteEncodingMenu(const TQString &text, const TQString &icon, TQObject *parent, const char *name) : KActionMenu( text, icon, parent, name ), settingsLoaded( false ) diff --git a/krusader/GUI/krusaderstatus.cpp b/krusader/GUI/krusaderstatus.cpp index aa5f7f0..dbca240 100644 --- a/krusader/GUI/krusaderstatus.cpp +++ b/krusader/GUI/krusaderstatus.cpp @@ -34,13 +34,13 @@ #include "../resources.h" -KrusaderStatus::KrusaderStatus(TQWidget *parent, const char *name ): +KrusadertqStatus::KrusadertqStatus(TQWidget *parent, const char *name ): KStatusBar(parent,name){ insertItem(i18n("Ready."), S_READY_ID); setMaximumHeight(TQFontMetrics(font()).height()+2); } -KrusaderStatus::~KrusaderStatus(){ +KrusadertqStatus::~KrusadertqStatus(){ } #include "krusaderstatus.moc" diff --git a/krusader/GUI/krusaderstatus.h b/krusader/GUI/krusaderstatus.h index 22f4dc9..95da4dd 100644 --- a/krusader/GUI/krusaderstatus.h +++ b/krusader/GUI/krusaderstatus.h @@ -42,12 +42,12 @@ #include <kstatusbar.h> #include <klocale.h> -class KrusaderStatus : public KStatusBar { +class KrusadertqStatus : public KStatusBar { Q_OBJECT TQ_OBJECT public: - KrusaderStatus(TQWidget *parent=0, const char *name=0); - ~KrusaderStatus(); + KrusadertqStatus(TQWidget *parent=0, const char *name=0); + ~KrusadertqStatus(); private: TQLabel *mess; diff --git a/krusader/GUI/profilemanager.cpp b/krusader/GUI/profilemanager.cpp index 7387ba9..37f633b 100644 --- a/krusader/GUI/profilemanager.cpp +++ b/krusader/GUI/profilemanager.cpp @@ -114,12 +114,12 @@ void ProfileManager::newProfile( TQString defaultName ) if( !profile.isEmpty() ) { int profileNum = 1; - while( profileList.contains( TQString( "%1" ).arg( profileNum ) ) ) + while( profileList.contains( TQString( "%1" ).tqarg( profileNum ) ) ) profileNum++; - TQString profileString = TQString( "%1" ).arg( profileNum ); + TQString profileString = TQString( "%1" ).tqarg( profileNum ); TQString profileName = profileType + " - " + profileString; - profileList.append( TQString( "%1" ).arg( profileString ) ); + profileList.append( TQString( "%1" ).tqarg( profileString ) ); krConfig->setGroup("Private"); krConfig->writeEntry( profileType, profileList ); diff --git a/krusader/KViewer/diskusageviewer.cpp b/krusader/KViewer/diskusageviewer.cpp index 8f07159..ebaf6bd 100644 --- a/krusader/KViewer/diskusageviewer.cpp +++ b/krusader/KViewer/diskusageviewer.cpp @@ -37,7 +37,7 @@ DiskUsageViewer::DiskUsageViewer( TQWidget *parent, char *name ) : TQWidget( parent, name ), diskUsage( 0 ), statusLabel( 0 ) { - layout = new TQGridLayout( this, 1, 1 ); + tqlayout = new TQGridLayout( this, 1, 1 ); } DiskUsageViewer::~ DiskUsageViewer() @@ -56,10 +56,10 @@ void DiskUsageViewer::openURL( KURL url ) { diskUsage = new DiskUsage( "DiskUsageViewer", this ); - connect( diskUsage, TQT_SIGNAL( enteringDirectory( Directory * ) ), this, TQT_SLOT( slotUpdateStatus() ) ); - connect( diskUsage, TQT_SIGNAL( status( TQString ) ), this, TQT_SLOT( slotUpdateStatus( TQString ) ) ); + connect( diskUsage, TQT_SIGNAL( enteringDirectory( Directory * ) ), this, TQT_SLOT( slotUpdatetqStatus() ) ); + connect( diskUsage, TQT_SIGNAL( status( TQString ) ), this, TQT_SLOT( slotUpdatetqStatus( TQString ) ) ); connect( diskUsage, TQT_SIGNAL( newSearch() ), this, TQT_SLOT( slotNewSearch() ) ); - layout->addWidget( diskUsage, 0, 0 ); + tqlayout->addWidget( diskUsage, 0, 0 ); this->show(); diskUsage->show(); @@ -109,7 +109,7 @@ void DiskUsageViewer::setStatusLabel( TQLabel *statLabel, TQString pref ) prefix = pref; } -void DiskUsageViewer::slotUpdateStatus( TQString status ) +void DiskUsageViewer::slotUpdatetqStatus( TQString status ) { if( statusLabel ) { if( status.isEmpty() ) { diff --git a/krusader/KViewer/diskusageviewer.h b/krusader/KViewer/diskusageviewer.h index 0db8895..b7ef603 100644 --- a/krusader/KViewer/diskusageviewer.h +++ b/krusader/KViewer/diskusageviewer.h @@ -33,7 +33,7 @@ #include "../DiskUsage/diskusage.h" #include <kurl.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> class DiskUsageViewer : public TQWidget @@ -55,12 +55,12 @@ signals: void openURLRequest(const KURL &); protected slots: - void slotUpdateStatus( TQString status = TQString() ); + void slotUpdatetqStatus( TQString status = TQString() ); void slotNewSearch(); protected: DiskUsage *diskUsage; - TQGridLayout *layout; + TQGridLayout *tqlayout; TQLabel *statusLabel; TQString prefix; diff --git a/krusader/KViewer/kimagefilepreview.cpp b/krusader/KViewer/kimagefilepreview.cpp index 33784ac..302e8c2 100644 --- a/krusader/KViewer/kimagefilepreview.cpp +++ b/krusader/KViewer/kimagefilepreview.cpp @@ -7,7 +7,7 @@ * License. See the file "COPYING" for the exact licensing terms. */ -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> @@ -36,8 +36,8 @@ m_job( 0L ) { imageLabel = new TQLabel( this ); imageLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); - imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); + imageLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); vb->addWidget( imageLabel, 1 ); timer = new TQTimer( this ); @@ -91,7 +91,7 @@ void KrusaderImageFilePreview::resizeEvent( TQResizeEvent * ) { timer->start( 100, true ); // forces a new preview } -TQSize KrusaderImageFilePreview::sizeHint() const { +TQSize KrusaderImageFilePreview::tqsizeHint() const { return TQSize( 20, 200 ); // otherwise it ends up huge??? } diff --git a/krusader/KViewer/kimagefilepreview.h b/krusader/KViewer/kimagefilepreview.h index 64c8e46..23cce72 100644 --- a/krusader/KViewer/kimagefilepreview.h +++ b/krusader/KViewer/kimagefilepreview.h @@ -34,7 +34,7 @@ class KrusaderImageFilePreview : public KPreviewWidgetBase { KrusaderImageFilePreview( TQWidget *parent ); ~KrusaderImageFilePreview(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: virtual void showPreview( const KURL &url ); diff --git a/krusader/KViewer/panelviewer.cpp b/krusader/KViewer/panelviewer.cpp index 6f16dd5..d2205fa 100644 --- a/krusader/KViewer/panelviewer.cpp +++ b/krusader/KViewer/panelviewer.cpp @@ -25,13 +25,13 @@ PanelViewerBase::PanelViewerBase( TQWidget *parent ) : TQWidgetStack( parent ), mimes( 0 ), cpart( 0 ) { - setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); mimes = new TQDict<KParts::ReadOnlyPart>( DICTSIZE, false ); mimes->setAutoDelete( true ); cpart = 0; fallback = new TQLabel( i18n( "No file selected or selected file can't be displayed." ), this ); - fallback->setAlignment( AlignCenter | ExpandTabs | WordBreak ); + fallback->tqsetAlignment( AlignCenter | ExpandTabs | WordBreak ); addWidget( fallback ); raiseWidget( fallback ); } diff --git a/krusader/Konfigurator/kgadvanced.cpp b/krusader/Konfigurator/kgadvanced.cpp index cccc85f..9fc62f0 100644 --- a/krusader/Konfigurator/kgadvanced.cpp +++ b/krusader/Konfigurator/kgadvanced.cpp @@ -46,7 +46,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) : // -------------------------- GENERAL GROUPBOX ---------------------------------- TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgAdvGeneralGrp" ); - TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() ); + TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); #if KDE_IS_VERSION( 3,5,1 ) bool dontUseMedia = false; @@ -86,7 +86,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) : // ----------------------- CONFIRMATIONS GROUPBOX ------------------------------- TQGroupBox *confirmGrp = createFrame( i18n( "Confirmations" ), parent, "confirmGrp" ); - TQGridLayout *confirmGrid = createGridLayout( confirmGrp->layout() ); + TQGridLayout *confirmGrid = createGridLayout( confirmGrp->tqlayout() ); addLabel( confirmGrid, 0, 0, "\n"+i18n( "Request user confirmation for the following operations:" )+"\n", confirmGrp, "KgAdvLabel1" ); @@ -110,8 +110,8 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) : // ------------------------ FINE-TUNING GROUPBOX -------------------------------- TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), parent, "kgFineTuneGrp" ); - TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->layout() ); - fineTuneGrid->setAlignment( TQt::AlignLeft | TQt::AlignTop ); + TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->tqlayout() ); + fineTuneGrid->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop ); TQLabel *label = new TQLabel( i18n( "Icon cache size (KB):" ), fineTuneGrp, "iconCacheLabel" ); TQWhatsThis::add( label, i18n( "The icon cache size influences how fast the contents of a panel can be displayed. However, too large a cache might consume your memory." ) ); @@ -119,7 +119,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) : KonfiguratorSpinBox *spinBox = createSpinBox( "Advanced", "Icon Cache Size", _IconCacheSize, 1, 8192, fineTuneGrp, false ); TQWhatsThis::add( spinBox, i18n( "The icon cache size influences how fast the contents of a panel can be displayed. However, too large a cache might consume your memory." ) ); - spinBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed); + spinBox->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed); fineTuneGrid->addWidget( spinBox, 0, 1 ); addLabel( fineTuneGrid, 1, 0, i18n( "Arguments of updatedb:" ), diff --git a/krusader/Konfigurator/kgarchives.cpp b/krusader/Konfigurator/kgarchives.cpp index a4ea958..5ab4424 100644 --- a/krusader/Konfigurator/kgarchives.cpp +++ b/krusader/Konfigurator/kgarchives.cpp @@ -49,7 +49,7 @@ KgArchives::KgArchives( bool first, TQWidget* parent, const char* name ) : // -------------------------- GENERAL GROUPBOX ---------------------------------- TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "generalGrp" ); - TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() ); + TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); addLabel( generalGrid, 0, 0, i18n( "Krusader transparently handles the following types of archives:" ), generalGrp, "KgLabel1" ); @@ -87,7 +87,7 @@ KgArchives::KgArchives( bool first, TQWidget* parent, const char* name ) : // ------------------------ FINE-TUNING GROUPBOX -------------------------------- TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), parent, "fineTuneGrp" ); - TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->layout() ); + TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->tqlayout() ); KONFIGURATOR_CHECKBOX_PARAM finetuners[] = // cfg_class cfg_name default text restart ToolTip diff --git a/krusader/Konfigurator/kgcolors.cpp b/krusader/Konfigurator/kgcolors.cpp index 1eaec6a..01e4a7e 100644 --- a/krusader/Konfigurator/kgcolors.cpp +++ b/krusader/Konfigurator/kgcolors.cpp @@ -49,7 +49,7 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) : // -------------------------- GENERAL GROUPBOX ---------------------------------- TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgColorsGeneralGrp" ); - TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() ); + TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); generalGrid->setSpacing( 0 ); generalGrid->setMargin( 5 ); @@ -64,7 +64,7 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) : generals = createCheckBoxGroup( 0, 2, generalSettings, sizeof(generalSettings)/sizeof(generalSettings[0]), generalGrp ); generalGrid->addWidget( generals, 1, 0 ); - generals->layout()->setSpacing( 5 ); + generals->tqlayout()->setSpacing( 5 ); connect( generals->find( "KDE Default" ), TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotDisable() ) ); connect( generals->find( "Enable Alternate Background" ), TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( generatePreview() ) ); @@ -77,7 +77,7 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) : // -------------------------- COLORS GROUPBOX ---------------------------------- TQGroupBox *colorsFrameGrp = createFrame( i18n( "Colors" ), hbox, "kgColorsColorsGrp" ); - TQGridLayout *colorsFrameGrid = createGridLayout( colorsFrameGrp->layout() ); + TQGridLayout *colorsFrameGrid = createGridLayout( colorsFrameGrp->tqlayout() ); colorsFrameGrid->setSpacing( 0 ); colorsFrameGrid->setMargin( 3 ); @@ -168,9 +168,9 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) : addColorSelector( "Dim Target Color", i18n( "Dim target color:" ), TQt::white); int index = itemList.count() - offset; - labelList.append( addLabel( colorsGrid, index, 0, i18n("Dim factor:"), colorsGrp, TQString( "ColorsLabel%1" ).arg( index ).ascii() ) ); + labelList.append( addLabel( colorsGrid, index, 0, i18n("Dim factor:"), colorsGrp, TQString( "ColorsLabel%1" ).tqarg( index ).ascii() ) ); dimFactor = createSpinBox("Colors", "Dim Factor", 100, 0, 100, colorsGrp); - dimFactor->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + dimFactor->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); connect( dimFactor, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( generatePreview() ) ); colorsGrid->addWidget( dimFactor, index++, 1 ); @@ -210,7 +210,7 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) : // -------------------------- PREVIEW GROUPBOX ---------------------------------- previewGrp = createFrame( i18n( "Preview" ), hbox, "kgColorsPreviewGrp" ); - previewGrid = createGridLayout( previewGrp->layout() ); + previewGrid = createGridLayout( previewGrp->tqlayout() ); preview = new TQListView( previewGrp, "colorPreView" ); @@ -241,9 +241,9 @@ int KgColors::addColorSelector( TQString cfgName, TQString name, TQColor dflt, T { int index = itemList.count() - offset; - labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, TQString( "ColorsLabel%1" ).arg( index ).ascii() ) ); + labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, TQString( "ColorsLabel%1" ).tqarg( index ).ascii() ) ); KonfiguratorColorChooser *chooser = createColorChooser( "Colors", cfgName, dflt, colorsGrp, false, addColor, addColNum ); - chooser->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + chooser->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); if( !dfltName.isEmpty() ) chooser->setDefaultText( dfltName ); diff --git a/krusader/Konfigurator/kgdependencies.cpp b/krusader/Konfigurator/kgdependencies.cpp index 76366a2..a9f2c96 100644 --- a/krusader/Konfigurator/kgdependencies.cpp +++ b/krusader/Konfigurator/kgdependencies.cpp @@ -55,7 +55,7 @@ KgDependencies::KgDependencies( bool first, TQWidget* parent, const char* name TQGridLayout *pathsGrid = new TQGridLayout( general_tab ); pathsGrid->setSpacing( 6 ); pathsGrid->setMargin( 11 ); - pathsGrid->setAlignment( TQt::AlignTop ); + pathsGrid->tqsetAlignment( TQt::AlignTop ); addApplication( "df", pathsGrid, 0, general_tab, PAGE_GENERAL ); addApplication( "eject", pathsGrid, 1, general_tab, PAGE_GENERAL ); @@ -77,7 +77,7 @@ KgDependencies::KgDependencies( bool first, TQWidget* parent, const char* name TQGridLayout *archGrid1 = new TQGridLayout( packers_tab ); archGrid1->setSpacing( 6 ); archGrid1->setMargin( 11 ); - archGrid1->setAlignment( TQt::AlignTop ); + archGrid1->tqsetAlignment( TQt::AlignTop ); addApplication( "7z", archGrid1, 0, packers_tab, PAGE_PACKERS, "7za" ); addApplication( "arj", archGrid1, 1, packers_tab, PAGE_PACKERS ); @@ -101,7 +101,7 @@ KgDependencies::KgDependencies( bool first, TQWidget* parent, const char* name TQGridLayout *archGrid2 = new TQGridLayout( checksum_tab ); archGrid2->setSpacing( 6 ); archGrid2->setMargin( 11 ); - archGrid2->setAlignment( TQt::AlignTop ); + archGrid2->tqsetAlignment( TQt::AlignTop ); addApplication( "md5sum", archGrid2, 0, checksum_tab, PAGE_CHECKSUM ); addApplication( "sha1sum", archGrid2, 1, checksum_tab, PAGE_CHECKSUM ); @@ -154,10 +154,10 @@ void KgDependencies::slotApply( TQObject *obj, TQString cls, TQString name ) krConfig->writeEntry( name, usedPath ); if( usedPath.isEmpty() ) KMessageBox::error( this, i18n( "The %1 path is incorrect, no valid path found." ) - .arg( urlRequester->url() ) ); + .tqarg( urlRequester->url() ) ); else KMessageBox::error( this, i18n( "The %1 path is incorrect, %2 used instead." ) - .arg( urlRequester->url() ).arg( usedPath ) ); + .tqarg( urlRequester->url() ).tqarg( usedPath ) ); urlRequester->setURL( usedPath ); } } diff --git a/krusader/Konfigurator/kggeneral.cpp b/krusader/Konfigurator/kggeneral.cpp index 5087580..3f9923e 100644 --- a/krusader/Konfigurator/kggeneral.cpp +++ b/krusader/Konfigurator/kggeneral.cpp @@ -53,7 +53,7 @@ if( first ) // -------------------------- GENERAL GROUPBOX ---------------------------------- TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgGenGeneralGrp" ); - TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() ); + TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); KONFIGURATOR_NAME_VALUE_TIP deleteMode[] = // name value tooltip diff --git a/krusader/Konfigurator/kglookfeel.cpp b/krusader/Konfigurator/kglookfeel.cpp index 8d33893..e2f542b 100644 --- a/krusader/Konfigurator/kglookfeel.cpp +++ b/krusader/Konfigurator/kglookfeel.cpp @@ -78,7 +78,7 @@ void KgLookFeel::setupOperationTab() { // -------------- General ----------------- TQGroupBox *lookFeelGrp = createFrame( i18n( "Look && Feel" ), tab, "kgLookAndFeelGrp" ); - TQGridLayout *lookFeelGrid = createGridLayout( lookFeelGrp->layout() ); + TQGridLayout *lookFeelGrid = createGridLayout( lookFeelGrp->tqlayout() ); KONFIGURATOR_CHECKBOX_PARAM settings[] = { // cfg_class cfg_name default text restart tooltip @@ -97,7 +97,7 @@ void KgLookFeel::setupOperationTab() { // -------------- Quicksearch ----------------- TQGroupBox *quicksearchGroup = createFrame( i18n( "Quicksearch" ), tab, "kgQuicksearchGrp" ); - TQGridLayout *quicksearchGrid = createGridLayout( quicksearchGroup->layout() ); + TQGridLayout *quicksearchGrid = createGridLayout( quicksearchGroup->tqlayout() ); KONFIGURATOR_CHECKBOX_PARAM quicksearch[] = { // cfg_class cfg_name default text restart tooltip @@ -124,7 +124,7 @@ void KgLookFeel::setupPanelTab() { panelLayout->setSpacing( 6 ); panelLayout->setMargin( 11 ); TQGroupBox *panelGrp = createFrame( i18n( "Panel settings" ), tab_panel, "kgPanelGrp" ); - TQGridLayout *panelGrid = createGridLayout( panelGrp->layout() ); + TQGridLayout *panelGrid = createGridLayout( panelGrp->tqlayout() ); TQHBox *hbox = new TQHBox( panelGrp, "lookAndFeelHBox1" ); new TQLabel( i18n( "Panel font:" ), hbox, "lookAndFeelLabel" ); @@ -200,7 +200,7 @@ void KgLookFeel::setupPanelToolbarTab() { connect( panelToolbarActive->find( "Panel Toolbar visible" ), TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotEnablePanelToolbar() ) ); TQGroupBox * panelToolbarGrp = createFrame( i18n( "Visible Panel Toolbar buttons" ), tab_4, "panelToolbarGrp"); - TQGridLayout * panelToolbarGrid = createGridLayout( panelToolbarGrp->layout() ); + TQGridLayout * panelToolbarGrid = createGridLayout( panelToolbarGrp->tqlayout() ); KONFIGURATOR_CHECKBOX_PARAM panelToolbarCheckboxes[] = { @@ -238,7 +238,7 @@ void KgLookFeel::setupMouseModeTab() { // -------------- General ----------------- TQGroupBox *mouseGeneralGroup = createFrame( i18n( "General" ), tab_mouse, "mouseGeneralGroup" ); - TQGridLayout *mouseGeneralGrid = createGridLayout( mouseGeneralGroup->layout() ); + TQGridLayout *mouseGeneralGrid = createGridLayout( mouseGeneralGroup->tqlayout() ); mouseGeneralGrid->setSpacing( 0 ); mouseGeneralGrid->setMargin( 5 ); @@ -251,7 +251,7 @@ void KgLookFeel::setupMouseModeTab() { { i18n( "Custom Selection Mode" ), "3", i18n( "Design your own selection mode!" ) } }; mouseRadio = createRadioButtonGroup( "Look&Feel", "Mouse Selection", "0", 2, 2, mouseSelection, 4, mouseGeneralGroup, "myLook&FeelRadio", true, PAGE_MOUSE ); - mouseRadio->layout()->setMargin( 0 ); + mouseRadio->tqlayout()->setMargin( 0 ); mouseGeneralGrid->addWidget( mouseRadio, 0, 0 ); connect( mouseRadio, TQT_SIGNAL( clicked(int) ), TQT_SLOT( slotSelectionModeChanged() ) ); @@ -259,7 +259,7 @@ void KgLookFeel::setupMouseModeTab() { // -------------- Details ----------------- TQGroupBox *mouseDetailGroup = createFrame( i18n( "Details" ), tab_mouse, "mouseDetailGroup" ); - TQGridLayout *mouseDetailGrid = createGridLayout( mouseDetailGroup->layout() ); + TQGridLayout *mouseDetailGrid = createGridLayout( mouseDetailGroup->tqlayout() ); mouseDetailGrid->setSpacing( 0 ); mouseDetailGrid->setMargin( 5 ); @@ -270,7 +270,7 @@ void KgLookFeel::setupMouseModeTab() { { i18n( "Obey KDE's global selection policy" ), "1", i18n( "<p>Use KDE's global setting:</p><p><i>KDE Control Center -> Peripherals -> Mouse</i></p>" ) } }; KonfiguratorRadioButtons *clickRadio = createRadioButtonGroup( "Look&Feel", "Single Click Selects", "0", 1, 0, singleOrDoubleClick, 2, mouseDetailGroup, "myLook&FeelRadio0", true, PAGE_MOUSE ); - clickRadio->layout()->setMargin( 0 ); + clickRadio->tqlayout()->setMargin( 0 ); mouseDetailGrid->addWidget( clickRadio, 0, 0 ); KONFIGURATOR_CHECKBOX_PARAM mouseCheckboxesParam[] = @@ -324,7 +324,7 @@ void KgLookFeel::setupMouseModeTab() { // -------------- Preview ----------------- TQGroupBox *mousePreviewGroup = createFrame( i18n( "Preview" ), tab_mouse, "mousePreviewGroup" ); - TQGridLayout *mousePreviewGrid = createGridLayout( mousePreviewGroup->layout() ); + TQGridLayout *mousePreviewGrid = createGridLayout( mousePreviewGroup->tqlayout() ); // TODO preview mousePreview = new TQListView( mousePreviewGroup, "mousePreview" ); mousePreviewGrid->addWidget( mousePreview, 0 ,0 ); diff --git a/krusader/Konfigurator/kgprotocols.cpp b/krusader/Konfigurator/kgprotocols.cpp index 08b613a..a6ea11f 100644 --- a/krusader/Konfigurator/kgprotocols.cpp +++ b/krusader/Konfigurator/kgprotocols.cpp @@ -65,7 +65,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) : // -------------------------- LINK VIEW ---------------------------------- TQGroupBox *linkGrp = createFrame( i18n( "Links" ), parent, "linkGrp" ); - TQGridLayout *linkGrid = createGridLayout( linkGrp->layout() ); + TQGridLayout *linkGrid = createGridLayout( linkGrp->tqlayout() ); linkList = new TQListView( linkGrp, "linkList" ); linkList->addColumn( i18n( "Defined Links" ) ); @@ -106,7 +106,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) : // -------------------------- PROTOCOLS LISTBOX ---------------------------------- TQGroupBox *protocolGrp = createFrame( i18n( "Protocols" ), parent, "protocolGrp" ); - TQGridLayout *protocolGrid = createGridLayout( protocolGrp->layout() ); + TQGridLayout *protocolGrid = createGridLayout( protocolGrp->tqlayout() ); protocolList = new TQListBox( protocolGrp, "protocolList" ); loadListCapableProtocols(); @@ -117,7 +117,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) : // -------------------------- MIMES LISTBOX ---------------------------------- TQGroupBox *mimeGrp = createFrame( i18n( "Mimes" ), parent, "mimeGrp" ); - TQGridLayout *mimeGrid = createGridLayout( mimeGrp->layout() ); + TQGridLayout *mimeGrid = createGridLayout( mimeGrp->tqlayout() ); mimeList = new TQListBox( mimeGrp, "protocolList" ); loadMimes(); @@ -143,9 +143,9 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) : TQWidget* KgProtocols::addSpacer( TQWidget *parent, const char *widgetName ) { TQWidget *widget = new TQWidget( parent, widgetName ); - TQVBoxLayout *vboxlayout = new TQVBoxLayout( widget ); + TQVBoxLayout *vboxtqlayout = new TQVBoxLayout( widget ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - vboxlayout->addItem( spacer ); + vboxtqlayout->addItem( spacer ); return widget; } @@ -305,7 +305,7 @@ void KgProtocols::loadInitialValues() { addProtocol( *it ); - TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).arg( *it ) ); + TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).tqarg( *it ) ); for( TQStringList::Iterator it2 = mimes.begin(); it2 != mimes.end(); it2++ ) addMime( *it2, *it ); @@ -354,7 +354,7 @@ bool KgProtocols::isChanged() if( !protList.contains( item->text( 0 ) ) ) return true; - TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).arg( item->text( 0 ) ) ); + TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).tqarg( item->text( 0 ) ) ); if( (int)mimes.count() != item->childCount() ) return true; @@ -390,7 +390,7 @@ bool KgProtocols::apply() mimes.append( childs->text( 0 ) ); childs = childs->nextSibling(); } - krConfig->writeEntry( TQString( "Mimes For %1" ).arg( item->text( 0 ) ), mimes ); + krConfig->writeEntry( TQString( "Mimes For %1" ).tqarg( item->text( 0 ) ), mimes ); item = item->nextSibling(); } diff --git a/krusader/Konfigurator/kgstartup.cpp b/krusader/Konfigurator/kgstartup.cpp index 6af61bc..6201039 100644 --- a/krusader/Konfigurator/kgstartup.cpp +++ b/krusader/Konfigurator/kgstartup.cpp @@ -45,7 +45,7 @@ KgStartup::KgStartup( bool first, TQWidget* parent, const char* name ) : // --------------------------- PANELS GROUPBOX ---------------------------------- TQGroupBox *panelsGrp = createFrame( i18n( "General" ), parent, "panelsGrp" ); - TQGridLayout *panelsGrid = createGridLayout( panelsGrp->layout() ); + TQGridLayout *panelsGrid = createGridLayout( panelsGrp->tqlayout() ); TQString s = "<p><img src='toolbar|kr_profile'></p>" + i18n( "Defines the panel profile used at startup. A panel profile contains:<ul><li>all the tabs paths</li><li>the current tab</li><li>the active panel</li></ul><b><Last session></b> is a special panel profile which is saved automatically when Krusader is closed."); TQLabel *label = addLabel( panelsGrid, 0, 0, i18n( "Startup profile:" ), panelsGrp, "Startup session" ); @@ -61,7 +61,7 @@ KgStartup::KgStartup( bool first, TQWidget* parent, const char* name ) : comboItems[ 0 ].value = ""; profileCombo = createComboBox( "Startup", "Starter Profile Name", comboItems[ 0 ].value, comboItems, profileList.count(), panelsGrp, false, false ); - profileCombo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed); + profileCombo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed); panelsGrid->addWidget( profileCombo, 0, 1 ); //------------------------------------------------ @@ -81,7 +81,7 @@ KgStartup::KgStartup( bool first, TQWidget* parent, const char* name ) : // ------------------------ USERINTERFACE GROUPBOX ------------------------------ TQGroupBox *uiGrp = createFrame( i18n( "User Interface" ), parent, "uiGrp" ); - TQGridLayout *uiGrid = createGridLayout( uiGrp->layout() ); + TQGridLayout *uiGrid = createGridLayout( uiGrp->tqlayout() ); KONFIGURATOR_CHECKBOX_PARAM uiCheckBoxes[] = { // cfg_class cfg_name default text restart ToolTip diff --git a/krusader/Konfigurator/kguseractions.cpp b/krusader/Konfigurator/kguseractions.cpp index ebb18fd..9a8a938 100644 --- a/krusader/Konfigurator/kguseractions.cpp +++ b/krusader/Konfigurator/kguseractions.cpp @@ -46,7 +46,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* parent, const char* name ) // ============= Info Group ============= TQGroupBox *InfoGroup = createFrame( i18n( "Information" ), parent, "kgUserActionInfoGroup" ); - TQGridLayout *InfoGrid = createGridLayout( InfoGroup->layout() ); + TQGridLayout *InfoGrid = createGridLayout( InfoGroup->tqlayout() ); // terminal for the UserActions TQLabel *labelInfo = new TQLabel( i18n( @@ -62,7 +62,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* parent, const char* name ) // ============= Terminal Group ============= TQGroupBox *terminalGroup = createFrame( i18n( "Terminal execution" ), parent, "kgUserActionTerminalGroup" ); - TQGridLayout *terminalGrid = createGridLayout( terminalGroup->layout() ); + TQGridLayout *terminalGrid = createGridLayout( terminalGroup->tqlayout() ); // terminal for the UserActions TQLabel *labelTerminal = new TQLabel( i18n( "Terminal for UserActions:" ), @@ -76,7 +76,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* parent, const char* name ) // ============= Outputcollection Group ============= TQGroupBox *outputGroup = createFrame( i18n( "Output collection" ), parent, "kgUserActionOutputGroup" ); - TQGridLayout *outputGrid = createGridLayout( outputGroup->layout() ); + TQGridLayout *outputGrid = createGridLayout( outputGroup->tqlayout() ); TQHBox *hbox; hbox = new TQHBox( outputGroup, "HBoxNormalFont" ); diff --git a/krusader/Konfigurator/konfiguratoritems.cpp b/krusader/Konfigurator/konfiguratoritems.cpp index 13e0fb2..0fd922d 100644 --- a/krusader/Konfigurator/konfiguratoritems.cpp +++ b/krusader/Konfigurator/konfiguratoritems.cpp @@ -418,7 +418,7 @@ void KonfiguratorFontChooser::loadInitialValue() void KonfiguratorFontChooser::setFont() { pLabel->setFont( font ); - pLabel->setText( font.family()+TQString(", %1").arg(font.pointSize()) ); + pLabel->setText( font.family()+TQString(", %1").tqarg(font.pointSize()) ); } void KonfiguratorFontChooser::slotApply(TQObject *,TQString cls, TQString name) @@ -696,7 +696,7 @@ TQString KonfiguratorColorChooser::getValue() else if( currentItem() >= 2 && (unsigned)currentItem() < 2 + additionalColors.size() ) return additionalColors[ currentItem() - 2 ].value; else - return TQString( "%1,%2,%3" ).arg( color.red() ).arg( color.green() ).arg( color.blue() ); + return TQString( "%1,%2,%3" ).tqarg( color.red() ).tqarg( color.green() ).tqarg( color.blue() ); } bool KonfiguratorColorChooser::isValueRGB() diff --git a/krusader/Konfigurator/konfiguratorpage.cpp b/krusader/Konfigurator/konfiguratorpage.cpp index 811e077..0ae9e3d 100644 --- a/krusader/Konfigurator/konfiguratorpage.cpp +++ b/krusader/Konfigurator/konfiguratorpage.cpp @@ -29,7 +29,7 @@ ***************************************************************************/ #include "konfiguratorpage.h" -#include <layout.h> +#include <tqlayout.h> #include "../krusader.h" #include <tqwhatsthis.h> @@ -156,34 +156,34 @@ TQGroupBox* KonfiguratorPage::createFrame( TQString text, TQWidget *parent, if( !text.isNull() ) groupBox->setTitle( text ); groupBox->setColumnLayout(0, Qt::Vertical ); - groupBox->layout()->setSpacing( 0 ); - groupBox->layout()->setMargin( 0 ); + groupBox->tqlayout()->setSpacing( 0 ); + groupBox->tqlayout()->setMargin( 0 ); return groupBox; } TQGridLayout* KonfiguratorPage::createGridLayout( TQLayout *parent ) { TQGridLayout *gridLayout = new TQGridLayout( parent ); - gridLayout->setAlignment( TQt::AlignTop ); + gridLayout->tqsetAlignment( TQt::AlignTop ); gridLayout->setSpacing( 6 ); gridLayout->setMargin( 11 ); return gridLayout; } -TQLabel* KonfiguratorPage::addLabel( TQGridLayout *layout, int x, int y, TQString label, +TQLabel* KonfiguratorPage::addLabel( TQGridLayout *tqlayout, int x, int y, TQString label, TQWidget *parent, const char *widgetName ) { TQLabel *lbl = new TQLabel( label, parent, widgetName ); - layout->addWidget( lbl, x, y ); + tqlayout->addWidget( lbl, x, y ); return lbl; } TQWidget* KonfiguratorPage::createSpacer( TQWidget *parent, const char *widgetName ) { TQWidget *widget = new TQWidget( parent, widgetName ); - TQHBoxLayout *hboxlayout = new TQHBoxLayout( widget ); + TQHBoxLayout *hboxtqlayout = new TQHBoxLayout( widget ); TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - hboxlayout->addItem( spacer ); + hboxtqlayout->addItem( spacer ); return widget; } @@ -192,9 +192,9 @@ KonfiguratorCheckBoxGroup* KonfiguratorPage::createCheckBoxGroup( int sizex, int const char *widgetName, int pg ) { KonfiguratorCheckBoxGroup *groupWidget = new KonfiguratorCheckBoxGroup( parent, widgetName ); - TQGridLayout *layout = new TQGridLayout( groupWidget ); - layout->setSpacing( 6 ); - layout->setMargin( 0 ); + TQGridLayout *tqlayout = new TQGridLayout( groupWidget ); + tqlayout->setSpacing( 6 ); + tqlayout->setMargin( 0 ); int x = 0, y = 0; @@ -205,7 +205,7 @@ KonfiguratorCheckBoxGroup* KonfiguratorPage::createCheckBoxGroup( int sizex, int params[i].restart, params[i].toolTip, pg ); groupWidget->add( checkBox ); - layout->addWidget( checkBox, y, x ); + tqlayout->addWidget( checkBox, y, x ); if( sizex ) { @@ -234,10 +234,10 @@ KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup( TQString cls radioWidget->setRadioButtonExclusive( true ); radioWidget->setColumnLayout(0, Qt::Vertical ); - TQGridLayout *layout = new TQGridLayout( radioWidget->layout() ); - layout->setAlignment( TQt::AlignTop ); - layout->setSpacing( 6 ); - layout->setMargin( 0 ); + TQGridLayout *tqlayout = new TQGridLayout( radioWidget->tqlayout() ); + tqlayout->tqsetAlignment( TQt::AlignTop ); + tqlayout->setSpacing( 6 ); + tqlayout->setMargin( 0 ); int x = 0, y = 0; @@ -249,7 +249,7 @@ KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup( TQString cls if( !params[i].tooltip.isEmpty() ) TQWhatsThis::add( radBtn, params[i].tooltip ); - layout->addWidget( radBtn, y, x ); + tqlayout->addWidget( radBtn, y, x ); radioWidget->addRadioButton( radBtn, params[i].text, params[i].value ); diff --git a/krusader/Konfigurator/konfiguratorpage.h b/krusader/Konfigurator/konfiguratorpage.h index 393a18f..5717acb 100644 --- a/krusader/Konfigurator/konfiguratorpage.h +++ b/krusader/Konfigurator/konfiguratorpage.h @@ -36,7 +36,7 @@ #include <tqptrlist.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> struct KONFIGURATOR_CHECKBOX_PARAM; struct KONFIGURATOR_NAME_VALUE_TIP; @@ -293,25 +293,25 @@ public: * * Sample:<br><br> * TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), parentWidget, "frameName" );<br> - * TQGridLayout *myLayout = createGridLayout( myGroup->layout() );<br> + * TQGridLayout *myLayout = createGridLayout( myGroup->tqlayout() );<br> * myLayout->addWidget( myGroup, 0, 0 ); * - * @param parent Reference to the parent layout + * @param parent Reference to the parent tqlayout * * @return reference to the newly created TQGridLayout */ TQGridLayout *createGridLayout( TQLayout *parent ); /** - * Adds a new label to a grid layout. + * Adds a new label to a grid tqlayout. * * Sample:<br><br> * TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), parentWidget, "frameName" );<br> - * TQGridLayout *myLayout = createGridLayout( myGroup->layout() );<br> + * TQGridLayout *myLayout = createGridLayout( myGroup->tqlayout() );<br> * addLabel( myLayout, 0, 0, i18n( "Hello world!" ), myGroup, "myLabel" );<br> * mainLayout->addWidget( myGroup, 0, 0 ); * - * @param layout The grid layout on which the item will be placed + * @param tqlayout The grid tqlayout on which the item will be placed * @param x the column to which the label will be placed * @param y the row to which the label will be placed * @param label the text of the label @@ -320,7 +320,7 @@ public: * * @return reference to the newly created label */ - TQLabel *addLabel( TQGridLayout *layout, int x, int y, TQString label, + TQLabel *addLabel( TQGridLayout *tqlayout, int x, int y, TQString label, TQWidget *parent=0, const char *widgetName=0 ); /** diff --git a/krusader/Konfigurator/krresulttable.cpp b/krusader/Konfigurator/krresulttable.cpp index 9abc8a1..32f2691 100644 --- a/krusader/Konfigurator/krresulttable.cpp +++ b/krusader/Konfigurator/krresulttable.cpp @@ -80,7 +80,7 @@ void KrResultTable::adjustRow(TQGridLayout* grid) while( (child = it.current()) != 0 ) { // Add some space between columns - child->widget()->setMinimumWidth( child->widget()->sizeHint().width() + 15 ); + child->widget()->setMinimumWidth( child->widget()->tqsizeHint().width() + 15 ); // Paint uneven rows in alternate color if( ((col/_numColumns)%2) ) @@ -178,7 +178,7 @@ bool KrArchiverResultTable::addRow(SearchObject* search, TQGridLayout* grid) // Name column _label = new KURLLabel(arch->getWebsite(), arch->getSearchName(), this); _label->setMargin(5); - _label->setAlignment(TQt::AlignTop); + _label->tqsetAlignment(TQt::AlignTop); grid->addWidget(_label, _numRows, 0); connect(_label, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(website(const TQString&))); @@ -191,7 +191,7 @@ bool KrArchiverResultTable::addRow(SearchObject* search, TQGridLayout* grid) // Packing column _label = new TQLabel(this); _label->setMargin(5); - _label->setAlignment( TQt::AlignTop ); + _label->tqsetAlignment( TQt::AlignTop ); if( arch->getIsPacker() && arch->getFound() ) { _label->setText( i18n("enabled") ); _label->setPaletteForegroundColor("darkgreen"); @@ -205,7 +205,7 @@ bool KrArchiverResultTable::addRow(SearchObject* search, TQGridLayout* grid) // Unpacking column _label = new TQLabel(this); _label->setMargin(5); - _label->setAlignment( TQt::AlignTop ); + _label->tqsetAlignment( TQt::AlignTop ); if( arch->getIsUnpacker() && arch->getFound() ) { _label->setText( i18n("enabled") ); _label->setPaletteForegroundColor("darkgreen"); @@ -219,7 +219,7 @@ bool KrArchiverResultTable::addRow(SearchObject* search, TQGridLayout* grid) // Note column _label = new TQLabel(arch->getNote(), this); _label->setMargin(5); - _label->setAlignment( TQt::AlignTop | TQt::WordBreak ); // wrap words + _label->tqsetAlignment( TQt::AlignTop | TQt::WordBreak ); // wrap words grid->addWidget(_label, _numRows, 4); // Apply shared design elements @@ -323,7 +323,7 @@ bool KrToolResultTable::addRow(SearchObject* search, TQGridLayout* grid) // Name column _label = new TQLabel(appGroup->getSearchName(), this); _label->setMargin(5); - _label->setAlignment( TQt::AlignTop ); + _label->tqsetAlignment( TQt::AlignTop ); grid->addWidget(_label, _numRows, 0); // Tool column @@ -331,7 +331,7 @@ bool KrToolResultTable::addRow(SearchObject* search, TQGridLayout* grid) for( TQValueVector<Application*>::Iterator it=_apps.begin(); it!=_apps.end(); it++ ) { KURLLabel* l = new KURLLabel( (*it)->getWebsite(), (*it)->getAppName(), toolBox); - l->setAlignment(TQt::AlignLeft | TQt::AlignTop); + l->tqsetAlignment(TQt::AlignLeft | TQt::AlignTop); l->setMargin(5); connect(l, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(website(const TQString&))); @@ -344,14 +344,14 @@ bool KrToolResultTable::addRow(SearchObject* search, TQGridLayout* grid) { _label = new TQLabel( (*it)->getPath(), vbox); _label->setMargin(5); - _label->setAlignment( TQt::AlignTop ); + _label->tqsetAlignment( TQt::AlignTop ); } grid->addWidget(vbox, _numRows, 2); - // Status column + // tqStatus column _label = new TQLabel(this); _label->setMargin(5); - _label->setAlignment( TQt::AlignTop ); + _label->tqsetAlignment( TQt::AlignTop ); if( appGroup->getFoundGroup() ) { _label->setText( i18n("enabled") ); _label->setPaletteForegroundColor("darkgreen"); diff --git a/krusader/Konfigurator/krresulttable.h b/krusader/Konfigurator/krresulttable.h index ebac759..0e6729f 100644 --- a/krusader/Konfigurator/krresulttable.h +++ b/krusader/Konfigurator/krresulttable.h @@ -33,7 +33,7 @@ #include <tqstring.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqhbox.h> #include <tqvbox.h> #include <tqgrid.h> @@ -84,14 +84,14 @@ protected: TQLabel* _label; // generic label /** - * Creates the main grid layout and attaches the table header + * Creates the main grid tqlayout and attaches the table header * - * @return bool Pointer to the main grid layout + * @return bool Pointer to the main grid tqlayout */ TQGridLayout* initTable(); /** - * Applies settings to each cell of the grid layout + * Applies settings to each cell of the grid tqlayout * Supposed to be run after a row was added * * @param const TQGridLayout* grid The GridLayout diff --git a/krusader/Konfigurator/krresulttabledialog.cpp b/krusader/Konfigurator/krresulttabledialog.cpp index f7f6571..179099a 100644 --- a/krusader/Konfigurator/krresulttabledialog.cpp +++ b/krusader/Konfigurator/krresulttabledialog.cpp @@ -40,7 +40,7 @@ KrResultTableDialog::KrResultTableDialog( TQWidget *parent, DialogType type, _page = new TQWidget(this); setMainWidget(_page); _topLayout = new TQVBoxLayout(_page, 0, spacingHint()); - _topLayout->setAlignment( TQt::AlignTop ); + _topLayout->tqsetAlignment( TQt::AlignTop ); // +++ Heading +++ // prepare the icon @@ -48,8 +48,8 @@ KrResultTableDialog::KrResultTableDialog( TQWidget *parent, DialogType type, _iconLabel = new TQLabel(_iconBox, "iconLabel"); _iconLabel->setPixmap(krLoader->loadIcon(headerIcon, KIcon::Desktop, 32)); _iconLabel->setMinimumWidth(fontMetrics().maxWidth()*20); - _iconLabel->setAlignment( TQt::AlignLeft | TQt::AlignVCenter ); - _iconLabel->setFixedSize( _iconLabel->sizeHint() ); + _iconLabel->tqsetAlignment( TQt::AlignLeft | TQt::AlignVCenter ); + _iconLabel->setFixedSize( _iconLabel->tqsizeHint() ); _headingLabel = new TQLabel(heading, _iconBox); TQFont defFont = KGlobalSettings::generalFont(); defFont.setBold(true); @@ -85,11 +85,11 @@ KrResultTableDialog::KrResultTableDialog( TQWidget *parent, DialogType type, if(hint != TQString()) { _hintLabel = new TQLabel(hint, _page); _hintLabel->setIndent(5); - _hintLabel->setAlignment(TQt::AlignRight); + _hintLabel->tqsetAlignment(TQt::AlignRight); _topLayout->addWidget(_hintLabel); } - this->setFixedSize( this->sizeHint() ); // make non-resizeable + this->setFixedSize( this->tqsizeHint() ); // make non-resizeable } KrResultTableDialog::~KrResultTableDialog() diff --git a/krusader/Konfigurator/krresulttabledialog.h b/krusader/Konfigurator/krresulttabledialog.h index f36d20d..28bbe65 100644 --- a/krusader/Konfigurator/krresulttabledialog.h +++ b/krusader/Konfigurator/krresulttabledialog.h @@ -34,7 +34,7 @@ #include <tqlabel.h> #include <tqvbox.h> #include <tqhbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqstringlist.h> #include <tqvaluevector.h> diff --git a/krusader/KrJS/krjs.cpp b/krusader/KrJS/krjs.cpp index 3113967..efff3f8 100644 --- a/krusader/KrJS/krjs.cpp +++ b/krusader/KrJS/krjs.cpp @@ -62,14 +62,14 @@ bool KrJS::runFile(const TQString & filename) { KMessageBox::error ( 0, //parent ( line < 0 ? - TQString( i18n("In %1:\nUncaught JavaScript exception '%2'\n%3") ).arg(filename).arg(type).arg(message) : - TQString( i18n("In %1:\nUncaught JavaScript exception '%2' at line %3\n%4") ).arg(filename).arg(type).arg(line).arg(message) + TQString( i18n("In %1:\nUncaught JavaScript exception '%2'\n%3") ).tqarg(filename).tqarg(type).tqarg(message) : + TQString( i18n("In %1:\nUncaught JavaScript exception '%2' at line %3\n%4") ).tqarg(filename).tqarg(type).tqarg(line).tqarg(message) ), //text i18n("JavaScript error"), //caption KMessageBox::Dangerous) ; #else KMessageBox::error ( 0, //parent - TQString(i18n("In %1:\nThere is an error in the JavaScript")).arg(filename), //text + TQString(i18n("In %1:\nThere is an error in the JavaScript")).tqarg(filename), //text i18n("JavaScript error"), //caption KMessageBox::Dangerous) ; #endif diff --git a/krusader/Locate/locate.cpp b/krusader/Locate/locate.cpp index f9ba73e..d4cc981 100755 --- a/krusader/Locate/locate.cpp +++ b/krusader/Locate/locate.cpp @@ -42,7 +42,7 @@ #include <klocale.h> #include <tqhbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqfontmetrics.h> #include <kmessagebox.h> #include <kpopupmenu.h> @@ -52,7 +52,7 @@ #include <kinputdialog.h> #include <tqregexp.h> #include <tqdir.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <kurldrag.h> #include <../kicons.h> @@ -117,14 +117,14 @@ LocateDlg::LocateDlg() : KDialogBase(0,0,false,"Locate", KDialogBase::User1 | KD locateSearchFor->setHistoryItems(list); locateSearchFor->setEditable( true ); locateSearchFor->setDuplicatesEnabled( false ); - locateSearchFor->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed); + locateSearchFor->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed); locateSearchFor->lineEdit()->setFocus(); grid->addWidget( hbox, 0, 0 ); TQHBox *hbox2 = new TQHBox( widget, "locateHBox" ); TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - hbox2->layout()->addItem( spacer ); + hbox2->tqlayout()->addItem( spacer ); dontSearchInPath = new TQCheckBox( i18n( "Don't search in path" ), hbox2, "dontSearchInPath" ); dontSearchInPath->setChecked( krConfig->readBoolEntry("Dont Search In Path") ); existingFiles = new TQCheckBox( i18n( "Show only the existing files" ), hbox2, "existingFiles" ); @@ -527,7 +527,7 @@ void LocateDlg::operate( TQListViewItem *item, int task ) KURLDrag *d = new KURLDrag(urls, this); d->setPixmap( FL_LOADICON( "file" ), TQPoint( -7, 0 ) ); - TQApplication::clipboard()->setData( d ); + TQApplication::tqclipboard()->setData( d ); } break; } @@ -573,7 +573,7 @@ void LocateDlg::feedToListBox() int listBoxNum = krConfig->readNumEntry( "Feed To Listbox Counter", 1 ); TQString queryName; do { - queryName = i18n("Locate results")+TQString( " %1" ).arg( listBoxNum++ ); + queryName = i18n("Locate results")+TQString( " %1" ).tqarg( listBoxNum++ ); }while( v.vfs_search( queryName ) != 0 ); krConfig->writeEntry( "Feed To Listbox Counter", listBoxNum ); diff --git a/krusader/MountMan/kdiskfreesp.cpp b/krusader/MountMan/kdiskfreesp.cpp index 1c91a48..25de916 100644 --- a/krusader/MountMan/kdiskfreesp.cpp +++ b/krusader/MountMan/kdiskfreesp.cpp @@ -24,7 +24,7 @@ #include "kdiskfreesp.h" #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kdebug.h> #include <kprocess.h> @@ -99,7 +99,7 @@ void KDiskFreeSp::dfDone() TQTextStream t (dfStringErrOut, IO_ReadOnly); TQString s=t.readLine(); - if ( (s.isEmpty()) || ( s.left(10) != TQString::fromLatin1("Filesystem") ) ) + if ( (s.isEmpty()) || ( s.left(10) != TQString::tqfromLatin1("Filesystem") ) ) kdError() << "Error running df command... got [" << s << "]" << endl; while ( !t.eof() ) { TQString u,v; diff --git a/krusader/MountMan/kmountman.cpp b/krusader/MountMan/kmountman.cpp index 6fcdbff..9ddc29b 100644 --- a/krusader/MountMan/kmountman.cpp +++ b/krusader/MountMan/kmountman.cpp @@ -148,7 +148,7 @@ void KMountMan::unmount( TQString mntPoint, bool blocking ) { } } -KMountMan::mntStatus KMountMan::getStatus( TQString mntPoint ) { +KMountMan::mnttqStatus KMountMan::gettqStatus( TQString mntPoint ) { KMountPoint::List::iterator it; KMountPoint *m; @@ -170,7 +170,7 @@ KMountMan::mntStatus KMountMan::getStatus( TQString mntPoint ) { void KMountMan::toggleMount( TQString mntPoint ) { - mntStatus status = getStatus(mntPoint); + mnttqStatus status = gettqStatus(mntPoint); switch (status) { case MOUNTED: unmount(mntPoint); @@ -185,7 +185,7 @@ void KMountMan::toggleMount( TQString mntPoint ) { } void KMountMan::autoMount( TQString path ) { - if ( getStatus( path ) == NOT_MOUNTED ) + if ( gettqStatus( path ) == NOT_MOUNTED ) mount( path ); } @@ -221,24 +221,24 @@ TQString KMountMan::convertSize( KIO::filesize_t size ) { fsize = ( float ) size / ( float ) 1073741824; if ( fsize > 1024 ) // no name for something bigger than tera byte // let's call it Zega-Byte, who'll ever find out? :-) - s = i18n( "%1 ZB" ).arg( KGlobal::locale() ->formatNumber( fsize / ( float ) 1024, 1 ) ); + s = i18n( "%1 ZB" ).tqarg( KGlobal::locale() ->formatNumber( fsize / ( float ) 1024, 1 ) ); else - s = i18n( "%1 TB" ).arg( KGlobal::locale() ->formatNumber( fsize, 1 ) ); + s = i18n( "%1 TB" ).tqarg( KGlobal::locale() ->formatNumber( fsize, 1 ) ); } // Giga-byte else if ( size >= 1048576 ) { fsize = ( float ) size / ( float ) 1048576; - s = i18n( "%1 GB" ).arg( KGlobal::locale() ->formatNumber( fsize, 1 ) ); + s = i18n( "%1 GB" ).tqarg( KGlobal::locale() ->formatNumber( fsize, 1 ) ); } // Mega-byte else if ( size > 1024 ) { fsize = ( float ) size / ( float ) 1024; - s = i18n( "%1 MB" ).arg( KGlobal::locale() ->formatNumber( fsize, 1 ) ); + s = i18n( "%1 MB" ).tqarg( KGlobal::locale() ->formatNumber( fsize, 1 ) ); } // Kilo-byte else { fsize = ( float ) size; - s = i18n( "%1 KB" ).arg( KGlobal::locale() ->formatNumber( fsize, 0 ) ); + s = i18n( "%1 KB" ).tqarg( KGlobal::locale() ->formatNumber( fsize, 0 ) ); } return s; } diff --git a/krusader/MountMan/kmountman.h b/krusader/MountMan/kmountman.h index 6e31748..2cc4934 100644 --- a/krusader/MountMan/kmountman.h +++ b/krusader/MountMan/kmountman.h @@ -53,7 +53,7 @@ class KMountMan : public TQObject { friend class KMountManGUI; public: - enum mntStatus {DOESNT_EXIST, NOT_MOUNTED, MOUNTED}; + enum mnttqStatus {DOESNT_EXIST, NOT_MOUNTED, MOUNTED}; inline bool operational() { return Operational; @@ -62,7 +62,7 @@ public: void mainWindow(); // opens up the GUI void mount( TQString mntPoint, bool blocking=true ); // this is probably what you need for mount void unmount( TQString mntPoint, bool blocking=true ); // this is probably what you need for unmount - mntStatus getStatus( TQString mntPoint ); // return the status of a mntPoint (if any) + mnttqStatus gettqStatus( TQString mntPoint ); // return the status of a mntPoint (if any) void autoMount( TQString path ); // just call it before refreshing into a dir static void eject( TQString mntPoint ); bool ejectable( TQString path ); diff --git a/krusader/MountMan/kmountmangui.cpp b/krusader/MountMan/kmountmangui.cpp index 43169ea..030bfd5 100644 --- a/krusader/MountMan/kmountmangui.cpp +++ b/krusader/MountMan/kmountmangui.cpp @@ -42,7 +42,7 @@ A #include <kpopupmenu.h> #include <tqbitmap.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <kprocess.h> #include <tqcursor.h> @@ -73,10 +73,10 @@ info( 0 ), mountList( 0 ) { widget = new KJanusWidget( this, 0, KJanusWidget::Tabbed ); createLayout(); setMainWidget( widget ); - widget->setMinimumSize( widget->sizeHint().width() + mountList->columnWidth( 5 ), - widget->sizeHint().height() ); - setMinimumSize( widget->minimumSize().width(), widget->minimumSize().height() ); - resize( minimumSize() ); + widget->setMinimumSize( widget->tqsizeHint().width() + mountList->columnWidth( 5 ), + widget->tqsizeHint().height() ); + setMinimumSize( widget->tqminimumSize().width(), widget->tqminimumSize().height() ); + resize( tqminimumSize() ); // connections connect( mountList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), this, @@ -111,7 +111,7 @@ void KMountManGUI::createMainPage() { mountList = 0; } // clean up is finished... - TQGridLayout *layout = new TQGridLayout( mainPage, 1, 1 ); + TQGridLayout *tqlayout = new TQGridLayout( mainPage, 1, 1 ); mountList = new TQListView( mainPage ); // create the main container krConfig->setGroup( "Look&Feel" ); mountList->setFont( krConfig->readFontEntry( "Filelist Font", _FilelistFont ) ); @@ -139,11 +139,11 @@ void KMountManGUI::createMainPage() { // now the list is created, time to fill it with data. //=>krMtMan.forceUpdate(); TQGroupBox *box = new TQGroupBox( "MountMan.Info", mainPage ); - box->setAlignment( TQt::AlignHCenter ); + box->tqsetAlignment( TQt::AlignHCenter ); info = new KRFSDisplay( box ); info->resize( info->width(), height() ); - layout->addWidget( box, 0, 0 ); - layout->addWidget( mountList, 0, 1 ); + tqlayout->addWidget( box, 0, 0 ); + tqlayout->addWidget( mountList, 0, 1 ); } void KMountManGUI::getSpaceData() { @@ -201,9 +201,9 @@ void KMountManGUI::gettingSpaceData( const TQString &mountPoint, unsigned long k void KMountManGUI::addItemToMountList( TQListView *lst, fsData &fs ) { bool mtd = fs.mounted(); - TQString tSize = TQString( "%1" ).arg( KIO::convertSizeFromKB( fs.totalBlks() ) ); - TQString fSize = TQString( "%1" ).arg( KIO::convertSizeFromKB( fs.freeBlks() ) ); - TQString sPrct = TQString( "%1%" ).arg( 100 - ( fs.usedPerct() ) ); + TQString tSize = TQString( "%1" ).tqarg( KIO::convertSizeFromKB( fs.totalBlks() ) ); + TQString fSize = TQString( "%1" ).tqarg( KIO::convertSizeFromKB( fs.freeBlks() ) ); + TQString sPrct = TQString( "%1%" ).tqarg( 100 - ( fs.usedPerct() ) ); TQListViewItem *item = new TQListViewItem( lst, fs.name(), fs.type(), fs.mntPoint(), ( mtd ? tSize : TQString( "N/A" ) ), ( mtd ? fSize : TQString( "N/A" ) ), @@ -254,7 +254,7 @@ void KMountManGUI::updateList() { mountList->clearSelection(); if ( info ) { info->setEmpty( true ); - info->repaint(); + info->tqrepaint(); } watcher->start( WATCHER_DELAY, true ); // starting the watch timer ( single shot ) } @@ -300,7 +300,7 @@ void KMountManGUI::changeActive( TQListViewItem *i ) { info->setEmpty( false ); info->setTotalSpace( system->totalBlks() ); info->setFreeSpace( system->freeBlks() ); - info->repaint(); + info->tqrepaint(); } // called when right-clicked on a filesystem diff --git a/krusader/MountMan/kmountmangui.h b/krusader/MountMan/kmountmangui.h index b982356..86cd9dc 100644 --- a/krusader/MountMan/kmountmangui.h +++ b/krusader/MountMan/kmountmangui.h @@ -64,7 +64,7 @@ class KMountManGUI : public KDialogBase { public: KMountManGUI(); ~KMountManGUI(); - void createLayout(); // calls the various tab layout-creators + void createLayout(); // calls the various tab tqlayout-creators void createMainPage(); // creator of the main page - filesystems protected slots: diff --git a/krusader/Panel/krbriefview.cpp b/krusader/Panel/krbriefview.cpp index 1c27c41..3dd1743 100644 --- a/krusader/Panel/krbriefview.cpp +++ b/krusader/Panel/krbriefview.cpp @@ -249,7 +249,7 @@ void KrBriefView::addItems( vfs *v, bool addUpDir ) { // text for updating the status bar - TQString statusText = TQString("%1/ ").arg( v->vfs_getOrigin().fileName() ) + i18n("Directory"); + TQString statusText = TQString("%1/ ").tqarg( v->vfs_getOrigin().fileName() ) + i18n("Directory"); bool as = sortDirection(); setSorting( false, as ); // disable sorting @@ -459,7 +459,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) { lastSwushPosition = newCurrent; } newCurrent->setSelected(!newCurrent->isSelected(), true); - newCurrent->repaint(); + newCurrent->tqrepaint(); selectionChanged = true; } callDefaultHandler = false; @@ -474,7 +474,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) { if( newCurrent ) { newCurrent->setSelected(!newCurrent->isSelected()); - newCurrent->repaint(); + newCurrent->tqrepaint(); selectionChanged = true; callDefaultHandler = false; e->accept(); @@ -486,7 +486,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) { if( newCurrent ) { newCurrent->setSelected( true ); - newCurrent->repaint(); + newCurrent->tqrepaint(); } selectionChanged = true; callDefaultHandler = false; @@ -514,7 +514,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) { if (newCurrent) { newCurrent->setSelected(!newCurrent->isSelected(), true); - newCurrent->repaint(); + newCurrent->tqrepaint(); selectionChanged = true; } callDefaultHandler = false; @@ -769,9 +769,9 @@ void KrBriefView::contentsDragMoveEvent( TQDragMoveEvent * e ) { if( _currDragItem != oldDragItem ) { if( oldDragItem ) - dynamic_cast<KrBriefViewItem *>( oldDragItem )->repaint(); + dynamic_cast<KrBriefViewItem *>( oldDragItem )->tqrepaint(); if( _currDragItem ) - dynamic_cast<KrBriefViewItem *>( _currDragItem )->repaint(); + dynamic_cast<KrBriefViewItem *>( _currDragItem )->tqrepaint(); } } @@ -783,7 +783,7 @@ void KrBriefView::contentsDragLeaveEvent ( TQDragLeaveEvent *e ) KIconView::contentsDragLeaveEvent( e ); if( oldDragItem ) - dynamic_cast<KrBriefViewItem *>( oldDragItem )->repaint(); + dynamic_cast<KrBriefViewItem *>( oldDragItem )->tqrepaint(); } void KrBriefView::imStartEvent(TQIMEvent* e) @@ -803,7 +803,7 @@ void KrBriefView::imStartEvent(TQIMEvent* e) // item is "below" the quick search window, as the icon view will // realize its new size after the key processing. The following line // will resize the icon view immediately. - ACTIVE_PANEL->layout->activate(); + ACTIVE_PANEL->tqlayout->activate(); // second, we need to disable the dirup action - hack! krDirUp->setEnabled( false ); } @@ -1109,7 +1109,7 @@ void KrBriefView::keyPressEvent( TQKeyEvent * e ) { // item is "below" the quick search window, as the icon view will // realize its new size after the key processing. The following line // will resize the icon view immediately. - ACTIVE_PANEL->layout->activate(); + ACTIVE_PANEL->tqlayout->activate(); // second, we need to disable the dirup action - hack! krDirUp->setEnabled( false ); } @@ -1352,7 +1352,7 @@ void KrBriefView::setColumnNr() for( int i=1; i <= MAX_COLS; i++ ) { - popup.insertItem( TQString( "%1" ).arg( i ), COL_ID + i ); + popup.insertItem( TQString( "%1" ).tqarg( i ), COL_ID + i ); popup.setItemChecked( COL_ID + i, PROPS->numberOfColumns == i ); } diff --git a/krusader/Panel/krbriefview.h b/krusader/Panel/krbriefview.h index e6c7c1a..3a1dc66 100644 --- a/krusader/Panel/krbriefview.h +++ b/krusader/Panel/krbriefview.h @@ -48,7 +48,7 @@ class TQHeader; /** * KrBriefView implements everthing and anything regarding a brief view in a filemananger. - * IT MUST USE KrViewItem as the children to it's *KIconView. KrBriefView and KrViewItem are + * IT MUST USE KrViewItem as the tqchildren to it's *KIconView. KrBriefView and KrViewItem are * tightly coupled and the view will not work with other kinds of items. * Apart from this, the view is self-reliant and you can use the vast interface to get whatever * information is necessery from it. diff --git a/krusader/Panel/krcalcspacedialog.cpp b/krusader/Panel/krcalcspacedialog.cpp index 11bbac8..d8d3976 100644 --- a/krusader/Panel/krcalcspacedialog.cpp +++ b/krusader/Panel/krcalcspacedialog.cpp @@ -31,7 +31,7 @@ A // TQt Includes #include <tqtimer.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> // KDE Includes #include <klocale.h> @@ -144,7 +144,7 @@ void KrCalcSpaceDialog::showResult(){ if (!m_thread) return; TQString msg; TQString fileName = ( ( m_thread->getItems().count() == 1 ) ? ( i18n( "Name: " ) + m_thread->getItems().first() + "\n" ) : TQString( "" ) ); - msg = fileName + i18n( "Total occupied space: %1").arg( KIO::convertSize( m_thread->getTotalSize() ) ); + msg = fileName + i18n( "Total occupied space: %1").tqarg( KIO::convertSize( m_thread->getTotalSize() ) ); if (m_thread->getTotalSize() >= 1024) msg += " (" + KRpermHandler::parseSize( m_thread->getTotalSize() ) + "bytes)"; msg += "\n"; diff --git a/krusader/Panel/krdetailedview.cpp b/krusader/Panel/krdetailedview.cpp index 044a9a4..cf0886f 100644 --- a/krusader/Panel/krdetailedview.cpp +++ b/krusader/Panel/krdetailedview.cpp @@ -41,7 +41,7 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD #include "../GUI/kcmdline.h" #include "../Dialogs/krspecialwidgets.h" #include "../panelmanager.h" -#include <layout.h> +#include <tqlayout.h> #include <tqdir.h> #include <tqwhatsthis.h> #include <tqheader.h> @@ -300,7 +300,7 @@ void KrDetailedView::addItems( vfs *v, bool addUpDir ) { } // text for updating the status bar - TQString statusText = TQString("%1/ ").arg( v->vfs_getOrigin().fileName() ) + i18n("Directory"); + TQString statusText = TQString("%1/ ").tqarg( v->vfs_getOrigin().fileName() ) + i18n("Directory"); int cnt = 0; int cl = columnSorted(); @@ -549,7 +549,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) { lastSwushPosition = newCurrent; } newCurrent->setSelected(!newCurrent->isSelected()); - newCurrent->repaint(); + newCurrent->tqrepaint(); selectionChanged = true; } callDefaultHandler = false; @@ -564,7 +564,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) { if( newCurrent ) { newCurrent->setSelected(!newCurrent->isSelected()); - newCurrent->repaint(); + newCurrent->tqrepaint(); selectionChanged = true; callDefaultHandler = false; e->accept(); @@ -576,7 +576,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) { if( newCurrent ) { newCurrent->setSelected( true ); - newCurrent->repaint(); + newCurrent->tqrepaint(); } selectionChanged = true; callDefaultHandler = false; @@ -604,7 +604,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) { if (newCurrent) { newCurrent->setSelected(!newCurrent->isSelected()); - newCurrent->repaint(); + newCurrent->tqrepaint(); selectionChanged = true; } callDefaultHandler = false; @@ -832,11 +832,11 @@ TQRect KrDetailedView::drawItemHighlighter(TQPainter *painter, TQListViewItem *i { TQRect r; if( _currDragItem && item ) { - r = itemRect(item); + r = tqitemRect(item); if (painter) - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(), - TQStyle::Style_FocusAtBorder, colorGroup().highlight()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, tqcolorGroup(), + TQStyle::Style_FocusAtBorder, tqcolorGroup().highlight()); } return r; } @@ -873,7 +873,7 @@ void KrDetailedView::imStartEvent(TQIMEvent* e) // item is "below" the quick search window, as the list view will // realize its new size after the key processing. The following line // will resize the list view immediately. - ACTIVE_PANEL->layout->activate(); + ACTIVE_PANEL->tqlayout->activate(); // second, we need to disable the dirup action - hack! krDirUp->setEnabled( false ); } @@ -938,7 +938,7 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { case Key_Next: if (!KrSelectionMode::getSelectionHandler()->useTQTSelection()){ TQListViewItem * i = currentItem(), *j; if ( !i ) break; - TQRect r( itemRect( i ) ); + TQRect r( tqitemRect( i ) ); if ( !r.height() ) break; for ( int page = visibleHeight() / r.height() - 1; page > 0 && ( j = i->itemBelow() ); --page ) i = j; @@ -948,7 +948,7 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { case Key_Prior: if (!KrSelectionMode::getSelectionHandler()->useTQTSelection()){ TQListViewItem * i = currentItem(), *j; if ( !i ) break; - TQRect r( itemRect( i ) ); + TQRect r( tqitemRect( i ) ); if ( !r.height() ) break; for ( int page = visibleHeight() / r.height() - 1; page > 0 && ( j = i->itemAbove() ); --page ) i = j; @@ -1146,7 +1146,7 @@ mark: if (KrSelectionMode::getSelectionHandler()->spaceMovesDown()) // item is "below" the quick search window, as the list view will // realize its new size after the key processing. The following line // will resize the list view immediately. - ACTIVE_PANEL->layout->activate(); + ACTIVE_PANEL->tqlayout->activate(); // second, we need to disable the dirup action - hack! krDirUp->setEnabled( false ); } diff --git a/krusader/Panel/krdetailedview.h b/krusader/Panel/krdetailedview.h index 40741c1..531cdf3 100644 --- a/krusader/Panel/krdetailedview.h +++ b/krusader/Panel/krdetailedview.h @@ -64,7 +64,7 @@ class KrDetailedViewItem; /** * KrDetailedView implements everthing and anything regarding a detailed view in a filemananger. - * IT MUST USE KrViewItem as the children to it's *KListView. KrDetailedView and KrViewItem are + * IT MUST USE KrViewItem as the tqchildren to it's *KListView. KrDetailedView and KrViewItem are * tightly coupled and the view will not work with other kinds of items. * Apart from this, the view is self-reliant and you can use the vast interface to get whatever * information is necessery from it. diff --git a/krusader/Panel/krdetailedviewitem.cpp b/krusader/Panel/krdetailedviewitem.cpp index 849040a..2a0da8e 100644 --- a/krusader/Panel/krdetailedviewitem.cpp +++ b/krusader/Panel/krdetailedviewitem.cpp @@ -43,7 +43,7 @@ #include <pwd.h> #include <grp.h> #include <stdlib.h> -#include <palette.h> +#include <tqpalette.h> #include <kdebug.h> #include <kmimetype.h> diff --git a/krusader/Panel/krdrag.cpp b/krusader/Panel/krdrag.cpp index 95bcae8..f015143 100644 --- a/krusader/Panel/krdrag.cpp +++ b/krusader/Panel/krdrag.cpp @@ -60,12 +60,12 @@ const char* KRDrag::format( int i ) const else return 0; } -TQByteArray KRDrag::encodedData( const char* mime ) const +TQByteArray KRDrag::tqencodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "text/uri-list" ) - return TQUriDrag::encodedData( mime ); + return TQUriDrag::tqencodedData( mime ); else if ( mimetype == "application/x-kde-cutselection" ) { TQCString s ( m_bCutSelection ? "1" : "0" ); a.resize( s.length() + 1 ); // trailing zero @@ -91,7 +91,7 @@ TQByteArray KRDrag::encodedData( const char* mime ) const bool KRDrag::decodeIsCutSelection( const TQMimeSource *e ) { - TQByteArray a = e->encodedData( "application/x-kde-cutselection" ); + TQByteArray a = e->tqencodedData( "application/x-kde-cutselection" ); if ( a.isEmpty() ) return false; else diff --git a/krusader/Panel/krdrag.h b/krusader/Panel/krdrag.h index 400294e..11f87ac 100644 --- a/krusader/Panel/krdrag.h +++ b/krusader/Panel/krdrag.h @@ -48,7 +48,7 @@ public: virtual ~KRDrag() {} virtual const char* format( int i ) const; - virtual TQByteArray encodedData( const char* mime ) const; + virtual TQByteArray tqencodedData( const char* mime ) const; void setMoveSelection( bool move ) { m_bCutSelection = move; } diff --git a/krusader/Panel/krpopupmenu.cpp b/krusader/Panel/krpopupmenu.cpp index 4cdd883..13bbd57 100644 --- a/krusader/Panel/krpopupmenu.cpp +++ b/krusader/Panel/krpopupmenu.cpp @@ -168,9 +168,9 @@ KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : KPopupMenu(par // ---------- mount/umount/eject if ( panel->func->files() ->vfs_getType() == vfs::NORMAL && vf->vfile_isDir() && !multipleSelections ) { - if ( krMtMan.getStatus( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) ) == KMountMan::MOUNTED ) + if ( krMtMan.gettqStatus( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) ) == KMountMan::MOUNTED ) insertItem( i18n( "Unmount" ), UNMOUNT_ID ); - else if ( krMtMan.getStatus( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) ) == KMountMan::NOT_MOUNTED ) + else if ( krMtMan.gettqStatus( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) ) == KMountMan::NOT_MOUNTED ) insertItem( i18n( "Mount" ), MOUNT_ID ); if ( krMtMan.ejectable( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) ) ) insertItem( i18n( "Eject" ), EJECT_ID ); @@ -258,7 +258,7 @@ void KrPopupMenu::performAction(int id) { break; case SHRED_ID : if ( KMessageBox::warningContinueCancel( krApp, - i18n("<qt>Do you really want to shred <b>%1</b>? Once shred, the file is gone forever!</qt>").arg(item->name()), + i18n("<qt>Do you really want to shred <b>%1</b>? Once shred, the file is gone forever!</qt>").tqarg(item->name()), TQString(), KStdGuiItem::cont(), "Shred" ) == KMessageBox::Continue ) KShred::shred( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) ); break; @@ -336,7 +336,7 @@ void KrPopupMenu::performAction(int id) { proc.setUseShell( true ); } if ( !proc.start( KProcess::DontCare ) ) - KMessageBox::sorry( krApp, i18n( "Can't open \"%1\"" ).arg(term) ); + KMessageBox::sorry( krApp, i18n( "Can't open \"%1\"" ).tqarg(term) ); } // group-saver is blown out of scope here chdir( save.local8Bit() ); break; diff --git a/krusader/Panel/krview.cpp b/krusader/Panel/krview.cpp index 2b1ac27..eab999c 100644 --- a/krusader/Panel/krview.cpp +++ b/krusader/Panel/krview.cpp @@ -163,9 +163,9 @@ TQString KrView::statistics() { _countSize += it->getVfile()->vfile_getSize(); } TQString tmp = TQString(i18n("%1 out of %2, %3 (%4) out of %5 (%6)")) - .arg( _numSelected ).arg( _count ).arg( KIO::convertSize( _selectedSize ) ) - .arg( KRpermHandler::parseSize(_selectedSize) ) - .arg( KIO::convertSize( _countSize ) ).arg( KRpermHandler::parseSize(_countSize) ); + .tqarg( _numSelected ).tqarg( _count ).tqarg( KIO::convertSize( _selectedSize ) ) + .tqarg( KRpermHandler::parseSize(_selectedSize) ) + .tqarg( KIO::convertSize( _countSize ) ).tqarg( KRpermHandler::parseSize(_countSize) ); // notify if we're running a filtered view if (filter() != KrViewProperties::All) tmp = ">> [ " + filterMask().nameFilter() + " ] "+tmp; diff --git a/krusader/Panel/krviewitem.cpp b/krusader/Panel/krviewitem.cpp index 158c173..23cd7dd 100644 --- a/krusader/Panel/krviewitem.cpp +++ b/krusader/Panel/krviewitem.cpp @@ -58,14 +58,14 @@ TQString KrViewItem::description() const { TQString tmp; if ( comment.isEmpty() ) tmp = i18n ( "Symbolic Link" ) ; else if( _vf->vfile_getMime() == "Broken Link !" ) tmp = i18n("(broken link !)"); - else tmp = i18n("%1 (Link)").arg(comment); + else tmp = i18n("%1 (Link)").tqarg(comment); text += "->"; text += myLinkDest; text += " "; text += tmp; } else if ( S_ISREG( m_fileMode ) ){ - text = TQString("%1 (%2)").arg(text2).arg( PROPS->humanReadableSize ? + text = TQString("%1 (%2)").tqarg(text2).tqarg( PROPS->humanReadableSize ? KRpermHandler::parseSize(_vf->vfile_getSize()) : KIO::convertSize( mySize ) ); text += " "; text += comment; diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp index e83eb5f..f5b8709 100644 --- a/krusader/Panel/listpanel.cpp +++ b/krusader/Panel/listpanel.cpp @@ -113,7 +113,7 @@ ListPanel::ListPanel( TQString typeIn, TQWidget *parent, bool &left, const char func = new ListPanelFunc( this ); setAcceptDrops( true ); - layout = new TQGridLayout( this, 3, 3 ); + tqlayout = new TQGridLayout( this, 3, 3 ); mediaButton = new MediaButton( this, "mediaButton" ); connect( mediaButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotFocusOnMe() ) ); @@ -134,7 +134,7 @@ ListPanel::ListPanel( TQString typeIn, TQWidget *parent, bool &left, const char "which holds your current directory: Total size, free space, " "type of filesystem, etc." ) ); connect( status, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotFocusOnMe() ) ); - connect( status, TQT_SIGNAL( dropped( TQDropEvent *) ), this, TQT_SLOT( handleDropOnStatus(TQDropEvent *) ) ); + connect( status, TQT_SIGNAL( dropped( TQDropEvent *) ), this, TQT_SLOT( handleDropOntqStatus(TQDropEvent *) ) ); // ... create the history button dirHistoryQueue = new DirHistoryQueue( this ); @@ -274,17 +274,17 @@ ListPanel::ListPanel( TQString typeIn, TQWidget *parent, bool &left, const char connect(popup, TQT_SIGNAL(hideMe()), this, TQT_SLOT(togglePanelPopup())); popup->hide(); - // finish the layout - layout->addMultiCellWidget( hbox, 0, 0, 0, 3 ); - layout->addWidget( mediaButton, 1, 0 ); - layout->addWidget( status, 1, 1 ); - layout->addWidget( historyButton, 1, 2 ); - layout->addWidget( bookmarksButton, 1, 3 ); - layout->addMultiCellWidget( header, 2, 2, 0, 3 ); - layout->addMultiCellWidget( splt, 3, 3, 0, 3 ); - layout->addMultiCellWidget( quickSearch, 4, 4, 0, 3 ); + // finish the tqlayout + tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 ); + tqlayout->addWidget( mediaButton, 1, 0 ); + tqlayout->addWidget( status, 1, 1 ); + tqlayout->addWidget( historyButton, 1, 2 ); + tqlayout->addWidget( bookmarksButton, 1, 3 ); + tqlayout->addMultiCellWidget( header, 2, 2, 0, 3 ); + tqlayout->addMultiCellWidget( splt, 3, 3, 0, 3 ); + tqlayout->addMultiCellWidget( quickSearch, 4, 4, 0, 3 ); quickSearch->hide(); - layout->addMultiCellLayout( totalsLayout, 5, 5, 0, 3 ); + tqlayout->addMultiCellLayout( totalsLayout, 5, 5, 0, 3 ); //filter = ALL; } @@ -370,7 +370,7 @@ ListPanel::~ListPanel() { delete cdUpButton; delete cdOtherButton; delete syncBrowseButton; - delete layout; + delete tqlayout; } int ListPanel::getProperties() @@ -760,9 +760,9 @@ void ListPanel::gotStats( const TQString &mountPoint, unsigned long kBSize, } TQString stats = i18n( "%1 free out of %2 (%3%) on %4 [ (%5) ]" ) - .arg( KIO::convertSizeFromKB( kBAvail ) ) - .arg( KIO::convertSizeFromKB( kBSize ) ).arg( perc ) - .arg( mountPoint ).arg( fstype ); + .tqarg( KIO::convertSizeFromKB( kBAvail ) ) + .tqarg( KIO::convertSizeFromKB( kBSize ) ).tqarg( perc ) + .tqarg( mountPoint ).tqarg( fstype ); status->setText( stats ); } @@ -770,7 +770,7 @@ void ListPanel::handleDropOnTotals( TQDropEvent *e ) { handleDropOnView( e, totals ); } -void ListPanel::handleDropOnStatus( TQDropEvent *e ) { +void ListPanel::handleDropOntqStatus( TQDropEvent *e ) { handleDropOnView( e, status ); } @@ -917,7 +917,7 @@ void ListPanel::setFilter( KrViewProperties::FilterSpec f ) { return ; } view->setFilter( f ); // do that in any case - func->files()->vfs_invalidate(); + func->files()->vfs_tqinvalidate(); func->refresh(); } @@ -1077,7 +1077,7 @@ void ListPanel::inlineRefreshCancel() { } void ListPanel::inlineRefreshPercent( KIO::Job*, unsigned long perc) { - TQString msg = TQString(">> %1: %2 % complete...").arg(i18n("Reading")).arg(perc); + TQString msg = TQString(">> %1: %2 % complete...").tqarg(i18n("Reading")).tqarg(perc); totals->setText(msg); } diff --git a/krusader/Panel/listpanel.h b/krusader/Panel/listpanel.h index e809db2..9d5c313 100644 --- a/krusader/Panel/listpanel.h +++ b/krusader/Panel/listpanel.h @@ -38,7 +38,7 @@ #include <kurl.h> #include <tqwidget.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqstring.h> #include <tqpixmap.h> #include <tqtoolbutton.h> @@ -47,7 +47,7 @@ #include <tqpixmapcache.h> #include <tqiconset.h> #include <tqptrstack.h> -#include <textbrowser.h> +#include <tqtextbrowser.h> #include <keditcl.h> #include <klineedit.h> #include <tqguardedptr.h> @@ -150,7 +150,7 @@ protected: protected slots: void handleDropOnView(TQDropEvent *, TQWidget *destWidget=0); // handles drops on the view only void handleDropOnTotals( TQDropEvent * ); // handles drops on the totals line - void handleDropOnStatus( TQDropEvent * ); // handles drops on the status line + void handleDropOntqStatus( TQDropEvent * ); // handles drops on the status line void startDragging( TQStringList, TQPixmap ); // those handle the in-panel refresh notifications void slotJobStarted(KIO::Job* job); @@ -160,7 +160,7 @@ protected slots: void inlineRefreshCancel(); signals: - void signalStatus( TQString msg ); // emmited when we need to update the status bar + void signaltqStatus( TQString msg ); // emmited when we need to update the status bar void cmdLineUpdate( TQString p ); // emitted when we need to update the command line void pathChanged( ListPanel *panel ); void activePanelChanged( ListPanel *p ); // emitted when the user changes panels @@ -181,7 +181,7 @@ public: KrSqueezedTextLabel *status, *totals; KrQuickSearch *quickSearch; KURLRequester *origin; - TQGridLayout *layout; + TQGridLayout *tqlayout; TQToolButton *cdRootButton; TQToolButton *cdHomeButton; TQToolButton *cdUpButton; diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp index b269f23..ea0c19e 100755 --- a/krusader/Panel/panelfunc.cpp +++ b/krusader/Panel/panelfunc.cpp @@ -30,9 +30,9 @@ A #include <unistd.h> // TQt Includes #include <tqdir.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqeventloop.h> -#include <clipboard.h> +#include <tqclipboard.h> // KDE Includes #include <klocale.h> #include <kprocess.h> @@ -377,7 +377,7 @@ void ListPanelFunc::terminal() { } if ( !proc.start( KProcess::DontCare ) ) - KMessageBox::sorry( krApp, i18n( "<qt>Can't open <b>%1</b></qt>" ).arg(term) ); + KMessageBox::sorry( krApp, i18n( "<qt>Can't open <b>%1</b></qt>" ).tqarg(term) ); chdir( save.local8Bit() ); } @@ -423,7 +423,7 @@ void ListPanelFunc::moveFiles() { TQString s; if( fileNames.count() == 1 ) - s = i18n("Move %1 to:").arg(fileNames.first()); + s = i18n("Move %1 to:").tqarg(fileNames.first()); else s = i18n("Move %n file to:", "Move %n files to:", fileNames.count()); @@ -578,7 +578,7 @@ void ListPanelFunc::copyFiles() { TQString s; if( fileNames.count() == 1 ) - s = i18n("Copy %1 to:").arg(fileNames.first()); + s = i18n("Copy %1 to:").tqarg(fileNames.first()); else s = i18n("Copy %n file to:", "Copy %n files to:", fileNames.count()); @@ -679,7 +679,7 @@ void ListPanelFunc::deleteFiles(bool reallyDelete) { dir.setPath( panel->virtualPath().path() + "/" + ( *name ) ); if ( dir.entryList(TQDir::All | TQDir::System | TQDir::Hidden ).count() > 2 ) { switch ( KMessageBox::warningYesNoCancel( krApp, - i18n( "<qt><p>Directory <b>%1</b> is not empty!</p><p>Skip this one or Delete All?</p></qt>" ).arg(*name), + i18n( "<qt><p>Directory <b>%1</b> is not empty!</p><p>Skip this one or Delete All?</p></qt>" ).tqarg(*name), TQString(), i18n( "&Skip" ), i18n( "&Delete All" ) ) ) { case KMessageBox::Cancel : return ; @@ -806,9 +806,9 @@ void ListPanelFunc::pack() { } if ( TQFileInfo( arcFile ).exists() ) { - TQString msg = i18n( "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?</p><p>All data in the previous archive will be lost!</p></qt>").arg(PackGUI::filename).arg(PackGUI::type); + TQString msg = i18n( "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?</p><p>All data in the previous archive will be lost!</p></qt>").tqarg(PackGUI::filename).tqarg(PackGUI::type); if( PackGUI::type == "zip" ) { - msg = i18n( "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?</p><p>Zip will replace identically named entries in the zip archive or add entries for new names.</p></qt>").arg(PackGUI::filename).arg(PackGUI::type); + msg = i18n( "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?</p><p>Zip will replace identically named entries in the zip archive or add entries for new names.</p></qt>").tqarg(PackGUI::filename).tqarg(PackGUI::type); } if ( KMessageBox::warningContinueCancel( krApp,msg,TQString(),i18n( "&Overwrite" )) == KMessageBox::Cancel ) @@ -887,7 +887,7 @@ void ListPanelFunc::testArchive() { // check we that archive is supported if ( !KRarcHandler::arcSupported( type ) ) { - KMessageBox::sorry( krApp, i18n( "%1, unknown archive type." ).arg( arcName ) ); + KMessageBox::sorry( krApp, i18n( "%1, unknown archive type." ).tqarg( arcName ) ); return ; } @@ -895,9 +895,9 @@ void ListPanelFunc::testArchive() { // test the archive if ( KRarcHandler::test( url, type, password ) ) - KMessageBox::information( krApp, i18n( "%1, test passed." ).arg( arcName ) ); + KMessageBox::information( krApp, i18n( "%1, test passed." ).tqarg( arcName ) ); else - KMessageBox::error( krApp, i18n( "%1, test failed!" ).arg( arcName ) ); + KMessageBox::error( krApp, i18n( "%1, test failed!" ).tqarg( arcName ) ); // remove the downloaded file if necessary if ( url != arcURL.path( -1 ) ) @@ -913,7 +913,7 @@ void ListPanelFunc::unpack() { TQString s; if(fileNames.count() == 1) - s = i18n("Unpack %1 to:").arg(fileNames[0]); + s = i18n("Unpack %1 to:").tqarg(fileNames[0]); else s = i18n("Unpack %n file to:", "Unpack %n files to:", fileNames.count()); @@ -961,7 +961,7 @@ void ListPanelFunc::unpack() { // check we that archive is supported if ( !KRarcHandler::arcSupported( type ) ) { - KMessageBox::sorry( krApp, i18n( "%1, unknown archive type" ).arg( arcName ) ); + KMessageBox::sorry( krApp, i18n( "%1, unknown archive type" ).tqarg( arcName ) ); continue; } @@ -1159,7 +1159,7 @@ void ListPanelFunc::copyToClipboard( bool move ) { KURL::List* fileUrls = files() ->vfs_getFiles( &fileNames ); if ( fileUrls ) { KRDrag * urlData = KRDrag::newDrag( *fileUrls, move, krApp->mainView, "krusader" ); - TQApplication::clipboard() ->setData( urlData ); + TQApplication::tqclipboard() ->setData( urlData ); if( move && files()->vfs_getType() == vfs::VIRT ) ( static_cast<virt_vfs*>( files() ) )->vfs_removeFiles( &fileNames ); @@ -1169,7 +1169,7 @@ void ListPanelFunc::copyToClipboard( bool move ) { } void ListPanelFunc::pasteFromClipboard() { - TQClipboard * cb = TQApplication::clipboard(); + TQClipboard * cb = TQApplication::tqclipboard(); TQMimeSource * data = cb->data(); KURL::List urls; if ( KURLDrag::canDecode( data ) ) { diff --git a/krusader/Panel/panelpopup.cpp b/krusader/Panel/panelpopup.cpp index 4542b10..45ff3d9 100644 --- a/krusader/Panel/panelpopup.cpp +++ b/krusader/Panel/panelpopup.cpp @@ -11,7 +11,7 @@ #include <kfiletreeview.h> #include <klocale.h> #include <tqcursor.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqheader.h> #include <krview.h> @@ -25,7 +25,7 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), _left( left ), _hidden(true), stack( 0 ), viewer( 0 ), pjob( 0 ), splitterSizes() { splitter = parent; - TQGridLayout * layout = new TQGridLayout(this, 1, 1); + TQGridLayout * tqlayout = new TQGridLayout(this, 1, 1); // loading the splitter sizes krConfig->setGroup( "Private" ); @@ -98,12 +98,12 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), duBtn->setToggleButton(true); btns->insert(duBtn, DskUsage); - layout->addWidget(dataLine,0,0); - layout->addWidget(treeBtn,0,1); - layout->addWidget(previewBtn,0,2); - layout->addWidget(quickBtn,0,3); - layout->addWidget(viewerBtn,0,4); - layout->addWidget(duBtn,0,5); + tqlayout->addWidget(dataLine,0,0); + tqlayout->addWidget(treeBtn,0,1); + tqlayout->addWidget(previewBtn,0,2); + tqlayout->addWidget(quickBtn,0,3); + tqlayout->addWidget(viewerBtn,0,4); + tqlayout->addWidget(duBtn,0,5); // create a widget stack on which to put the parts stack = new TQWidgetStack( this ); @@ -151,7 +151,7 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), // create the quick-panel part ---- TQWidget *quickPanel = new TQWidget(stack); - TQGridLayout *qlayout = new TQGridLayout(quickPanel); + TQGridLayout *qtqlayout = new TQGridLayout(quickPanel); // --- quick select TQLabel *selectLabel = new TQLabel(i18n("Quick Select"), quickPanel); quickSelectCombo = new KComboBox( quickPanel ); @@ -162,7 +162,7 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), if ( i > 0 ) quickSelectCombo->insertStrList( lst ); quickSelectCombo->setCurrentText( "*" ); - quickSelectCombo->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + quickSelectCombo->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); connect(quickSelectCombo, TQT_SIGNAL(returnPressed(const TQString& )), this, TQT_SLOT(quickSelect(const TQString& ))); @@ -185,15 +185,15 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), TQToolTip::add( qsettingsBtn, i18n("select group dialog") ); connect(qsettingsBtn, TQT_SIGNAL(clicked()), krSelect, TQT_SLOT(activate())); - qlayout->addWidget(selectLabel,0,0); - qlayout->addWidget(quickSelectCombo,0,1); - qlayout->addWidget(qselectBtn,0,2); - qlayout->addWidget(qstoreBtn,0,3); - qlayout->addWidget(qsettingsBtn,0,4); + qtqlayout->addWidget(selectLabel,0,0); + qtqlayout->addWidget(quickSelectCombo,0,1); + qtqlayout->addWidget(qselectBtn,0,2); + qtqlayout->addWidget(qstoreBtn,0,3); + qtqlayout->addWidget(qsettingsBtn,0,4); stack->addWidget(quickPanel, QuickPanel); - // -------- finish the layout (General one) - layout->addMultiCellWidget(stack,1,1,0,5); + // -------- finish the tqlayout (General one) + tqlayout->addMultiCellWidget(stack,1,1,0,5); // set the wanted widget // ugly: are we left or right? diff --git a/krusader/RemoteMan/remoteman.cpp b/krusader/RemoteMan/remoteman.cpp index 877ad54..a9b27f6 100644 --- a/krusader/RemoteMan/remoteman.cpp +++ b/krusader/RemoteMan/remoteman.cpp @@ -129,7 +129,7 @@ void remoteMan::refreshData() { int h=temp.mid(1,1).toInt(); int l=temp.mid(2,1).toInt(); if ((++l)==10) { ++h; l=0; } - temp=TQString("<%1%2>").arg(h).arg(l); + temp=TQString("<%1%2>").tqarg(h).tqarg(l); temp=currentItem->text(0).replace(currentItem->text(0).length()-4,4,temp); currentItem->setText(0,temp); } else currentItem->setText(0,currentItem->text(0)+"<02>"); diff --git a/krusader/RemoteMan/remotemanbase.cpp b/krusader/RemoteMan/remotemanbase.cpp index 3e66725..104ed0a 100644 --- a/krusader/RemoteMan/remotemanbase.cpp +++ b/krusader/RemoteMan/remotemanbase.cpp @@ -18,7 +18,7 @@ #include <tqmultilineedit.h> #include <tqpushbutton.h> #include <tqspinbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvariant.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -147,23 +147,23 @@ remoteManBase::remoteManBase( TQWidget* parent, const char* name, bool modal, W remoteManBaseLayout->addLayout( Layout27, 5, 1 ); - layout = new TQGridLayout; - layout->setSpacing( 6 ); - layout->setMargin( 0 ); + tqlayout = new TQGridLayout; + tqlayout->setSpacing( 6 ); + tqlayout->setMargin( 0 ); removeBtn = new TQPushButton( this, "removeBtn" ); removeBtn->setText( i18n( "&Remove" ) ); removeBtn->setAutoDefault( FALSE ); removeBtn->setDefault( FALSE ); - layout->addWidget( removeBtn, 0, 2 ); + tqlayout->addWidget( removeBtn, 0, 2 ); connectBtn = new TQPushButton( this, "connectBtn" ); connectBtn->setText( i18n( "Co&nnect" ) ); connectBtn->setAutoDefault( FALSE ); connectBtn->setDefault( FALSE ); - layout->addMultiCellWidget( connectBtn, 1, 1, 0, 2 ); + tqlayout->addMultiCellWidget( connectBtn, 1, 1, 0, 2 ); newGroupBtn = new TQPushButton( this, "newGroupBtn" ); newGroupBtn->setEnabled( TRUE ); @@ -172,7 +172,7 @@ remoteManBase::remoteManBase( TQWidget* parent, const char* name, bool modal, W newGroupBtn->setDefault( FALSE ); newGroupBtn->setFlat( FALSE ); - layout->addWidget( newGroupBtn, 0, 0 ); + tqlayout->addWidget( newGroupBtn, 0, 0 ); addBtn = new TQPushButton( this, "addBtn" ); addBtn->setEnabled( TRUE ); @@ -181,9 +181,9 @@ remoteManBase::remoteManBase( TQWidget* parent, const char* name, bool modal, W addBtn->setDefault( FALSE ); addBtn->setFlat( FALSE ); - layout->addWidget( addBtn, 0, 1 ); + tqlayout->addWidget( addBtn, 0, 1 ); - remoteManBaseLayout->addLayout( layout, 6, 1 ); + remoteManBaseLayout->addLayout( tqlayout, 6, 1 ); Layout11 = new TQGridLayout; Layout11->setSpacing( 6 ); @@ -205,12 +205,12 @@ remoteManBase::remoteManBase( TQWidget* parent, const char* name, bool modal, W protocol->insertItem( i18n( "fish://" )); if( protocols.contains("sftp") ) protocol->insertItem( i18n( "sftp://" )); - protocol->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, protocol->sizePolicy().hasHeightForWidth() ) ); + protocol->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, protocol->sizePolicy().hasHeightForWidth() ) ); Layout11->addWidget( protocol, 1, 0 ); hostName = new TQLineEdit( this, "hostName" ); - hostName->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, hostName->sizePolicy().hasHeightForWidth() ) ); + hostName->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, hostName->sizePolicy().hasHeightForWidth() ) ); hostName->setMinimumSize( TQSize( 0, 0 ) ); Layout11->addWidget( hostName, 1, 1 ); @@ -233,7 +233,7 @@ remoteManBase::remoteManBase( TQWidget* parent, const char* name, bool modal, W TextLabel1_4_font.setPointSize( 10 ); TextLabel1_4->setFont( TextLabel1_4_font ); TextLabel1_4->setText( i18n( "* Warning: Storing your password is not secure !!!" ) ); - TextLabel1_4->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel1_4->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); remoteManBaseLayout->addWidget( TextLabel1_4, 3, 1 ); diff --git a/krusader/RemoteMan/remotemanbase.h b/krusader/RemoteMan/remotemanbase.h index f9f4aba..db35324 100644 --- a/krusader/RemoteMan/remotemanbase.h +++ b/krusader/RemoteMan/remotemanbase.h @@ -75,7 +75,7 @@ protected: TQGridLayout* Layout10; TQVBoxLayout* Layout26; TQVBoxLayout* Layout27; - TQGridLayout* layout; + TQGridLayout* tqlayout; TQGridLayout* Layout11; bool event( TQEvent* ); }; diff --git a/krusader/Search/krsearchdialog.cpp b/krusader/Search/krsearchdialog.cpp index 2b9ffa8..9032edc 100644 --- a/krusader/Search/krsearchdialog.cpp +++ b/krusader/Search/krsearchdialog.cpp @@ -47,7 +47,7 @@ #include <kmessagebox.h> #include <kpopupmenu.h> #include <tqcursor.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqheader.h> #include <kurldrag.h> #include <../kicons.h> @@ -160,7 +160,7 @@ KrSearchDialog::KrSearchDialog( TQString profile, TQWidget* parent, const char* resultLabelLayout->setMargin( 0 ); foundLabel = new TQLabel( resultTab, "foundLabel" ); - foundLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, foundLabel->sizePolicy().hasHeightForWidth() ) ); + foundLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, foundLabel->sizePolicy().hasHeightForWidth() ) ); foundLabel->setFrameShape( TQLabel::StyledPanel ); foundLabel->setFrameShadow( TQLabel::Sunken ); foundLabel->setText( i18n( "Found 0 matches." ) ); @@ -216,7 +216,7 @@ KrSearchDialog::KrSearchDialog( TQString profile, TQWidget* parent, const char* foundTextLayout->setMargin( 0 ); TQLabel *l1 = new TQLabel(resultTab); - l1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, l1->sizePolicy().hasHeightForWidth() ) ); + l1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, l1->sizePolicy().hasHeightForWidth() ) ); l1->setFrameShape( TQLabel::StyledPanel ); l1->setFrameShadow( TQLabel::Sunken ); l1->setText(i18n("Text found:")); @@ -357,7 +357,7 @@ void KrSearchDialog::found(TQString what, TQString where, KIO::filesize_t size, TQDateTime tmp(TQDate(t->tm_year+1900, t->tm_mon+1, t->tm_mday), TQTime(t->tm_hour, t->tm_min)); ResultListViewItem *it =new ResultListViewItem(resultsList, what, where.replace(TQRegExp("\\\\"),"#"), size, tmp, perm); - TQString totals = TQString(i18n("Found %1 matches.")).arg(resultsList->childCount()); + TQString totals = TQString(i18n("Found %1 matches.")).tqarg(resultsList->childCount()); foundLabel->setText(totals); if (!foundText.isEmpty()) it->setFoundText(foundText); @@ -476,15 +476,15 @@ void KrSearchDialog::keyPressEvent(TQKeyEvent *e) { if( e->key() == Key_F4 ) { - if (!generalFilter->containsText->currentText().isEmpty() && TQApplication::clipboard()->text() != generalFilter->containsText->currentText()) - TQApplication::clipboard()->setText(generalFilter->containsText->currentText()); + if (!generalFilter->containsText->currentText().isEmpty() && TQApplication::tqclipboard()->text() != generalFilter->containsText->currentText()) + TQApplication::tqclipboard()->setText(generalFilter->containsText->currentText()); editCurrent(); return; } else if( e->key() == Key_F3 ) { - if (!generalFilter->containsText->currentText().isEmpty() && TQApplication::clipboard()->text() != generalFilter->containsText->currentText()) - TQApplication::clipboard()->setText(generalFilter->containsText->currentText()); + if (!generalFilter->containsText->currentText().isEmpty() && TQApplication::tqclipboard()->text() != generalFilter->containsText->currentText()) + TQApplication::tqclipboard()->setText(generalFilter->containsText->currentText()); viewCurrent(); return; } @@ -568,7 +568,7 @@ void KrSearchDialog::feedToListBox() int listBoxNum = krConfig->readNumEntry( "Feed To Listbox Counter", 1 ); TQString queryName; do { - queryName = i18n("Search results")+TQString( " %1" ).arg( listBoxNum++ ); + queryName = i18n("Search results")+TQString( " %1" ).tqarg( listBoxNum++ ); }while( v.vfs_search( queryName ) != 0 ); krConfig->writeEntry( "Feed To Listbox Counter", listBoxNum ); @@ -622,7 +622,7 @@ void KrSearchDialog::copyToClipBoard() KURLDrag *d = new KURLDrag(urls, this); d->setPixmap( FL_LOADICON( "file" ), TQPoint( -7, 0 ) ); - TQApplication::clipboard()->setData( d ); + TQApplication::tqclipboard()->setData( d ); } #include "krsearchdialog.moc" diff --git a/krusader/Search/krsearchmod.cpp b/krusader/Search/krsearchmod.cpp index 98d742b..c919bc3 100644 --- a/krusader/Search/krsearchmod.cpp +++ b/krusader/Search/krsearchmod.cpp @@ -43,7 +43,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> #include <klargefile.h> #include <kurlrequesterdlg.h> diff --git a/krusader/Splitter/combiner.cpp b/krusader/Splitter/combiner.cpp index ebb937f..37e7504 100644 --- a/krusader/Splitter/combiner.cpp +++ b/krusader/Splitter/combiner.cpp @@ -59,7 +59,7 @@ Combiner::~Combiner() void Combiner::combine() { setCaption( i18n("Krusader::Combining...") ); - setLabelText( i18n("Combining the file %1...").arg( vfs::pathOrURL( baseURL ) )); + setLabelText( i18n("Combining the file %1...").tqarg( vfs::pathOrURL( baseURL ) )); /* check whether the .crc file exists */ splURL = baseURL; @@ -71,7 +71,7 @@ void Combiner::combine() { int ret = KMessageBox::questionYesNo(0, i18n("The CRC information file (%1) is missing!\n" "Validity checking is impossible without it. Continue combining?") - .arg( vfs::pathOrURL( splURL ) ) ); + .tqarg( vfs::pathOrURL( splURL ) ) ); if( ret == KMessageBox::No ) { @@ -107,7 +107,7 @@ void Combiner::combineSplitFileFinished(KIO::Job *job) TQString error; if( job->error() ) - error = i18n("Error at reading the CRC file (%1)!").arg( vfs::pathOrURL( splURL ) ); + error = i18n("Error at reading the CRC file (%1)!").tqarg( vfs::pathOrURL( splURL ) ); else { splitFile.remove( '\r' ); // Windows compatibility @@ -174,7 +174,7 @@ void Combiner::openNextFile() do { - ch = name.at( pos ).latin1() + 1; + ch = name.tqat( pos ).latin1() + 1; if( ch == TQChar( 'Z' + 1 ) ) ch = 'A'; if( ch == TQChar( 'z' + 1 ) ) @@ -189,7 +189,7 @@ void Combiner::openNextFile() else { TQString index( "%1" ); /* determining the filename */ - index = index.arg(++fileCounter).rightJustify( 3, '0' ); + index = index.tqarg(++fileCounter).rightJustify( 3, '0' ); readURL = baseURL; readURL.setFileName( baseURL.fileName() + "." + index ); } @@ -254,14 +254,14 @@ void Combiner::combineReceiveFinished(KIO::Job *job) { combineAbortJobs(); KMessageBox::questionYesNo(0, i18n("Can't open the first split file of %1!") - .arg( vfs::pathOrURL( baseURL ) ) ); + .tqarg( vfs::pathOrURL( baseURL ) ) ); emit reject(); return; } if( hasValidSplitFile ) { - TQString crcResult = TQString( "%1" ).arg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace() + TQString crcResult = TQString( "%1" ).tqarg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace() .rightJustify(8, '0'); if( receivedSize != expectedSize ) @@ -293,7 +293,7 @@ void Combiner::combineSendFinished(KIO::Job *job) if( job->error() ) /* any error occurred? */ { combineAbortJobs(); - KMessageBox::error(0, i18n("Error writing file %1!").arg( vfs::pathOrURL( writeURL ) ) ); + KMessageBox::error(0, i18n("Error writing file %1!").tqarg( vfs::pathOrURL( writeURL ) ) ); emit reject(); return; } diff --git a/krusader/Splitter/splitter.cpp b/krusader/Splitter/splitter.cpp index 83c2c60..8426c14 100644 --- a/krusader/Splitter/splitter.cpp +++ b/krusader/Splitter/splitter.cpp @@ -30,7 +30,7 @@ #include "splitter.h" #include "../VFS/vfs.h" -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kmessagebox.h> #include <kio/job.h> @@ -67,7 +67,7 @@ void Splitter::split( KIO::filesize_t splitSizeIn ) splitSize = splitSizeIn; setCaption( i18n("Krusader::Splitting...") ); - setLabelText( i18n("Splitting the file %1...").arg( vfs::pathOrURL( fileName ) ) ); + setLabelText( i18n("Splitting the file %1...").tqarg( vfs::pathOrURL( fileName ) ) ); if( file.isDir() ) { @@ -122,17 +122,17 @@ void Splitter::splitReceiveFinished(KIO::Job *job) if( job->error() ) /* any error occurred? */ { splitAbortJobs(); - KMessageBox::error(0, i18n("Error reading file %1!").arg( vfs::pathOrURL( fileName ) ) ); + KMessageBox::error(0, i18n("Error reading file %1!").tqarg( vfs::pathOrURL( fileName ) ) ); emit reject(); return; } - TQString crcResult = TQString( "%1" ).arg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace() + TQString crcResult = TQString( "%1" ).tqarg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace() .rightJustify(8, '0'); - splitFile = TQString( "filename=%1\n" ).arg( fileName.fileName() )+ - TQString( "size=%1\n" ) .arg( KIO::number( fileSize ) )+ - TQString( "crc32=%1\n" ) .arg( crcResult ); + splitFile = TQString( "filename=%1\n" ).tqarg( fileName.fileName() )+ + TQString( "size=%1\n" ) .tqarg( KIO::number( fileSize ) )+ + TQString( "crc32=%1\n" ) .tqarg( crcResult ); } void Splitter::splitReceivePercent (KIO::Job *, unsigned long percent) @@ -143,7 +143,7 @@ void Splitter::splitReceivePercent (KIO::Job *, unsigned long percent) void Splitter::splitCreateWriteJob() { TQString index( "%1" ); /* making the splitted filename */ - index = index.arg(++fileNumber).rightJustify( 3, '0' ); + index = index.tqarg(++fileNumber).rightJustify( 3, '0' ); TQString outFileName = fileName.fileName() + "." + index; writeURL = destinationDir; @@ -198,7 +198,7 @@ void Splitter::splitSendFinished(KIO::Job *job) if( job->error() ) /* any error occurred? */ { splitAbortJobs(); - KMessageBox::error(0, i18n("Error writing file %1!").arg( vfs::pathOrURL( writeURL ) ) ); + KMessageBox::error(0, i18n("Error writing file %1!").tqarg( vfs::pathOrURL( writeURL ) ) ); emit reject(); return; } @@ -241,7 +241,7 @@ void Splitter::splitFileFinished(KIO::Job *job) if( job->error() ) /* any error occurred? */ { - KMessageBox::error(0, i18n("Error at writing file %1!").arg( vfs::pathOrURL( writeURL ) ) ); + KMessageBox::error(0, i18n("Error at writing file %1!").tqarg( vfs::pathOrURL( writeURL ) ) ); emit reject(); return; } diff --git a/krusader/Splitter/splittergui.cpp b/krusader/Splitter/splittergui.cpp index e90a982..2c575bc 100644 --- a/krusader/Splitter/splittergui.cpp +++ b/krusader/Splitter/splittergui.cpp @@ -31,7 +31,7 @@ #include "splittergui.h" #include "../VFS/vfs.h" #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <kmessagebox.h> @@ -57,7 +57,7 @@ SplitterGUI::SplitterGUI( TQWidget* parent, KURL fileURL, KURL defaultDir ) : grid->setMargin( 11 ); TQLabel *splitterLabel = new TQLabel( this, "SplitterLabel" ); - splitterLabel->setText( i18n( "Split the file %1 to directory:" ).arg( vfs::pathOrURL( fileURL ) ) ); + splitterLabel->setText( i18n( "Split the file %1 to directory:" ).tqarg( vfs::pathOrURL( fileURL ) ) ); splitterLabel->setMinimumWidth( 400 ); grid->addWidget( splitterLabel,0 ,0 ); @@ -75,7 +75,7 @@ SplitterGUI::SplitterGUI( TQWidget* parent, KURL fileURL, KURL defaultDir ) : TQLabel *spacer = new TQLabel( splitSizeLine ); spacer->setText( " " ); - spacer->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + spacer->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); TQLabel *bytesPerFile = new TQLabel( splitSizeLine, "BytesPerFile" ); bytesPerFile->setText( i18n( "Max file size:" ) ); @@ -94,7 +94,7 @@ SplitterGUI::SplitterGUI( TQWidget* parent, KURL fileURL, KURL defaultDir ) : TQFrame *separator = new TQFrame( this, "separatorLine" ); separator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); - separator->setFixedHeight( separator->sizeHint().height() ); + separator->setFixedHeight( separator->tqsizeHint().height() ); grid->addWidget( separator,3 ,0 ); diff --git a/krusader/Splitter/splittergui.h b/krusader/Splitter/splittergui.h index ae6af9b..b83e757 100644 --- a/krusader/Splitter/splittergui.h +++ b/krusader/Splitter/splittergui.h @@ -91,14 +91,14 @@ struct PredefinedDevice if( frac_part ) { - frac = TQString( "%1" ).arg( frac_part ).rightJustify( 3, '0' ); + frac = TQString( "%1" ).tqarg( frac_part ).rightJustify( 3, '0' ); frac = "." + frac; while( frac.endsWith("0") ) frac.truncate( frac.length() - 1 ); } } - return TQString( "%1%2" ).arg( int_part ).arg( frac ); + return TQString( "%1%2" ).tqarg( int_part ).tqarg( frac ); } int mapTextToValue( bool * ) diff --git a/krusader/Synchronizer/feedtolistboxdialog.cpp b/krusader/Synchronizer/feedtolistboxdialog.cpp index e315d57..7436c93 100644 --- a/krusader/Synchronizer/feedtolistboxdialog.cpp +++ b/krusader/Synchronizer/feedtolistboxdialog.cpp @@ -39,7 +39,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqlabel.h> #include <tqhbox.h> @@ -98,30 +98,30 @@ FeedToListBoxDialog::FeedToListBoxDialog(TQWidget *parent, const char *name, Sy int listBoxNum = krConfig->readNumEntry( "Feed To Listbox Counter", 1 ); TQString queryName; do { - queryName = i18n("Synchronize results")+TQString( " %1" ).arg( listBoxNum++ ); + queryName = i18n("Synchronize results")+TQString( " %1" ).tqarg( listBoxNum++ ); }while( v.vfs_search( queryName ) != 0 ); krConfig->writeEntry( "Feed To Listbox Counter", listBoxNum ); // creating the widget TQWidget *widget=new TQWidget(this, "feedToListBoxMainWidget"); - TQVBoxLayout *layout = new TQVBoxLayout( widget, 0, 10, "FeedToListBoxDialogLayout" ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( widget, 0, 10, "FeedToListBoxDialogLayout" ); TQLabel *label = new TQLabel( i18n("Here you can name the file collection"), widget, "fbLabel" ); - layout->addWidget( label ); + tqlayout->addWidget( label ); lineEdit = new TQLineEdit( widget, "fbLineEdit" ); lineEdit->setText( queryName ); lineEdit->selectAll(); - layout->addWidget( lineEdit ); + tqlayout->addWidget( lineEdit ); TQHBox *hbox = new TQHBox( widget, "fbHBox" ); TQLabel *label2 = new TQLabel( i18n( "Side to feed:" ), hbox, "fbSideLabel" ); - label2->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + label2->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); sideCombo = new TQComboBox( hbox, "fbSideCombo" ); - sideCombo->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + sideCombo->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); sideCombo->insertItem( i18n( "Left" ) ); sideCombo->insertItem( i18n( "Right" ) ); sideCombo->insertItem( i18n( "Both" ) ); @@ -136,14 +136,14 @@ FeedToListBoxDialog::FeedToListBoxDialog(TQWidget *parent, const char *name, Sy TQFrame *line = new TQFrame( hbox, "fbVLine" ); line->setFrameStyle( TQFrame::VLine | TQFrame::Sunken ); - line->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + line->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); cbSelected = new TQCheckBox( i18n( "Selected files only" ), hbox, "cbSelected" ); - cbSelected->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + cbSelected->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); cbSelected->setEnabled( selectedNum != 0 ); cbSelected->setChecked( selectedNum != 0 ); - layout->addWidget( hbox ); + tqlayout->addWidget( hbox ); setMainWidget(widget); @@ -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( parentWidget(), i18n( "Cannot open %1!" ).arg( url.prettyURL() ) ); + KMessageBox::error( parentWidget(), i18n( "Cannot open %1!" ).tqarg( url.prettyURL() ) ); return; } v.vfs_addFiles( &urlList, KIO::CopyJob::Copy, 0 ); diff --git a/krusader/Synchronizer/synchronizedialog.cpp b/krusader/Synchronizer/synchronizedialog.cpp index 902fe37..01e8ee0 100755 --- a/krusader/Synchronizer/synchronizedialog.cpp +++ b/krusader/Synchronizer/synchronizedialog.cpp @@ -32,7 +32,7 @@ #include "../VFS/krpermhandler.h" #include "../krusader.h" #include "../defaults.h" -#include <layout.h> +#include <tqlayout.h> #include <tqhbox.h> #include <klocale.h> @@ -48,52 +48,52 @@ SynchronizeDialog::SynchronizeDialog( TQWidget* parent, const char* name, bool { setCaption( i18n("Krusader::Synchronize") ); - TQVBoxLayout *layout = new TQVBoxLayout( this, 11, 6, "SynchronizeDialogLayout" ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6, "SynchronizeDialogLayout" ); cbRightToLeft = new TQCheckBox( i18n( "Right to left: Copy 1 file", "Right to left: Copy %n files", leftCopyNr) + " " + i18n( "(1 byte)", "(%n bytes)", KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace().toInt() ), this, "labelRightToLeft" ); cbRightToLeft->setChecked( leftCopyNr != 0 ); cbRightToLeft->setEnabled( leftCopyNr != 0 ); - layout->addWidget( cbRightToLeft ); + tqlayout->addWidget( cbRightToLeft ); - lbRightToLeft = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", leftCopyNr).arg( 0 ) - .arg( 0 ).arg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ), + lbRightToLeft = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", leftCopyNr).tqarg( 0 ) + .tqarg( 0 ).tqarg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ), this, "lbRightToLeft" ); lbRightToLeft->setEnabled( leftCopyNr != 0 ); - layout->addWidget( lbRightToLeft ); + tqlayout->addWidget( lbRightToLeft ); cbLeftToRight = new TQCheckBox( i18n( "Left to right: Copy 1 file", "Left to right: Copy %n files", rightCopyNr) + " " + i18n( "(1 byte)", "(%n bytes)", KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace().toInt() ), this, "cbLeftToRight" ); cbLeftToRight->setChecked( rightCopyNr != 0 ); cbLeftToRight->setEnabled( rightCopyNr != 0 ); - layout->addWidget( cbLeftToRight ); + tqlayout->addWidget( cbLeftToRight ); - lbLeftToRight = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", rightCopyNr ).arg( 0 ) - .arg( 0 ).arg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ), + lbLeftToRight = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", rightCopyNr ).tqarg( 0 ) + .tqarg( 0 ).tqarg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ), this, "lbLeftToRight" ); lbLeftToRight->setEnabled( rightCopyNr != 0 ); - layout->addWidget( lbLeftToRight ); + tqlayout->addWidget( lbLeftToRight ); cbDeletable = new TQCheckBox( i18n( "Left: Delete 1 file", "Left: Delete %n files", deleteNr) + " " + i18n( "(1 byte)", "(%n bytes)", KRpermHandler::parseSize( deleteSize ).stripWhiteSpace().toInt() ), this, "cbDeletable" ); cbDeletable->setChecked( deleteNr != 0 ); cbDeletable->setEnabled( deleteNr != 0 ); - layout->addWidget( cbDeletable ); + tqlayout->addWidget( cbDeletable ); - lbDeletable = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", deleteNr ).arg( 0 ) - .arg( 0 ).arg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ), + lbDeletable = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", deleteNr ).tqarg( 0 ) + .tqarg( 0 ).tqarg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ), this, "lbDeletable" ); lbDeletable->setEnabled( deleteNr != 0 ); - layout->addWidget( lbDeletable ); + tqlayout->addWidget( lbDeletable ); progress = new TQProgressBar(1000, this); progress->setCenterIndicator(true); progress->setProgress( 0 ); progress->setMinimumWidth( 400 ); - layout->addWidget( progress ); + tqlayout->addWidget( progress ); TQHBox *hbox = new TQHBox( this, "SynchronizeDialogHBox" ); hbox->setSpacing( 6 ); @@ -101,10 +101,10 @@ SynchronizeDialog::SynchronizeDialog( TQWidget* parent, const char* name, bool cbOverwrite = new TQCheckBox( i18n( "Confirm overwrites" ), this, "cbOverWrite" ); krConfig->setGroup("Synchronize"); cbOverwrite->setChecked( krConfig->readBoolEntry( "Confirm overwrites", _ConfirmOverWrites ) ); - layout->addWidget( cbOverwrite ); + tqlayout->addWidget( cbOverwrite ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - hbox->layout()->addItem( spacer ); + hbox->tqlayout()->addItem( spacer ); btnStart = new TQPushButton( hbox, "btnStart" ); btnStart->setText( i18n( "&Start" ) ); @@ -116,7 +116,7 @@ SynchronizeDialog::SynchronizeDialog( TQWidget* parent, const char* name, bool TQPushButton *btnClose = new TQPushButton( hbox, "btnClose" ); btnClose->setText( i18n( "&Close" ) ); - layout->addWidget( hbox ); + tqlayout->addWidget( hbox ); connect( btnStart, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startSynchronization() ) ); connect( btnPause, TQT_SIGNAL( clicked() ), this, TQT_SLOT( pauseOrResume() ) ); @@ -155,15 +155,15 @@ void SynchronizeDialog::synchronizationFinished() void SynchronizeDialog::processedSizes( int leftNr, KIO::filesize_t leftSize, int rightNr, KIO::filesize_t rightSize, int delNr, KIO::filesize_t delSize ) { - lbRightToLeft->setText( i18n( "\tReady: %1/%2 files, %3/%4" ).arg( leftNr ).arg( leftCopyNr ) - .arg( KRpermHandler::parseSize( leftSize ).stripWhiteSpace() ) - .arg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ) ); - lbLeftToRight->setText( i18n( "\tReady: %1/%2 files, %3/%4" ).arg( rightNr ).arg( rightCopyNr ) - .arg( KRpermHandler::parseSize( rightSize ).stripWhiteSpace() ) - .arg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ) ); - lbDeletable->setText ( i18n( "\tReady: %1/%2 files, %3/%4" ).arg( delNr ).arg( deleteNr ) - .arg( KRpermHandler::parseSize( delSize ).stripWhiteSpace() ) - .arg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ) ); + lbRightToLeft->setText( i18n( "\tReady: %1/%2 files, %3/%4" ).tqarg( leftNr ).tqarg( leftCopyNr ) + .tqarg( KRpermHandler::parseSize( leftSize ).stripWhiteSpace() ) + .tqarg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ) ); + lbLeftToRight->setText( i18n( "\tReady: %1/%2 files, %3/%4" ).tqarg( rightNr ).tqarg( rightCopyNr ) + .tqarg( KRpermHandler::parseSize( rightSize ).stripWhiteSpace() ) + .tqarg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ) ); + lbDeletable->setText ( i18n( "\tReady: %1/%2 files, %3/%4" ).tqarg( delNr ).tqarg( deleteNr ) + .tqarg( KRpermHandler::parseSize( delSize ).stripWhiteSpace() ) + .tqarg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ) ); KIO::filesize_t totalSum = leftCopySize + rightCopySize + deleteSize; KIO::filesize_t processedSum = leftSize + rightSize + delSize; diff --git a/krusader/Synchronizer/synchronizer.cpp b/krusader/Synchronizer/synchronizer.cpp index 7045e0a..62b19c0 100755 --- a/krusader/Synchronizer/synchronizer.cpp +++ b/krusader/Synchronizer/synchronizer.cpp @@ -54,7 +54,7 @@ #include <kprocess.h> #include <kdialogbase.h> #include <kprogress.h> -#include <layout.h> +#include <tqlayout.h> #include <kurlcompletion.h> #include <sys/types.h> @@ -154,7 +154,7 @@ int Synchronizer::compare( TQString leftURL, TQString rightURL, KRQuery *query, if( !autoScroll ) refresh( true ); - emit statusInfo( i18n( "Number of files: %1" ).arg( fileCount ) ); + emit statusInfo( i18n( "Number of files: %1" ).tqarg( fileCount ) ); return fileCount; } @@ -185,7 +185,7 @@ void Synchronizer::compareLoop() { break; case ST_STATE_READY: case ST_STATE_ERROR: - emit statusInfo( i18n( "Number of compared directories: %1" ).arg( comparedDirs ) ); + emit statusInfo( i18n( "Number of compared directories: %1" ).tqarg( comparedDirs ) ); stack.removeRef( entry ); continue; default: @@ -645,7 +645,7 @@ int Synchronizer::refresh(bool nostatus) } if( !nostatus ) - emit statusInfo( i18n( "Number of files: %1" ).arg( fileCount ) ); + emit statusInfo( i18n( "Number of files: %1" ).tqarg( fileCount ) ); return fileCount; } @@ -1207,16 +1207,16 @@ void Synchronizer::slotTaskFinished(KIO::Job *job ) { case TT_COPY_TO_LEFT: error = i18n("Error at copying file %1 to %2!") - .arg( vfs::pathOrURL( rightURL ) ) - .arg( vfs::pathOrURL( leftURL ) ); + .tqarg( vfs::pathOrURL( rightURL ) ) + .tqarg( vfs::pathOrURL( leftURL ) ); break; case TT_COPY_TO_RIGHT: error = i18n("Error at copying file %1 to %2!") - .arg( vfs::pathOrURL( leftURL ) ) - .arg( vfs::pathOrURL( rightURL ) ); + .tqarg( vfs::pathOrURL( leftURL ) ) + .tqarg( vfs::pathOrURL( rightURL ) ); break; case TT_DELETE: - error = i18n("Error at deleting file %1!").arg( vfs::pathOrURL( leftURL ) ); + error = i18n("Error at deleting file %1!").tqarg( vfs::pathOrURL( leftURL ) ); break; default: break; @@ -1332,13 +1332,13 @@ public: showButton(KDialogBase::Close, false); TQFrame* mainWidget = plainPage(); - TQVBoxLayout* layout = new TQVBoxLayout(mainWidget, 10); + TQVBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 10); TQLabel *mLabel = new TQLabel(text, mainWidget); - layout->addWidget(mLabel); + tqlayout->addWidget(mLabel); mProgressBar = new KProgress(mainWidget); - layout->addWidget(mProgressBar); + tqlayout->addWidget(mProgressBar); setButtonText( KDialogBase::User1, i18n( "Pause" ) ); diff --git a/krusader/Synchronizer/synchronizerdirlist.cpp b/krusader/Synchronizer/synchronizerdirlist.cpp index 910dbd7..8feb61a 100644 --- a/krusader/Synchronizer/synchronizerdirlist.cpp +++ b/krusader/Synchronizer/synchronizerdirlist.cpp @@ -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(parentWidget, i18n("Can't open the %1 directory!").arg( path ), i18n("Error")); + KMessageBox::error(parentWidget, i18n("Can't open the %1 directory!").tqarg( path ), i18n("Error")); emit finished( result = false ); return false; } diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp index bfccd28..cd52b55 100755 --- a/krusader/Synchronizer/synchronizergui.cpp +++ b/krusader/Synchronizer/synchronizergui.cpp @@ -40,7 +40,7 @@ #include "../kicons.h" #include "synchronizedialog.h" #include "feedtolistboxdialog.h" -#include <layout.h> +#include <tqlayout.h> #include <kurlrequester.h> #include <klocale.h> #include <tqgrid.h> @@ -56,7 +56,7 @@ #include <tqspinbox.h> #include <kinputdialog.h> #include <kurldrag.h> -#include <clipboard.h> +#include <tqclipboard.h> static const char * const right_arrow_button_data[] = { "18 18 97 2", @@ -1108,27 +1108,27 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL synchronizerGrid->setMargin( 11 ); TQGroupBox *compareDirs = new TQGroupBox( synchronizerTab, "SyncCompareDirectories" ); - compareDirs->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed); + compareDirs->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed); compareDirs->setTitle( i18n( "Directory Comparison" ) ); compareDirs->setColumnLayout(0, Qt::Vertical ); - compareDirs->layout()->setSpacing( 0 ); - compareDirs->layout()->setMargin( 0 ); + compareDirs->tqlayout()->setSpacing( 0 ); + compareDirs->tqlayout()->setMargin( 0 ); - TQGridLayout *grid = new TQGridLayout( compareDirs->layout() ); + TQGridLayout *grid = new TQGridLayout( compareDirs->tqlayout() ); grid->setSpacing( 6 ); grid->setMargin( 11 ); leftDirLabel = new TQLabel( compareDirs, "leftDirLabel" ); - leftDirLabel->setAlignment( TQt::AlignHCenter ); + leftDirLabel->tqsetAlignment( TQt::AlignHCenter ); grid->addWidget( leftDirLabel, 0 ,0 ); TQLabel *filterLabel = new TQLabel( compareDirs, "filterLabel" ); filterLabel->setText( i18n( "File &Filter:" ) ); - filterLabel->setAlignment( TQt::AlignHCenter ); + filterLabel->tqsetAlignment( TQt::AlignHCenter ); grid->addWidget( filterLabel, 0 ,1 ); rightDirLabel = new TQLabel( compareDirs, "rightDirLabel" ); - rightDirLabel->setAlignment( TQt::AlignHCenter ); + rightDirLabel->tqsetAlignment( TQt::AlignHCenter ); grid->addWidget( rightDirLabel, 0 ,2 ); krConfig->setGroup("Synchronize"); @@ -1137,7 +1137,7 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL leftLocation->setMaxCount(25); // remember 25 items leftLocation->setDuplicatesEnabled( false ); leftLocation->setEditable( true ); - leftLocation->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Fixed); + leftLocation->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Fixed); TQStringList list = krConfig->readListEntry("Left Directory History"); leftLocation->setHistoryItems(list); KURLRequester *leftUrlReq = new KURLRequester( leftLocation, compareDirs, "LeftDirectory" ); @@ -1155,7 +1155,7 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL fileFilter->setDuplicatesEnabled( false ); fileFilter->setMinimumWidth( 100 ); fileFilter->setMaximumWidth( 100 ); - fileFilter->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + fileFilter->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); list = krConfig->readListEntry("File Filter"); fileFilter->setHistoryItems(list); fileFilter->setEditText("*"); @@ -1170,7 +1170,7 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL rightLocation->setMaxCount(25); // remember 25 items rightLocation->setDuplicatesEnabled( false ); rightLocation->setEditable( true ); - rightLocation->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Fixed); + rightLocation->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Fixed); list = krConfig->readListEntry("Right Directory History"); rightLocation->setHistoryItems(list); KURLRequester *rightUrlReq = new KURLRequester( rightLocation, compareDirs, "RightDirectory" ); @@ -1209,11 +1209,11 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL TQGroupBox *showOptions = new TQGroupBox( optionBox, "SyncOptionBox" ); showOptions->setTitle( i18n( "S&how options" ) ); - showOptions->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed); + showOptions->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed); showOptions->setColumnLayout(0, Qt::Vertical ); - showOptions->layout()->setSpacing( 0 ); - showOptions->layout()->setMargin( 0 ); - TQGridLayout *showOptionsLayout = new TQGridLayout( showOptions->layout() ); + showOptions->tqlayout()->setSpacing( 0 ); + showOptions->tqlayout()->setMargin( 0 ); + TQGridLayout *showOptionsLayout = new TQGridLayout( showOptions->tqlayout() ); showOptionsLayout->setSpacing( 6 ); showOptionsLayout->setMargin( 11 ); @@ -1354,10 +1354,10 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL TQGroupBox *optionsGroup = new TQGroupBox( generalFilter, "options" ); optionsGroup->setTitle( i18n( "&Options" ) ); optionsGroup->setColumnLayout(0, Qt::Vertical ); - optionsGroup->layout()->setSpacing( 0 ); - optionsGroup->layout()->setMargin( 0 ); - TQGridLayout *optionsLayout = new TQGridLayout( optionsGroup->layout() ); - optionsLayout->setAlignment( TQt::AlignTop ); + optionsGroup->tqlayout()->setSpacing( 0 ); + optionsGroup->tqlayout()->setMargin( 0 ); + TQGridLayout *optionsLayout = new TQGridLayout( optionsGroup->tqlayout() ); + optionsLayout->tqsetAlignment( TQt::AlignTop ); optionsLayout->setSpacing( 6 ); optionsLayout->setMargin( 11 ); @@ -2472,7 +2472,7 @@ void SynchronizerGUI::copyToClipboard( bool isLeft ) KURLDrag *d = new KURLDrag(urls, this); d->setPixmap( FL_LOADICON( isLeft ? "2leftarrow" : "2rightarrow" ), TQPoint( -7, 0 ) ); - TQApplication::clipboard()->setData( d ); + TQApplication::tqclipboard()->setData( d ); } #include "synchronizergui.moc" diff --git a/krusader/Synchronizer/synchronizertask.cpp b/krusader/Synchronizer/synchronizertask.cpp index eefc53f..d2a76ad 100644 --- a/krusader/Synchronizer/synchronizertask.cpp +++ b/krusader/Synchronizer/synchronizertask.cpp @@ -131,14 +131,14 @@ void CompareContentTask::start() { if( leftURL.isLocalFile() && rightURL.isLocalFile() ) { leftFile = new TQFile( leftURL.path() ); if( !leftFile->open( IO_ReadOnly ) ) { - KMessageBox::error(parentWidget, i18n("Error at opening %1!").arg( 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(parentWidget, i18n("Error at opening %1!").arg( rightURL.path() )); + KMessageBox::error(parentWidget, i18n("Error at opening %1!").tqarg( rightURL.path() )); m_state = ST_STATE_ERROR; return; } @@ -300,8 +300,8 @@ void CompareContentTask::slotFinished(KIO::Job *job) { errorPrinted = true; KMessageBox::error(parentWidget, i18n("IO error at comparing file %1 with %2!") - .arg( vfs::pathOrURL( leftURL ) ) - .arg( vfs::pathOrURL( rightURL ) ) ); + .tqarg( vfs::pathOrURL( leftURL ) ) + .tqarg( vfs::pathOrURL( rightURL ) ) ); } if( leftReadJob == 0 && rightReadJob == 0 ) @@ -335,8 +335,8 @@ void CompareContentTask::sendStatusMessage() { double perc = (size == 0) ? 1. : (double)received / (double)size; int percent = (int)(perc * 10000. + 0.5); - TQString statstr = TQString( "%1.%2%3" ).arg( percent / 100 ).arg( ( percent / 10 )%10 ).arg( percent % 10 ) + "%"; - setStatusMessage( i18n( "Comparing file %1 (%2)..." ).arg( leftURL.fileName() ).arg( statstr ) ); + TQString statstr = TQString( "%1.%2%3" ).tqarg( percent / 100 ).tqarg( ( percent / 10 )%10 ).tqarg( percent % 10 ) + "%"; + setStatusMessage( i18n( "Comparing file %1 (%2)..." ).tqarg( leftURL.fileName() ).tqarg( statstr ) ); timer->start( 500, true ); } diff --git a/krusader/UserAction/expander.cpp b/krusader/UserAction/expander.cpp index 9f28f6e..139b00c 100644 --- a/krusader/UserAction/expander.cpp +++ b/krusader/UserAction/expander.cpp @@ -37,7 +37,7 @@ #include <kmessagebox.h> #include <ktempfile.h> #include <tqstringlist.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <functional> using namespace std; @@ -54,7 +54,7 @@ TQValueList<const exp_placeholder*>& Expander::_placeholder() void exp_placeholder::panelMissingError(const TQString &s, Expander& exp) { - exp.setError( Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Needed panel specification missing in expander %1").arg(s)) ); + exp.setError( Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Needed panel specification missing in expander %1").tqarg(s)) ); } TQStringList exp_placeholder::fileList(const ListPanel* const panel,const TQString& type,const TQString& mask,const bool ommitPath,const bool useUrl,Expander& exp,const TQString& error) @@ -69,7 +69,7 @@ TQStringList exp_placeholder::fileList(const ListPanel* const panel,const TQStri else if ( type == "selected" ) panel->view->getSelectedItems( &items ); else { - setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to %1: %2 is not valid item specifier").arg(error,type) ) ); + setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to %1: %2 is not valid item specifier").tqarg(error,type) ) ); return TQString(); } if ( !ommitPath ) { // add the current path @@ -397,11 +397,11 @@ TagString exp_Count::expFunc( const ListPanel* panel, const TQStringList& parame else if ( parameter[ 0 ].lower() == "selected" ) n = panel->view->numSelected(); else { - setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to Count: %1 is not valid item specifier").arg(parameter[0]) )); + setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to Count: %1 is not valid item specifier").tqarg(parameter[0]) )); return TQString(); } - return TagString(TQString("%1").arg( n )); + return TagString(TQString("%1").tqarg( n )); } exp_Filter::exp_Filter() { @@ -503,7 +503,7 @@ TagString exp_ListFile::expFunc( const ListPanel* panel, const TQStringList& par KTempFile tmpFile( locateLocal("tmp", "krusader"), ".itemlist" ); if ( tmpFile.status() != 0 ) { - setError(exp, Error(Error::S_FATAL,Error::C_WORLD, i18n("Expander: tempfile couldn't be opened (%1)" ).arg(strerror( tmpFile.status() )) )); + setError(exp, Error(Error::S_FATAL,Error::C_WORLD, i18n("Expander: tempfile couldn't be opened (%1)" ).tqarg(strerror( tmpFile.status() )) )); return TQString(); } @@ -635,16 +635,16 @@ exp_Clipboard::exp_Clipboard() { addParameter( exp_parameter( i18n("Append to current clipboard content with this separator (optional):"), "", false ) ); } TagString exp_Clipboard::expFunc( const ListPanel*, const TagStringList& parameter, const bool&, Expander& exp ) const { -// kdDebug() << "Expander::exp_Clipboard, parameter[0]: '" << parameter[0] << "', Clipboard: " << KApplication::clipboard()->text() << endl; +// kdDebug() << "Expander::exp_Clipboard, parameter[0]: '" << parameter[0] << "', Clipboard: " << KApplication::tqclipboard()->text() << endl; TQStringList lst=splitEach(parameter[0]); if(!parameter[1].isSimple()) { setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: %Each% may not be in the second argument of %Clipboard%"))); return TQString(); } - if ( parameter.count() <= 1 || parameter[1].string().isEmpty() || KApplication::clipboard()->text().isEmpty() ) - KApplication::clipboard()->setText( lst.join("\n") ); + if ( parameter.count() <= 1 || parameter[1].string().isEmpty() || KApplication::tqclipboard()->text().isEmpty() ) + KApplication::tqclipboard()->setText( lst.join("\n") ); else - KApplication::clipboard()->setText( KApplication::clipboard()->text() + parameter[1].string() + lst.join("\n") ); + KApplication::tqclipboard()->setText( KApplication::tqclipboard()->text() + parameter[1].string() + lst.join("\n") ); return TQString(); // this doesn't return anything, that's normal! } @@ -832,7 +832,7 @@ TagString exp_ColSort::expFunc( const ListPanel* panel, const TQStringList& para */ // krOut << "start: exp_ColSort::expFunc" << endl; - #define MODE_OUT krOut << TQString( "mode: %1" ).arg( mode, 0, 2 ) << endl; // displays mode in base-2 + #define MODE_OUT krOut << TQString( "mode: %1" ).tqarg( mode, 0, 2 ) << endl; // displays mode in base-2 //MODE_OUT if ( parameter.count() <= 1 || ( parameter[1].lower() != "asc" && parameter[1].lower() != "desc" ) ) { //default == toggle @@ -882,7 +882,7 @@ TagString exp_ColSort::expFunc( const ListPanel* panel, const TQStringList& para if ( parameter[0].lower() == "group" ) { mode |= KrViewProperties::Group; } else { - setError(exp, Error(Error::S_WARNING,Error::C_ARGUMENT,i18n("Expander: unknown column specified for %_ColSort(%1)%").arg(parameter[0]) )); + setError(exp, Error(Error::S_WARNING,Error::C_ARGUMENT,i18n("Expander: unknown column specified for %_ColSort(%1)%").tqarg(parameter[0]) )); return TQString(); } @@ -909,7 +909,7 @@ TagString exp_PanelSize::expFunc( const ListPanel* panel, const TQStringList& pa newSize = parameter[0].toInt(); if ( newSize < 0 || newSize > 100 ) { - setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Value %1 out of range for %_PanelSize(percent)%. The first parameter has to be >0 and <100").arg(newSize)) ); + setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Value %1 out of range for %_PanelSize(percent)%. The first parameter has to be >0 and <100").tqarg(newSize)) ); return TQString(); } @@ -1031,7 +1031,7 @@ TagString exp_simpleplaceholder::expFunc( const ListPanel* p, const TagStringLis if((*it).isSimple()) lst.push_back((*it).string()); else { - setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("%Each% is not allowed in parameter to %1").arg(description()))); + setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("%Each% is not allowed in parameter to %1").tqarg(description()))); return TQString(); } return expFunc(p,lst,useUrl,exp); @@ -1052,7 +1052,7 @@ ListPanel* Expander::getPanel( const char panelIndicator, const exp_placeholder* case '_': return 0; default: - exp.setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: Bad panel specifier %1 in placeholder %2").arg(panelIndicator).arg(pl->description()))); + exp.setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: Bad panel specifier %1 in placeholder %2").tqarg(panelIndicator).tqarg(pl->description()))); return 0; } } @@ -1111,7 +1111,7 @@ TagString Expander::expandCurrent( const TQString& stringToExpand, bool useUrl ) break; } if ( i == placeholderCount() ) { // didn't find an expander - setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Error: unrecognized %%%1%2%% in Expander::expand").arg(panelIndicator).arg(exp)) ); + setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Error: unrecognized %%%1%2%% in Expander::expand").tqarg(panelIndicator).tqarg(exp)) ); return TQString(); } } //else diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp index 4253002..2b9bbce 100644 --- a/krusader/UserAction/kraction.cpp +++ b/krusader/UserAction/kraction.cpp @@ -14,9 +14,9 @@ #include <kdebug.h> #include <klocale.h> #include <kinputdialog.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqvbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqsplitter.h> #include <tqpushbutton.h> #include <tqcheckbox.h> @@ -41,7 +41,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////// KrActionProcDlg ///////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////// -#include <layout.h> +#include <tqlayout.h> KrActionProcDlg::KrActionProcDlg( TQString caption, bool enableStderr, TQWidget *parent ) : KDialogBase( parent, 0, false, caption, KDialogBase::User1 | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Cancel ), _stdout(0), _stderr(0), _currentTextEdit(0) { @@ -90,11 +90,11 @@ _stdout(0), _stderr(0), _currentTextEdit(0) { bool startupState = krConfig->readBoolEntry( "Use Fixed Font", _UserActions_UseFixedFont ); toggleFixedFont( startupState ); - // HACK This fetches the layout of the buttonbox from KDialogBase, although it is not accessable with KDialogBase's API + // HACK This fetches the tqlayout of the buttonbox from KDialogBase, although it is not accessable with KDialogBase's API // None the less it's quite save to use since this implementation hasn't changed since KDE-3.3 (I haven't looked at earlier // versions since we don't support them) and now all work is done in KDE-4. TQWidget* buttonBox = TQT_TQWIDGET( actionButton(KDialogBase::Ok)->parent() ); - TQBoxLayout* buttonBoxLayout = static_cast<TQBoxLayout*>( buttonBox->layout() ); + TQBoxLayout* buttonBoxLayout = static_cast<TQBoxLayout*>( buttonBox->tqlayout() ); TQCheckBox* useFixedFont = new TQCheckBox( i18n("Use font with fixed width"), buttonBox ); buttonBoxLayout->insertWidget( 0, useFixedFont ); useFixedFont->setChecked( startupState ); @@ -103,16 +103,16 @@ _stdout(0), _stderr(0), _currentTextEdit(0) { void KrActionProcDlg::addStderr( KProcess *, char *buffer, int buflen ) { if (_stderr) - _stderr->append( TQString::fromLatin1( buffer, buflen ) ); + _stderr->append( TQString::tqfromLatin1( buffer, buflen ) ); else { _stdout->setItalic(true); - _stdout->append( TQString::fromLatin1( buffer, buflen ) ); + _stdout->append( TQString::tqfromLatin1( buffer, buflen ) ); _stdout->setItalic(false); } } void KrActionProcDlg::addStdout( KProcess *, char *buffer, int buflen ) { - _stdout->append( TQString::fromLatin1( buffer, buflen ) ); + _stdout->append( TQString::tqfromLatin1( buffer, buflen ) ); } void KrActionProcDlg::toggleFixedFont( bool state ) { @@ -151,7 +151,7 @@ void KrActionProcDlg::slotUser1() { if ( ! open ) { KMessageBox::error( this, - i18n("Can't open %1 for writing!\nNothing exported.").arg(filename), + i18n("Can't open %1 for writing!\nNothing exported.").tqarg(filename), i18n("Export failed!") ); return; diff --git a/krusader/UserAction/useraction.cpp b/krusader/UserAction/useraction.cpp index c6d2963..10005de 100644 --- a/krusader/UserAction/useraction.cpp +++ b/krusader/UserAction/useraction.cpp @@ -97,7 +97,7 @@ void UserAction::readFromFile( const TQString& filename, ReadMode mode, KrAction file.close(); delete doc; doc = 0; KMessageBox::error( MAIN_VIEW, - i18n( "The file %1 does not contain valid UserActions.\n" ).arg( filename ), // text + i18n( "The file %1 does not contain valid UserActions.\n" ).tqarg( filename ), // text i18n("UserActions - can't read from file!") // caption ); } @@ -108,7 +108,7 @@ void UserAction::readFromFile( const TQString& filename, ReadMode mode, KrAction // check if the file got the right root-element (ACTION_ROOT) - this finds out if the xml-file read to the DOM is realy an krusader useraction-file if( root.tagName() != ACTION_ROOT ) { KMessageBox::error( MAIN_VIEW, - i18n( "The actionfile's root-element isn't called "ACTION_ROOT", using %1").arg( filename ), + i18n( "The actionfile's root-element isn't called "ACTION_ROOT", using %1").tqarg( filename ), i18n( "UserActions - can't read from file!" ) ); delete doc; doc = 0; @@ -120,7 +120,7 @@ void UserAction::readFromFile( const TQString& filename, ReadMode mode, KrAction } // if ( file.open( IO_ReadOnly ) ) else { KMessageBox::error( MAIN_VIEW, - i18n( "Unable to open actionfile %1").arg( filename ), + i18n( "Unable to open actionfile %1").tqarg( filename ), i18n( "UserActions - can't read from file!" ) ); } @@ -150,7 +150,7 @@ void UserAction::readFromElement( const TQDomElement& element, ReadMode mode, Kr int i = 0; // appent a counter till the name is unique... (this checks every action, not only useractions) while ( krApp->actionCollection()->action( name.latin1() ) ) - name = basename.arg( ++i ); + name = basename.tqarg( ++i ); KrAction* act = new KrAction( krApp->actionCollection(), name.latin1() ); if ( act->xmlRead( e ) ) { diff --git a/krusader/VFS/arc_vfs.cpp b/krusader/VFS/arc_vfs.cpp index bcbc401..dca82ae 100755 --- a/krusader/VFS/arc_vfs.cpp +++ b/krusader/VFS/arc_vfs.cpp @@ -215,7 +215,7 @@ bool arc_vfs::getDirs(){ proc.start(KProcess::Block); if( !proc.normalExit() || !proc.exitStatus() == 0 ){ if (!quietMode) KMessageBox::error(krApp, i18n("<qt>Can't read <b>%1</b>. Archive " - "might be corrupted!</qt>").arg(arcFile.mid(arcFile.findRev('/')+1))); + "might be corrupted!</qt>").tqarg(arcFile.mid(arcFile.findRev('/')+1))); error = true; return false; } diff --git a/krusader/VFS/ftp_vfs.cpp b/krusader/VFS/ftp_vfs.cpp index 237ac1a..28d8412 100644 --- a/krusader/VFS/ftp_vfs.cpp +++ b/krusader/VFS/ftp_vfs.cpp @@ -161,12 +161,12 @@ void ftp_vfs::slotListResult( KIO::Job *job ) { bool ftp_vfs::populateVfsList( const KURL& origin, bool showHidden ) { TQString errorMsg = TQString(); if ( !origin.isValid() ) - errorMsg = i18n( "Malformed URL:\n%1" ).arg( origin.url() ); + errorMsg = i18n( "Malformed URL:\n%1" ).tqarg( origin.url() ); if ( !KProtocolInfo::supportsListing( origin ) ) { if( origin.protocol() == "ftp" && KProtocolInfo::supportsReading( origin ) ) errorMsg = i18n( "Krusader doesn't support FTP access via HTTP.\nIf it is not the case, please check and change the Proxy settings in kcontrol." ); else - errorMsg = i18n( "Protocol not supported by Krusader:\n%1" ).arg( origin.url() ); + errorMsg = i18n( "Protocol not supported by Krusader:\n%1" ).tqarg( origin.url() ); } if ( !errorMsg.isEmpty() ) { diff --git a/krusader/VFS/krarchandler.cpp b/krusader/VFS/krarchandler.cpp index 1fe0ed2..c5507f4 100644 --- a/krusader/VFS/krarchandler.cpp +++ b/krusader/VFS/krarchandler.cpp @@ -28,7 +28,7 @@ * * ***************************************************************************/ // QT includes -#include <textstream.h> +#include <tqtextstream.h> // KDE includes #include <kprocess.h> #include <ktempfile.h> @@ -201,8 +201,8 @@ long KRarcHandler::arcFileCount( TQString archive, TQString type, TQString passw krApp->stopWait(); - if( !list.normalExit() || !checkStatus( type, list.exitStatus() ) ) { - KMessageBox::detailedError (krApp, i18n( "Failed to list the content of the archive (%1)!" ).arg( archive ), + if( !list.normalExit() || !checktqStatus( type, list.exitStatus() ) ) { + KMessageBox::detailedError (krApp, i18n( "Failed to list the content of the archive (%1)!" ).tqarg( archive ), list.getErrorMsg(), i18n("Error" ) ); return 0; } @@ -258,8 +258,8 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T KrShellProcess cpio; cpio << KrServices::fullPathName( "rpm2cpio" ) << " " + KrServices::quote( archive ) << " > " << cpioName; cpio.start(KProcess::Block, KProcess::AllOutput ); - if( !cpio.normalExit() || !checkStatus( "cpio", cpio.exitStatus() ) ) { - KMessageBox::detailedError (krApp, i18n( "Failed to convert rpm (%1) to cpio!" ).arg( archive ), + if( !cpio.normalExit() || !checktqStatus( "cpio", cpio.exitStatus() ) ) { + KMessageBox::detailedError (krApp, i18n( "Failed to convert rpm (%1) to cpio!" ).tqarg( archive ), cpio.getErrorMsg(), i18n("Error" ) ); return 0; } @@ -275,8 +275,8 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T KrShellProcess dpkg; dpkg << KrServices::fullPathName( "dpkg" ) << " --fsys-tarfile " + KrServices::quote( archive ) << " > " << cpioName; dpkg.start(KProcess::Block, KProcess::AllOutput ); - if( !dpkg.normalExit() || !checkStatus( "-deb", dpkg.exitStatus() ) ) { - KMessageBox::detailedError (krApp, i18n( "Failed to convert deb (%1) to tar!" ).arg( archive ), + if( !dpkg.normalExit() || !checktqStatus( "-deb", dpkg.exitStatus() ) ) { + KMessageBox::detailedError (krApp, i18n( "Failed to convert deb (%1) to tar!" ).tqarg( archive ), dpkg.getErrorMsg(), i18n("Error" ) ); return 0; } @@ -335,8 +335,8 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T TQFile( cpioName ).remove(); /* remove the cpio file */ // check the return value - if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) { - KMessageBox::detailedError (krApp, i18n( "Failed to unpack %1!" ).arg( archive ), + if ( !proc.normalExit() || !checktqStatus( type, proc.exitStatus() ) ) { + KMessageBox::detailedError (krApp, i18n( "Failed to unpack %1!" ).tqarg( archive ), krApp->wasWaitingCancelled() ? i18n( "User cancelled." ) : proc.getErrorMsg(), i18n("Error" ) ); return false; @@ -397,7 +397,7 @@ bool KRarcHandler::test( TQString archive, TQString type, TQString password, lon krApp->stopWait(); // check the return value - if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) + if ( !proc.normalExit() || !checktqStatus( type, proc.exitStatus() ) ) return false; return true; // SUCCESS @@ -446,7 +446,7 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l if( size >= 10000 ) { if( type == "-arj" || type == "-rar" ) - packer += TQString( " -v%1b" ).arg( sizeStr ); + packer += TQString( " -v%1b" ).tqarg( sizeStr ); } } @@ -459,24 +459,24 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l if( type == "-rar" ) { static const int rarLevels[] = { 0, 1, 2, 2, 3, 3, 4, 4, 5 }; - packer += TQString( " -m%1" ).arg( rarLevels[ level ] ); + packer += TQString( " -m%1" ).tqarg( rarLevels[ level ] ); } else if( type == "-arj" ) { static const int arjLevels[] = { 0, 4, 4, 3, 3, 2, 2, 1, 1 }; - packer += TQString( " -m%1" ).arg( arjLevels[ level ] ); + packer += TQString( " -m%1" ).tqarg( arjLevels[ level ] ); } else if( type == "-zip" ) { static const int zipLevels[] = { 0, 1, 2, 4, 5, 6, 7, 8, 9 }; - packer += TQString( " -%1" ).arg( zipLevels[ level ] ); + packer += TQString( " -%1" ).tqarg( zipLevels[ level ] ); } else if( type == "-7z" ) { static const int sevenZipLevels[] = { 0, 1, 2, 4, 5, 6, 7, 8, 9 }; - packer += TQString( " -mx%1" ).arg( sevenZipLevels[ level ] ); + packer += TQString( " -mx%1" ).tqarg( sevenZipLevels[ level ] ); } } if( extraProps.count( "CommandLineSwitches" ) > 0 ) - packer += TQString( " %1" ).arg( extraProps[ "CommandLineSwitches" ] ); + packer += TQString( " %1" ).tqarg( extraProps[ "CommandLineSwitches" ] ); // prepare to pack KrShellProcess proc; @@ -504,8 +504,8 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l krApp->stopWait(); // check the return value - if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) { - KMessageBox::detailedError (krApp, i18n( "Failed to pack %1!" ).arg( dest ), + if ( !proc.normalExit() || !checktqStatus( type, proc.exitStatus() ) ) { + KMessageBox::detailedError (krApp, i18n( "Failed to pack %1!" ).tqarg( dest ), krApp->wasWaitingCancelled() ? i18n( "User cancelled." ) : proc.getErrorMsg(), i18n("Error" ) ); return false; @@ -597,7 +597,7 @@ TQString KRarcHandler::getType( bool &encrypted, TQString fileName, TQString mim } -bool KRarcHandler::checkStatus( TQString type, int exitCode ) { +bool KRarcHandler::checktqStatus( TQString type, int exitCode ) { if( type == "-zip" || type == "-rar" || type == "-7z" ) return exitCode == 0 || exitCode == 1; else if( type == "-ace" || type == "zip2" || type == "-lha" || type == "-rpm" || type == "cpio" || diff --git a/krusader/VFS/krarchandler.h b/krusader/VFS/krarchandler.h index 6324976..70dff00 100644 --- a/krusader/VFS/krarchandler.h +++ b/krusader/VFS/krarchandler.h @@ -64,7 +64,7 @@ public: static TQString detectArchive( bool &encrypted, TQString fileName, bool checkEncrypted = true ); private: // checks if the returned status is correct - static bool checkStatus( TQString type, int exitCode ); + static bool checktqStatus( TQString type, int exitCode ); static KWallet::Wallet * wallet; }; diff --git a/krusader/VFS/krquery.cpp b/krusader/VFS/krquery.cpp index 7f11220..1735169 100644 --- a/krusader/VFS/krquery.cpp +++ b/krusader/VFS/krquery.cpp @@ -37,8 +37,8 @@ #include "krarchandler.h" #include "krpermhandler.h" -#include <textstream.h> -#include <textcodec.h> +#include <tqtextstream.h> +#include <tqtextcodec.h> #include <tqregexp.h> #include <klargefile.h> #include <klocale.h> @@ -451,7 +451,7 @@ bool KRQuery::checkTimer() const { if( timer.elapsed() >= STATUS_SEND_DELAY ) { int pcnt = (int)(100.*(double)receivedBytes/(double)totalBytes + .5); TQString message = i18n( "Searching content of '%1' (%2%)" ) - .arg( fileName ).arg( pcnt ); + .tqarg( fileName ).tqarg( pcnt ); timer.start(); emit ((KRQuery *)this)->status( message ); return true; @@ -571,16 +571,16 @@ void KRQuery::setContent( const TQString &content, bool cs, bool wholeWord, bool containOnRemote = remoteSearch; } -void KRQuery::setMinimumFileSize( KIO::filesize_t minimumSize ) +void KRQuery::setMinimumFileSize( KIO::filesize_t tqminimumSize ) { bNull = false; - minSize = minimumSize; + minSize = tqminimumSize; } -void KRQuery::setMaximumFileSize( KIO::filesize_t maximumSize ) +void KRQuery::setMaximumFileSize( KIO::filesize_t tqmaximumSize ) { bNull = false; - maxSize = maximumSize; + maxSize = tqmaximumSize; } void KRQuery::setNewerThan( time_t time ) diff --git a/krusader/VFS/normal_vfs.cpp b/krusader/VFS/normal_vfs.cpp index 370b943..9db06a7 100644 --- a/krusader/VFS/normal_vfs.cpp +++ b/krusader/VFS/normal_vfs.cpp @@ -87,7 +87,7 @@ bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){ // check that the new origin exists if ( !TQDir(path).exists() ) { - if( !quietMode ) KMessageBox::error(krApp, i18n("Directory %1 does not exist!").arg( path ), i18n("Error")); + if( !quietMode ) KMessageBox::error(krApp, i18n("Directory %1 does not exist!").tqarg( path ), i18n("Error")); return false; } @@ -97,7 +97,7 @@ bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){ DIR* dir = opendir(path.local8Bit()); if(!dir) { - if( !quietMode ) KMessageBox::error(krApp, i18n("Can't open the %1 directory!").arg( path ), i18n("Error")); + if( !quietMode ) KMessageBox::error(krApp, i18n("Can't open the %1 directory!").tqarg( path ), i18n("Error")); return false; } @@ -337,7 +337,7 @@ TQString normal_vfs::getACL( const TQString & path, int type ) return TQString(); char *aclString = acl_to_text( acl, 0 ); - TQString ret = TQString::fromLatin1( aclString ); + TQString ret = TQString::tqfromLatin1( aclString ); acl_free( (void*)aclString ); acl_free( acl ); diff --git a/krusader/VFS/preservingcopyjob.cpp b/krusader/VFS/preservingcopyjob.cpp index 03b98c8..d374004 100644 --- a/krusader/VFS/preservingcopyjob.cpp +++ b/krusader/VFS/preservingcopyjob.cpp @@ -134,7 +134,7 @@ void PreservingCopyJob::slotAboutToCreate( KIO::Job */*job*/, const TQValueList< if( acl ) { char *aclString = acl_to_text( acl, 0 ); - aclStr = TQString::fromLatin1( aclString ); + aclStr = TQString::tqfromLatin1( aclString ); acl_free( (void*)aclString ); acl_free( acl ); } diff --git a/krusader/VFS/vfs.h b/krusader/VFS/vfs.h index 60fcfe7..4c47fa2 100644 --- a/krusader/VFS/vfs.h +++ b/krusader/VFS/vfs.h @@ -124,7 +124,7 @@ public slots: bool vfs_refresh(); void vfs_setQuiet(bool beQuiet){ quietMode=beQuiet; } void vfs_enableRefresh(bool enable); - void vfs_invalidate() { invalidated = true; } + void vfs_tqinvalidate() { invalidated = true; } signals: void startUpdate(); //< emitted when the VFS starts to refresh its list of vfiles. diff --git a/krusader/calc.ui b/krusader/calc.ui index 27a32ef..4fae667 100644 --- a/krusader/calc.ui +++ b/krusader/calc.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> diff --git a/krusader/defaults.h b/krusader/defaults.h index 485ea53..c3087a8 100644 --- a/krusader/defaults.h +++ b/krusader/defaults.h @@ -211,9 +211,9 @@ /////////////////////// [Private] // Start Position ///// -#define _StartPosition new TQPoint(TQApplication::desktop()->width()/2 - mainView->sizeHint().width()/2,TQApplication::desktop()->height()/2 - 250) +#define _StartPosition new TQPoint(TQApplication::desktop()->width()/2 - mainView->tqsizeHint().width()/2,TQApplication::desktop()->height()/2 - 250) // Start Size ///////// -#define _StartSize new TQSize(mainView->sizeHint().width(),500) +#define _StartSize new TQSize(mainView->tqsizeHint().width(),500) // Panel Size ///////// #define _PanelSize 0 // Terminal Size ////// diff --git a/krusader/krservices.cpp b/krusader/krservices.cpp index 142010c..a26620e 100644 --- a/krusader/krservices.cpp +++ b/krusader/krservices.cpp @@ -139,7 +139,7 @@ TQString KrServices::registerdProtocol(TQString mimetype){ krConfig->setGroup( "Protocols" ); TQStringList protList = krConfig->readListEntry( "Handled Protocols" ); for( TQStringList::Iterator it = protList.begin(); it != protList.end(); it++ ){ - TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).arg( *it ) ); + TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).tqarg( *it ) ); for( TQStringList::Iterator it2 = mimes.begin(); it2 != mimes.end(); it2++ ) (*slaveMap)[*it2] = *it; } diff --git a/krusader/krslots.cpp b/krusader/krslots.cpp index b8cc84c..706a9dd 100644 --- a/krusader/krslots.cpp +++ b/krusader/krslots.cpp @@ -219,7 +219,7 @@ void KRslots::rightclickMenu() { { ACTIVE_PANEL->popRightClickMenu( ACTIVE_PANEL->mapToGlobal( - dynamic_cast<KListView*>(ACTIVE_PANEL->view)->itemRect( currentItem ).topLeft() + dynamic_cast<KListView*>(ACTIVE_PANEL->view)->tqitemRect( currentItem ).topLeft() ) ); } @@ -738,7 +738,7 @@ void KRslots::slotCombine(){ { if( windowsStyle ) { - KMessageBox::error(0,i18n("Not a split file %1!").arg( vfs::pathOrURL( url ) )); + KMessageBox::error(0,i18n("Not a split file %1!").tqarg( vfs::pathOrURL( url ) )); return; } unixStyle = true; @@ -801,14 +801,14 @@ void KRslots::slotCombine(){ if( error ) { - KMessageBox::error(0,i18n("Not a splitted file %1!").arg( vfs::pathOrURL( url ) )); + KMessageBox::error(0,i18n("Not a splitted file %1!").tqarg( vfs::pathOrURL( url ) )); return; } } } // ask the user for the copy dest - KURL dest = KChooseDir::getDir(i18n("Combining %1.* to directory:" ).arg( vfs::pathOrURL( baseURL ) ), + KURL dest = KChooseDir::getDir(i18n("Combining %1.* to directory:" ).tqarg( vfs::pathOrURL( baseURL ) ), ACTIVE_PANEL->otherPanel->virtualPath(), ACTIVE_PANEL->virtualPath()); if ( dest.isEmpty() ) return ; // the user canceled diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp index 608f3ba..b98edd4 100644 --- a/krusader/krusader.cpp +++ b/krusader/krusader.cpp @@ -360,7 +360,7 @@ Krusader::Krusader() : KParts::MainWindow(0,0,WType_TopLevel|WDestructiveClose|T setupAccels(); // create a status bar - status = new KrusaderStatus( this ); + status = new KrusadertqStatus( this ); TQWhatsThis::add( status, i18n( "Statusbar will show basic information " "about file below mouse pointer." ) ); @@ -466,7 +466,7 @@ bool Krusader::versionControl() { void Krusader::statusBarUpdate( TQString& mess ) { // change the message on the statusbar for 2 seconds if (status) // ugly!!!! But as statusBar() creates a status bar if there is no, I have to ask status to prevent - // the creation of the KDE default status bar instead of KrusaderStatus. + // the creation of the KDE default status bar instead of KrusadertqStatus. statusBar() ->message( mess, 5000 ); } @@ -963,7 +963,7 @@ bool Krusader::queryClose() { main window close. */ for(;;) { - TQWidgetList * list = TQApplication::topLevelWidgets(); + TQWidgetList * list = TQApplication::tqtopLevelWidgets(); TQWidget *activeModal = TQT_TQWIDGET(TQApplication::activeModalWidget()); TQWidget *w = list->first(); diff --git a/krusader/krusader.h b/krusader/krusader.h index 2591a10..c0fa70d 100644 --- a/krusader/krusader.h +++ b/krusader/krusader.h @@ -45,7 +45,7 @@ #include <kconfig.h> #include <kaccel.h> #include <tqstringlist.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kdebug.h> #include <dcopobject.h> @@ -53,7 +53,7 @@ class KrJS; #endif -class KrusaderStatus; +class KrusadertqStatus; class KRPleaseWaitHandler; class KrusaderView; class KProcess; @@ -159,7 +159,7 @@ class Krusader : public KParts::MainWindow, public DCOPObject { void stopWait(); bool wasWaitingCancelled() const; - KrusaderStatus *status; + KrusadertqStatus *status; KRslots *slot; KAccel *accels; // global accelerators diff --git a/krusader/krusaderview.cpp b/krusader/krusaderview.cpp index a1bbda3..c8fb622 100644 --- a/krusader/krusaderview.cpp +++ b/krusader/krusaderview.cpp @@ -48,7 +48,7 @@ #include "GUI/profilemanager.h" #include "Dialogs/percentalsplitter.h" #include "krservices.h" -#include <clipboard.h> +#include <tqclipboard.h> KrusaderView::KrusaderView( TQWidget *parent ) : TQWidget( parent, "KrusaderView" ), activePanel(0), konsole_part( 0L ) {} @@ -88,7 +88,7 @@ void KrusaderView::start( TQStringList leftTabs, TQStringList leftTypes, TQValue ( fnKeys, i18n( "Function keys allow performing fast " "operations on files." ) ); - // and insert the whole thing into the main layout... at last + // and insert the whole thing into the main tqlayout... at last mainLayout->addWidget( vert_splitter, 0, 0 ); //<> mainLayout->addWidget( cmdLine, 1, 0 ); mainLayout->addWidget( fnKeys, 2, 0 ); @@ -159,7 +159,7 @@ void KrusaderView::createTE() { if ( konsole_part == 0L ) { // konsole part is not yet loaded KLibFactory * factory = KLibLoader::self() ->factory( "libkonsolepart" ); if ( factory ) { - TQWidget *focusW = tqApp->focusWidget(); + TQWidget *focusW = tqApp->tqfocusWidget(); // Create the part konsole_part = ( KParts::ReadOnlyPart * ) factory->create( TQT_TQOBJECT(terminal_dock), "konsolepart", @@ -339,7 +339,7 @@ bool KrusaderView::eventFilter ( TQObject * watched, TQEvent * e ) { ACTIVE_PANEL->slotFocusOnMe(); return true; } else if( Krusader::actPaste->shortcut().contains( pressedKey ) ) { - TQString text = TQApplication::clipboard()->text(); + TQString text = TQApplication::tqclipboard()->text(); if ( ! text.isEmpty() ) { text.replace("\n", "\r"); diff --git a/krusader/krusaderview.h b/krusader/krusaderview.h index 3d85595..fa22032 100644 --- a/krusader/krusaderview.h +++ b/krusader/krusaderview.h @@ -40,7 +40,7 @@ #include <kparts/part.h> // QT includes -#include <layout.h> +#include <tqlayout.h> #include <tqsplitter.h> #include <tqwidget.h> #include <tqpushbutton.h> diff --git a/krusader/main.cpp b/krusader/main.cpp index 973234d..c902bb0 100644 --- a/krusader/main.cpp +++ b/krusader/main.cpp @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) { // ABOUT data information #ifdef RELEASE_NAME - TQString versionName = TQString("%1 \"%2\"").arg(VERSION).arg(RELEASE_NAME); + TQString versionName = TQString("%1 \"%2\"").tqarg(VERSION).tqarg(RELEASE_NAME); #else TQString versionName = VERSION; #endif diff --git a/krusader/mount.ui b/krusader/mount.ui index fe7ddaf..005df4a 100644 --- a/krusader/mount.ui +++ b/krusader/mount.ui @@ -54,7 +54,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/krusader/panelmanager.cpp b/krusader/panelmanager.cpp index a58d07a..10fa058 100644 --- a/krusader/panelmanager.cpp +++ b/krusader/panelmanager.cpp @@ -315,15 +315,15 @@ void PanelManager::slotPreviousTab() { slotChangePanel(nextp); } -void PanelManager::refreshAllTabs( bool invalidate ) { +void PanelManager::refreshAllTabs( bool tqinvalidate ) { int i=0; while (i < _tabbar->count()) { PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt(i)); if (t && t->panel && t->panel->func ) { vfs * vfs = t->panel->func->files(); if( vfs ) { - if( invalidate ) - vfs->vfs_invalidate(); + if( tqinvalidate ) + vfs->vfs_tqinvalidate(); vfs->vfs_refresh(); } } diff --git a/krusader/panelmanager.h b/krusader/panelmanager.h index 218371d..87324bb 100644 --- a/krusader/panelmanager.h +++ b/krusader/panelmanager.h @@ -2,7 +2,7 @@ #define _PANEL_MANAGER_H #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include "paneltabbar.h" class KConfig; @@ -44,7 +44,7 @@ class PanelManager: public TQWidget { int activeTab(); void setActiveTab( int ); void setCurrentTab( int ); - void refreshAllTabs( bool invalidate = false ); + void refreshAllTabs( bool tqinvalidate = false ); public slots: /** diff --git a/krusader/recode.ui b/krusader/recode.ui index 263c7e5..f0c3e1a 100644 --- a/krusader/recode.ui +++ b/krusader/recode.ui @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -79,7 +79,7 @@ void ArchiveProtocol::put( const KURL& url, int, bool, bool resume ){ if( !m_archiveFile->prepareWriting(filename,user,group,size) ){ error(ERR_UNSUPPORTED_ACTION, - i18n("Writing to %1 is not supported").arg(filename) ); + i18n("Writing to %1 is not supported").tqarg(filename) ); return; } while( (temp=buffer.dequeue()) ){ @@ -148,7 +148,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path ) { if ( path[ len - 1 ] == '/' ) path.truncate( len - 1 ); } else - path = TQString::fromLatin1( "/" ); + path = TQString::tqfromLatin1( "/" ); kdDebug( 7109 ) << "Found. archiveFile=" << archiveFile << " path=" << path << endl; break; } @@ -246,9 +246,9 @@ void ArchiveProtocol::listDir( const KURL & url ) { } if ( path.isEmpty() ) { - KURL redir( url.protocol() + TQString::fromLatin1( ":/" ) ); + KURL redir( url.protocol() + TQString::tqfromLatin1( ":/" ) ); kdDebug( 7109 ) << "url.path()==" << url.path() << endl; - redir.setPath( url.path() + TQString::fromLatin1( "/" ) ); + redir.setPath( url.path() + TQString::tqfromLatin1( "/" ) ); kdDebug( 7109 ) << "ArchiveProtocol::listDir: redirection " << redir.url() << endl; redirection( redir ); finished(); @@ -259,7 +259,7 @@ void ArchiveProtocol::listDir( const KURL & url ) { const KArchiveDirectory* root = m_archiveFile->directory(); const KArchiveDirectory* dir; if ( !path.isEmpty() && path != "/" ) { - kdDebug( 7109 ) << TQString( "Looking for entry %1" ).arg( path ) << endl; + kdDebug( 7109 ) << TQString( "Looking for entry %1" ).tqarg( path ) << endl; const KArchiveEntry* e = root->entry( path ); if ( !e ) { error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); @@ -333,7 +333,7 @@ void ArchiveProtocol::stat( const KURL & url ) { const KArchiveDirectory* root = m_archiveFile->directory(); const KArchiveEntry* archiveEntry; if ( path.isEmpty() ) { - path = TQString::fromLatin1( "/" ); + path = TQString::tqfromLatin1( "/" ); archiveEntry = root; } else { archiveEntry = root->entry( path ); |