diff --git a/iso/iso.cpp b/iso/iso.cpp
index 24023ca..f7608c6 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::tqfromLatin1("/");
+ path = TQString::fromLatin1("/");
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::tqfromLatin1( "iso:/") );
+ KURL redir( TQString::fromLatin1( "iso:/") );
kdDebug() << "url.path()==" << url.path() << endl;
if (url.hasRef()) redir.setRef(url.htmlRef());
- redir.setPath( url.path() + TQString::tqfromLatin1("/") );
+ redir.setPath( url.path() + TQString::fromLatin1("/") );
kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl;
redirection( redir );
finished();
@@ -356,7 +356,7 @@ void kio_isoProtocol::stat( const KURL & url )
const KArchiveEntry* isoEntry;
if ( path.isEmpty() )
{
- path = TQString::tqfromLatin1( "/" );
+ path = TQString::fromLatin1( "/" );
isoEntry = root;
} else {
isoEntry = root->entry( path );
diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp
index 435821e..4bd17a3 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::tqcurrentDateTime().toString(Qt::ISODate);
+ TQString dirName = "krArc"+TQDateTime::currentDateTime().toString(Qt::ISODate);
dirName.replace(TQRegExp(":"),"_");
TQDir(arcTempDir).mkdir(dirName);
arcTempDir = arcTempDir+dirName+"/";
@@ -161,7 +161,7 @@ void kio_krarcProtocol::mkdir(const KURL& url,int permissions){
// delete the temp directory
TQDir().rmdir(arcTempDir);
- if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) ) {
+ if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) {
error(ERR_COULD_NOT_WRITE,url.path() + "\n\n" + proc.getErrorMsg() );
return;
}
@@ -231,7 +231,7 @@ void kio_krarcProtocol::put(const KURL& url,int permissions,bool overwrite,bool
// remove the file
TQFile::remove(tmpFile);
- if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) ) {
+ if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) {
error(ERR_COULD_NOT_WRITE,url.path() + "\n\n" + proc.getErrorMsg() );
return;
}
@@ -323,7 +323,7 @@ void kio_krarcProtocol::get(const KURL& url, int tries ){
proc.start(KProcess::Block,KProcess::AllOutput);
if( !extArcReady && !decompressToFile ) {
- if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) || ( arcType != "bzip2" && expectedSize != decompressedLen ) ) {
+ if( !proc.normalExit() || !checkStatus( 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() || !checktqStatus( proc.exitStatus() ) || !TQFileInfo( arcTempDir+file ).exists() ) {
+ if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) || !TQFileInfo( arcTempDir+file ).exists() ) {
if( decompressToFile )
TQFile(arcTempDir+file).remove();
if( encrypted && tries ) {
@@ -457,7 +457,7 @@ void kio_krarcProtocol::del(KURL const & url, bool isFile){
proc << delCmd << convertName( arcFile->url().path() )+" " << convertFileName( file );
infoMessage(i18n("Deleting %1 ...").tqarg( url.fileName() ) );
proc.start(KProcess::Block, KProcess::AllOutput);
- if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) ) {
+ if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) {
error(ERR_COULD_NOT_WRITE,url.path() + "\n\n" + proc.getErrorMsg() );
return;
}
@@ -553,7 +553,7 @@ void kio_krarcProtocol::copy (const KURL &url, const KURL &dest, int, bool overw
infoMessage(i18n("Unpacking %1 ...").tqarg( url.fileName() ) );
proc.start(KProcess::Block, KProcess::AllOutput);
- if( !proc.normalExit() || !checktqStatus( proc.exitStatus() ) ) {
+ if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) {
error(KIO::ERR_COULD_NOT_WRITE, dest.path(-1) + "\n\n" + proc.getErrorMsg() );
return;
}
@@ -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() || !checktqStatus( proc.exitStatus() ) ) return false;
+ if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) return false;
}
// clear the dir dictionary
dirDict.clear();
@@ -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::tqcurrentDate().year();
+ int year = TQDate::currentDate().year();
TQString third = nextWord(line);
TQTime qtime;
@@ -1376,7 +1376,7 @@ bool kio_krarcProtocol::initArcParameters() {
return true;
}
-bool kio_krarcProtocol::checktqStatus( int exitCode ) {
+bool kio_krarcProtocol::checkStatus( int exitCode ) {
KRDEBUG( exitCode );
if( arcType == "zip" || arcType == "rar" || arcType == "7z" )
diff --git a/krArc/krarc.h b/krArc/krarc.h
index 9ea56fd..98e4524 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 checktqStatus( int exitCode );
+ bool checkStatus( 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 9a53e76..e4238e1 100644
--- a/krusader/ActionMan/actionpropertybase.cpp
+++ b/krusader/ActionMan/actionpropertybase.cpp
@@ -57,17 +57,17 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla
tabLayout->addWidget( ButtonAddStartpath, 8, 3 );
LabelDescription = new TQLabel( tab, "LabelDescription" );
- LabelDescription->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, LabelDescription->sizePolicy().hasHeightForWidth() ) );
+ LabelDescription->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, LabelDescription->sizePolicy().hasHeightForWidth() ) );
tabLayout->addWidget( LabelDescription, 4, 0 );
bgAccept = new TQButtonGroup( tab, "bgAccept" );
- bgAccept->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgAccept->sizePolicy().hasHeightForWidth() ) );
+ bgAccept->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgAccept->sizePolicy().hasHeightForWidth() ) );
bgAccept->setColumnLayout(0, Qt::Vertical );
bgAccept->tqlayout()->setSpacing( 6 );
bgAccept->tqlayout()->setMargin( 11 );
bgAcceptLayout = new TQGridLayout( bgAccept->tqlayout() );
- bgAcceptLayout->tqsetAlignment( TQt::AlignTop );
+ bgAcceptLayout->setAlignment( TQt::AlignTop );
radioLocal = new TQRadioButton( bgAccept, "radioLocal" );
radioLocal->setChecked( TRUE );
@@ -85,7 +85,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla
tabLayout->addMultiCellWidget( leTitle, 2, 2, 1, 3 );
LabelTitle = new TQLabel( tab, "LabelTitle" );
- LabelTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelTitle->sizePolicy().hasHeightForWidth() ) );
+ LabelTitle->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelTitle->sizePolicy().hasHeightForWidth() ) );
tabLayout->addWidget( LabelTitle, 2, 0 );
@@ -102,7 +102,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla
tqlayout3->addLayout( tqlayout2 );
ButtonIcon = new KIconButton( tab, "ButtonIcon" );
- ButtonIcon->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, ButtonIcon->sizePolicy().hasHeightForWidth() ) );
+ ButtonIcon->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, ButtonIcon->sizePolicy().hasHeightForWidth() ) );
ButtonIcon->setMinimumSize( TQSize( 50, 50 ) );
ButtonIcon->setMaximumSize( TQSize( 50, 50 ) );
tqlayout3->addWidget( ButtonIcon );
@@ -110,12 +110,12 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla
tabLayout->addMultiCellLayout( tqlayout3, 0, 1, 1, 3 );
LabelDistinctName = new TQLabel( tab, "LabelDistinctName" );
- LabelDistinctName->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelDistinctName->sizePolicy().hasHeightForWidth() ) );
+ LabelDistinctName->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelDistinctName->sizePolicy().hasHeightForWidth() ) );
tabLayout->addWidget( LabelDistinctName, 0, 0 );
LabelCommandline = new TQLabel( tab, "LabelCommandline" );
- LabelCommandline->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, LabelCommandline->sizePolicy().hasHeightForWidth() ) );
+ LabelCommandline->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelTooltip->sizePolicy().hasHeightForWidth() ) );
+ LabelTooltip->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelCategory->sizePolicy().hasHeightForWidth() ) );
+ LabelCategory->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelCategory->sizePolicy().hasHeightForWidth() ) );
tabLayout->addWidget( LabelCategory, 1, 0 );
ButtonAddPlaceholder = new TQToolButton( tab, "ButtonAddPlaceholder" );
- ButtonAddPlaceholder->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, ButtonAddPlaceholder->sizePolicy().hasHeightForWidth() ) );
+ ButtonAddPlaceholder->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, ButtonAddPlaceholder->sizePolicy().hasHeightForWidth() ) );
ButtonAddPlaceholder->setMinimumSize( TQSize( 0, 0 ) );
tabLayout->addWidget( ButtonAddPlaceholder, 7, 3 );
@@ -153,7 +153,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla
tabLayout->addMultiCellWidget( textDescription, 4, 6, 1, 3 );
LabelStartpath = new TQLabel( tab, "LabelStartpath" );
- LabelStartpath->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, LabelStartpath->sizePolicy().hasHeightForWidth() ) );
+ LabelStartpath->setSizePolicy( 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 );
@@ -172,12 +172,12 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla
tabLayout->addMultiCellLayout( tqlayout4, 10, 10, 2, 3 );
bgExecType = new TQButtonGroup( tab, "bgExecType" );
- bgExecType->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgExecType->sizePolicy().hasHeightForWidth() ) );
+ bgExecType->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgExecType->sizePolicy().hasHeightForWidth() ) );
bgExecType->setColumnLayout(0, Qt::Vertical );
bgExecType->tqlayout()->setSpacing( 6 );
bgExecType->tqlayout()->setMargin( 11 );
bgExecTypeLayout = new TQGridLayout( bgExecType->tqlayout() );
- bgExecTypeLayout->tqsetAlignment( TQt::AlignTop );
+ bgExecTypeLayout->setAlignment( 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::tqfromLatin1("") );
+ tabWidget3->insertTab( tab, TQString::fromLatin1("") );
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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, gbShowonly->sizePolicy().hasHeightForWidth() ) );
+ gbShowonly->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, gbShowonly->sizePolicy().hasHeightForWidth() ) );
gbShowonly->setColumnLayout(0, Qt::Vertical );
gbShowonly->tqlayout()->setSpacing( 6 );
gbShowonly->tqlayout()->setMargin( 11 );
gbShowonlyLayout = new TQGridLayout( gbShowonly->tqlayout() );
- gbShowonlyLayout->tqsetAlignment( TQt::AlignTop );
+ gbShowonlyLayout->setAlignment( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonNewProtocol->sizePolicy().hasHeightForWidth() ) );
+ ButtonNewProtocol->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditProtocol->sizePolicy().hasHeightForWidth() ) );
+ ButtonEditProtocol->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemoveProtocol->sizePolicy().hasHeightForWidth() ) );
+ ButtonRemoveProtocol->setSizePolicy( 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::tqfromLatin1("") );
+ tabShowonly->insertTab( TabPage, TQString::fromLatin1("") );
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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonAddPath->sizePolicy().hasHeightForWidth() ) );
+ ButtonAddPath->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditPath->sizePolicy().hasHeightForWidth() ) );
+ ButtonEditPath->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemovePath->sizePolicy().hasHeightForWidth() ) );
+ ButtonRemovePath->setSizePolicy( 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::tqfromLatin1("") );
+ tabShowonly->insertTab( tab_3, TQString::fromLatin1("") );
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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonAddMime->sizePolicy().hasHeightForWidth() ) );
+ ButtonAddMime->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditMime->sizePolicy().hasHeightForWidth() ) );
+ ButtonEditMime->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemoveMime->sizePolicy().hasHeightForWidth() ) );
+ ButtonRemoveMime->setSizePolicy( 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::tqfromLatin1("") );
+ tabShowonly->insertTab( tab_4, TQString::fromLatin1("") );
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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonNewFile->sizePolicy().hasHeightForWidth() ) );
+ ButtonNewFile->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonEditFile->sizePolicy().hasHeightForWidth() ) );
+ ButtonEditFile->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ButtonRemoveFile->sizePolicy().hasHeightForWidth() ) );
+ ButtonRemoveFile->setSizePolicy( 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::tqfromLatin1("") );
+ tabShowonly->insertTab( TabPage_2, TQString::fromLatin1("") );
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::tqfromLatin1("") );
+ tabWidget3->insertTab( tab_2, TQString::fromLatin1("") );
ActionPropertyBaseLayout->addWidget( tabWidget3, 0, 0 );
languageChange();
- resize( TQSize(485, 470).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(485, 470).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/krusader/ActionMan/actionpropertybase.ui b/krusader/ActionMan/actionpropertybase.ui
index 0c6f47a..7415e58 100644
--- a/krusader/ActionMan/actionpropertybase.ui
+++ b/krusader/ActionMan/actionpropertybase.ui
@@ -189,13 +189,13 @@
0
-
+
50
50
-
+
50
50
@@ -328,7 +328,7 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
@@ -381,7 +381,7 @@ Please consult the handbook to learn more about the syntax.
Expanding
-
+
80
19
@@ -414,7 +414,7 @@ Please consult the handbook to learn more about the syntax.
Expanding
-
+
161
21
@@ -567,13 +567,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -595,13 +595,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -621,7 +621,7 @@ Please consult the handbook to learn more about the syntax.
Expanding
-
+
21
58
@@ -640,13 +640,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -697,13 +697,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -725,13 +725,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -753,13 +753,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -779,7 +779,7 @@ Please consult the handbook to learn more about the syntax.
Expanding
-
+
21
61
@@ -819,13 +819,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -847,13 +847,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -875,13 +875,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -901,7 +901,7 @@ Please consult the handbook to learn more about the syntax.
Expanding
-
+
21
41
@@ -941,13 +941,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -969,13 +969,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -997,13 +997,13 @@ Please consult the handbook to learn more about the syntax.
0
-
+
0
0
-
+
32767
32767
@@ -1023,7 +1023,7 @@ Please consult the handbook to learn more about the syntax.
Expanding
-
+
21
41
@@ -1078,7 +1078,7 @@ Please consult the handbook to learn more about the syntax.
Expanding
-
+
161
102
diff --git a/krusader/ActionMan/useractionlistview.cpp b/krusader/ActionMan/useractionlistview.cpp
index aa910e8..f129ea0 100644
--- a/krusader/ActionMan/useractionlistview.cpp
+++ b/krusader/ActionMan/useractionlistview.cpp
@@ -46,7 +46,7 @@ UserActionListView::~UserActionListView()
{
}
-TQSize UserActionListView::tqsizeHint() const {
+TQSize UserActionListView::sizeHint() const {
return TQSize(200, 400);
}
diff --git a/krusader/ActionMan/useractionlistview.h b/krusader/ActionMan/useractionlistview.h
index e05e42e..2fc0f94 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 tqsizeHint() const;
+ virtual TQSize sizeHint() const;
void update();
void update( KrAction* action );
diff --git a/krusader/Dialogs/krdialogs.cpp b/krusader/Dialogs/krdialogs.cpp
index ad003ec..2687c54 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_->tqsizeHint().width() * 3 );
+ urlRequester_->setMinimumWidth( urlRequester_->sizeHint().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->tqsizeHint().width() * 3 );
+ baseUrlCombo->setMinimumWidth( baseUrlCombo->sizeHint().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->tqsizeHint());
- setMinimumSize(dateWidget->tqsizeHint());
- setMaximumSize(dateWidget->tqsizeHint());
- resize(tqminimumSize());
+ dateWidget->resize(dateWidget->sizeHint());
+ setMinimumSize(dateWidget->sizeHint());
+ setMaximumSize(dateWidget->sizeHint());
+ resize(minimumSize());
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 f250744..d196ad8 100644
--- a/krusader/Dialogs/krdialogs.h
+++ b/krusader/Dialogs/krdialogs.h
@@ -103,7 +103,7 @@ class KRGetDate : public KDialog {
Q_OBJECT
TQ_OBJECT
public:
- KRGetDate(TQDate date=TQDate::tqcurrentDate(), TQWidget *parent = 0, const char *name = 0);
+ KRGetDate(TQDate date=TQDate::currentDate(), TQWidget *parent = 0, const char *name = 0);
TQDate getDate();
private slots:
diff --git a/krusader/Dialogs/krmaskchoice.cpp b/krusader/Dialogs/krmaskchoice.cpp
index 261366e..2d12da5 100644
--- a/krusader/Dialogs/krmaskchoice.cpp
+++ b/krusader/Dialogs/krmaskchoice.cpp
@@ -56,7 +56,7 @@ KRMaskChoice::KRMaskChoice( TQWidget* parent, const char* name, bool modal, WFl
setName( "KRMaskChoice" );
resize( 401, 314 );
setCaption( i18n( "Choose Files" ) );
- tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5 ) );
+ setSizePolicy( 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 3f00175..8eb4a6a 100644
--- a/krusader/Dialogs/krprogress.cpp
+++ b/krusader/Dialogs/krprogress.cpp
@@ -81,9 +81,9 @@ KrProgress::KrProgress( KIO::Job* job )
hBox->addWidget(resumeLabel);
progressLabel = new TQLabel( this );
-/* progressLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+/* progressLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Preferred ) );*/
- progressLabel->tqsetAlignment( TQLabel::AlignRight );
+ progressLabel->setAlignment( 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( tqsizeHint() );
- setMaximumHeight(tqsizeHint().height());
+ resize( sizeHint() );
+ setMaximumHeight(sizeHint().height());
setCaption(i18n("Krusader Progress")); // show something better than kio_uiserver
@@ -180,7 +180,7 @@ void KrProgress::slotPercent( KIO::Job*, unsigned long percent ){
void KrProgress::slotInfoMessage( KIO::Job*, const TQString & msg )
{
speedLabel->setText( msg );
- speedLabel->tqsetAlignment( speedLabel->tqalignment() & ~TQt::WordBreak );
+ speedLabel->setAlignment( speedLabel->tqalignment() & ~TQt::WordBreak );
}
diff --git a/krusader/Dialogs/newftpgui.cpp b/krusader/Dialogs/newftpgui.cpp
index d121e03..95f8a25 100644
--- a/krusader/Dialogs/newftpgui.cpp
+++ b/krusader/Dialogs/newftpgui.cpp
@@ -48,7 +48,7 @@ newFTPGUI::newFTPGUI( TQWidget* parent, const char* name, bool modal, WFlags fl
resize( 342, 261 );
setCaption( i18n( "New Network Connection" ) );
// setSizeGripEnabled( TRUE );
- tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, sizePolicy().hasHeightForWidth() ) );
+ setSizePolicy( 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->tqsetSizePolicy( SIZE_MINIMUM );
+ PixmapLabel1->setSizePolicy( 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->tqsetSizePolicy( SIZE_MINIMUM );
+ prefix->setSizePolicy( 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->tqsetSizePolicy( SIZE_MINIMUM );
+ port->setSizePolicy( SIZE_MINIMUM );
TextLabel1_2 = new TQLabel( i18n( "Username:" ), this, "TextLabel1_2" );
diff --git a/krusader/Dialogs/packguibase.cpp b/krusader/Dialogs/packguibase.cpp
index 34e888b..e669fb8 100644
--- a/krusader/Dialogs/packguibase.cpp
+++ b/krusader/Dialogs/packguibase.cpp
@@ -82,7 +82,7 @@ PackGUIBase::PackGUIBase( TQWidget* parent, const char* name, bool modal, WFlag
hbox->addWidget( nameData );
typeData = new TQComboBox( FALSE, this, "typeData" );
- typeData->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0 ) );
+ typeData->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0 ) );
+ PixmapLabel1->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+ maxLabel->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+ TextLabel8->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
hbox_7->addWidget( TextLabel8 );
commandLineSwitches = new KHistoryCombo( advancedWidget, "commandLineSwitches" );
@@ -321,7 +321,7 @@ void PackGUIBase::expand() {
else {
advancedWidget->hide();
tqlayout()->activate();
- TQSize minSize = tqminimumSize();
+ TQSize minSize = minimumSize();
resize( width(), minSize.height() );
}
show();
diff --git a/krusader/Dialogs/percentalsplitter.cpp b/krusader/Dialogs/percentalsplitter.cpp
index 27c2267..3621a3b 100644
--- a/krusader/Dialogs/percentalsplitter.cpp
+++ b/krusader/Dialogs/percentalsplitter.cpp
@@ -136,7 +136,7 @@ void PercentalSplitter::setRubberband ( int p ) {
label->setAutoMask( FALSE );
label->setFrameStyle( TQFrame::Plain | TQFrame::Box );
label->setLineWidth( 1 );
- label->tqsetAlignment( AlignAuto | AlignTop );
+ label->setAlignment( AlignAuto | AlignTop );
label->setIndent(0);
TQFontMetrics fm = label->fontMetrics();
diff --git a/krusader/Dialogs/popularurls.cpp b/krusader/Dialogs/popularurls.cpp
index a6ae087..d19147d 100644
--- a/krusader/Dialogs/popularurls.cpp
+++ b/krusader/Dialogs/popularurls.cpp
@@ -296,7 +296,7 @@ void PopularUrlsDlg::run(KURL::List list) {
}
//urls->setCurrentItem(urls->firstChild());
//urls->setSelected(urls->firstChild(), true);
- setMinimumSize(urls->tqsizeHint().width()+45, 400);
+ setMinimumSize(urls->sizeHint().width()+45, 400);
search->clear();
search->setFocus();
diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp
index b9088da..c473fc3 100644
--- a/krusader/DiskUsage/diskusage.cpp
+++ b/krusader/DiskUsage/diskusage.cpp
@@ -91,7 +91,7 @@ LoaderWidget::LoaderWidget( TQWidget *parent, const char *name ) : TQScrollView(
loaderBox->setColumnLayout(0, Qt::Vertical );
loaderBox->tqlayout()->setSpacing( 0 );
loaderBox->tqlayout()->setMargin( 0 );
- loaderBox->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+ loaderBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
loaderBox->setFrameStyle( TQFrame::Panel + TQFrame::Raised );
loaderBox->setLineWidth( 2 );
@@ -100,7 +100,7 @@ LoaderWidget::LoaderWidget( TQWidget *parent, const char *name ) : TQScrollView(
synchGrid->setMargin( 11 );
TQLabel *titleLabel = new TQLabel( i18n( "Loading Usage Information" ), loaderBox, "titleLabel" );
- titleLabel->tqsetAlignment( TQt::AlignHCenter );
+ titleLabel->setAlignment( 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->tqsetAlignment( TQt::AlignRight );
+ files->setAlignment( TQt::AlignRight );
synchGrid->addWidget( files, 1, 1 );
directories = new TQLabel( loaderBox, "directories" );
directories->setFrameShape( TQLabel::StyledPanel );
directories->setFrameShadow( TQLabel::Sunken );
- directories->tqsetAlignment( TQt::AlignRight );
+ directories->setAlignment( TQt::AlignRight );
synchGrid->addWidget( directories, 2, 1 );
totalSize = new TQLabel( loaderBox, "totalSize" );
totalSize->setFrameShape( TQLabel::StyledPanel );
totalSize->setFrameShadow( TQLabel::Sunken );
- totalSize->tqsetAlignment( TQt::AlignRight );
+ totalSize->setAlignment( TQt::AlignRight );
synchGrid->addWidget( totalSize, 3, 1 );
int width;
@@ -530,7 +530,7 @@ int DiskUsage::exclude( File *file, bool calcPercents, int depth )
{
calculateSizes( root, true );
calculatePercents( true );
- createtqStatus();
+ createStatus();
}
if( depth == 0 && changeNr != 0 )
@@ -572,7 +572,7 @@ void DiskUsage::includeAll()
include( root );
calculateSizes( root, true );
calculatePercents( true );
- createtqStatus();
+ createStatus();
}
int DiskUsage::del( File *file, bool calcPercents, int depth )
@@ -668,13 +668,13 @@ int DiskUsage::del( File *file, bool calcPercents, int depth )
delete file;
if( depth == 0 )
- createtqStatus();
+ createStatus();
if( calcPercents )
{
calculateSizes( root, true );
calculatePercents( true );
- createtqStatus();
+ createStatus();
emit enteringDirectory( currentDirectory );
}
@@ -713,7 +713,7 @@ void DiskUsage::removeProperty( File *item, TQString key )
propertyMap.remove( item );
}
-void DiskUsage::createtqStatus()
+void DiskUsage::createStatus()
{
Directory *dirEntry = currentDirectory;
@@ -737,7 +737,7 @@ void DiskUsage::changeDirectory( Directory *dir )
currentSize = dir->size();
calculatePercents( true, dir );
- createtqStatus();
+ createStatus();
emit enteringDirectory( dir );
}
diff --git a/krusader/DiskUsage/diskusage.h b/krusader/DiskUsage/diskusage.h
index b256d9c..6a1162b 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 createtqStatus();
+ void createStatus();
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 e2c7e3e..ed01a0b 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->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+ duTools->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
btnNewSearch = new TQToolButton( duTools, "btnNewSearch" );
btnNewSearch->setIconSet( TQIconSet(krLoader->loadIcon("fileopen",KIcon::Desktop)) );
@@ -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( settqStatus( TQString ) ) );
+ connect( diskUsage, TQT_SIGNAL( status( TQString ) ), this, TQT_SLOT( setStatus( 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::settqStatus( TQString stat )
+void DiskUsageGUI::setStatus( TQString stat )
{
status->setText( stat );
}
diff --git a/krusader/DiskUsage/diskusagegui.h b/krusader/DiskUsage/diskusagegui.h
index 319cc88..d8e5081 100644
--- a/krusader/DiskUsage/diskusagegui.h
+++ b/krusader/DiskUsage/diskusagegui.h
@@ -52,7 +52,7 @@ public:
public slots:
void loadUsageInfo();
bool newSearch();
- void settqStatus( TQString );
+ void setStatus( TQString );
void selectLinesView() { diskUsage->setView( VIEW_LINES ); }
void selectListView() { diskUsage->setView( VIEW_DETAILED ); }
diff --git a/krusader/DiskUsage/dulines.cpp b/krusader/DiskUsage/dulines.cpp
index f7a87da..bff8a50 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->tqitemRect( item );
+ TQRect r = view->itemRect( 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 b31aed0..75c6813 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 tqminimumSize criteria as in the visual function
+ //**** because I don't use the same minimumSize criteria as in the visual function
// this can lead to incorrect visual representation
//**** BUT, you can't set those limits until you know m_depth!
diff --git a/krusader/Filter/advancedfilter.cpp b/krusader/Filter/advancedfilter.cpp
index 116269f..18d858c 100644
--- a/krusader/Filter/advancedfilter.cpp
+++ b/krusader/Filter/advancedfilter.cpp
@@ -55,13 +55,13 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char *
// Options for size
TQGroupBox *sizeGroup = new TQGroupBox( this, "sizeGroup" );
- sizeGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, sizeGroup->sizePolicy().hasHeightForWidth() ) );
+ sizeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, sizeGroup->sizePolicy().hasHeightForWidth() ) );
sizeGroup->setTitle( i18n( "Size" ) );
sizeGroup->setColumnLayout(0, Qt::Vertical );
sizeGroup->tqlayout()->setSpacing( 0 );
sizeGroup->tqlayout()->setMargin( 0 );
TQGridLayout *sizeLayout = new TQGridLayout( sizeGroup->tqlayout() );
- sizeLayout->tqsetAlignment( TQt::AlignTop );
+ sizeLayout->setAlignment( 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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, biggerThanAmount->sizePolicy().hasHeightForWidth() ) );
+ biggerThanAmount->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, smallerThanAmount->sizePolicy().hasHeightForWidth() ) );
+ smallerThanAmount->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, smallerThanAmount->sizePolicy().hasHeightForWidth() ) );
sizeLayout->addWidget( smallerThanAmount, 0, 4 );
smallerThanType = new KComboBox( false, sizeGroup, "smallerThanType" );
@@ -116,7 +116,7 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char *
dateGroup->tqlayout()->setSpacing( 0 );
dateGroup->tqlayout()->setMargin( 0 );
TQGridLayout *dateLayout = new TQGridLayout( dateGroup->tqlayout() );
- dateLayout->tqsetAlignment( TQt::AlignTop );
+ dateLayout->setAlignment( TQt::AlignTop );
dateLayout->setSpacing( 6 );
dateLayout->setMargin( 11 );
@@ -215,7 +215,7 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char *
ownershipGroup->tqlayout()->setSpacing( 0 );
ownershipGroup->tqlayout()->setMargin( 0 );
TQGridLayout *ownershipLayout = new TQGridLayout( ownershipGroup->tqlayout() );
- ownershipLayout->tqsetAlignment( TQt::AlignTop );
+ ownershipLayout->setAlignment( 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::tqcurrentDate();
+ if (!d.isValid()) d = TQDate::currentDate();
KRGetDate *gd = new KRGetDate(d, this);
d = gd->getDate();
@@ -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::tqcurrentDate(); TQDate d2 = TQDate::tqcurrentDate();
+ TQDate d1 = TQDate::currentDate(); TQDate d2 = TQDate::currentDate();
if (!modifiedInTheLastData->text().simplifyWhiteSpace().isEmpty()) {
int tmp1 = modifiedInTheLastData->text().simplifyWhiteSpace().toInt();
switch (modifiedInTheLastType->currentItem()) {
diff --git a/krusader/Filter/generalfilter.cpp b/krusader/Filter/generalfilter.cpp
index c3303b1..f745a92 100644
--- a/krusader/Filter/generalfilter.cpp
+++ b/krusader/Filter/generalfilter.cpp
@@ -57,7 +57,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent
nameGroup->tqlayout()->setSpacing( 0 );
nameGroup->tqlayout()->setMargin( 0 );
TQGridLayout *nameGroupLayout = new TQGridLayout( nameGroup->tqlayout() );
- nameGroupLayout->tqsetAlignment( TQt::AlignTop );
+ nameGroupLayout->setAlignment( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, searchFor->sizePolicy().hasHeightForWidth() ) );
+ searchFor->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, ofType->sizePolicy().hasHeightForWidth() ) );
+ ofType->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, ofType->sizePolicy().hasHeightForWidth() ) );
ofType->setEditable( false );
searchType->setBuddy(ofType);
ofType->insertItem(i18n("All Files"));
@@ -117,7 +117,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent
profileHandler->tqlayout()->setSpacing( 0 );
profileHandler->tqlayout()->setMargin( 0 );
TQGridLayout *profileLayout = new TQGridLayout( profileHandler->tqlayout() );
- profileLayout->tqsetAlignment( TQt::AlignTop );
+ profileLayout->setAlignment( TQt::AlignTop );
profileLayout->setSpacing( 6 );
profileLayout->setMargin( 11 );
@@ -157,7 +157,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent
searchInGroup->tqlayout()->setSpacing( 0 );
searchInGroup->tqlayout()->setMargin( 0 );
TQGridLayout *searchInLayout = new TQGridLayout( searchInGroup->tqlayout() );
- searchInLayout->tqsetAlignment( TQt::AlignTop );
+ searchInLayout->setAlignment( TQt::AlignTop );
searchInLayout->setSpacing( 6 );
searchInLayout->setMargin( 11 );
@@ -177,7 +177,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent
dontSearchInGroup->tqlayout()->setSpacing( 0 );
dontSearchInGroup->tqlayout()->setMargin( 0 );
TQGridLayout *dontSearchInLayout = new TQGridLayout( dontSearchInGroup->tqlayout() );
- dontSearchInLayout->tqsetAlignment( TQt::AlignTop );
+ dontSearchInLayout->setAlignment( TQt::AlignTop );
dontSearchInLayout->setSpacing( 6 );
dontSearchInLayout->setMargin( 11 );
@@ -197,7 +197,7 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent
containsGroup->tqlayout()->setSpacing( 0 );
containsGroup->tqlayout()->setMargin( 0 );
TQGridLayout *containsLayout = new TQGridLayout( containsGroup->tqlayout() );
- containsLayout->tqsetAlignment( TQt::AlignTop );
+ containsLayout->setAlignment( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, containsLabel->sizePolicy().hasHeightForWidth() ) );
+ containsLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, containsLabel->sizePolicy().hasHeightForWidth() ) );
containsLabel->setText( i18n( "&Text:" ) );
containsTextLayout->addWidget( containsLabel );
containsText = new KHistoryCombo( false, containsGroup, "containsText" );
- containsText->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, containsText->sizePolicy().hasHeightForWidth() ) );
+ containsText->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, remoteContentSearch->sizePolicy().hasHeightForWidth() ) );
+ remoteContentSearch->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, containsWholeWord->sizePolicy().hasHeightForWidth() ) );
+ containsWholeWord->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, containsTextCase->sizePolicy().hasHeightForWidth() ) );
+ containsTextCase->setSizePolicy( 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/GUI/kcmdline.cpp b/krusader/GUI/kcmdline.cpp
index e29f3a6..7e10d82 100644
--- a/krusader/GUI/kcmdline.cpp
+++ b/krusader/GUI/kcmdline.cpp
@@ -62,14 +62,14 @@ KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, nam
path = new TQLabel( this );
TQWhatsThis::add
( path, i18n( "Name of directory where command will be processed." ) );
- path->tqsetAlignment( TQt::AlignRight );
+ path->setAlignment( 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->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+ path->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
tqlayout->addWidget( path, 0, 0 );
// and editable command line
@@ -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->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+ cmdLine->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
// load the history
KConfigGroupSaver grpSvr( krConfig, "Private" );
TQStringList list = krConfig->readListEntry( "cmdline history" );
diff --git a/krusader/GUI/krremoteencodingmenu.cpp b/krusader/GUI/krremoteencodingmenu.cpp
index 5f3ec0d..c6a726f 100644
--- a/krusader/GUI/krremoteencodingmenu.cpp
+++ b/krusader/GUI/krremoteencodingmenu.cpp
@@ -41,7 +41,7 @@
#include "krremoteencodingmenu.h"
-#define DATA_KEY TQString::tqfromLatin1("Charset")
+#define DATA_KEY TQString::fromLatin1("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 dbca240..aa5f7f0 100644
--- a/krusader/GUI/krusaderstatus.cpp
+++ b/krusader/GUI/krusaderstatus.cpp
@@ -34,13 +34,13 @@
#include "../resources.h"
-KrusadertqStatus::KrusadertqStatus(TQWidget *parent, const char *name ):
+KrusaderStatus::KrusaderStatus(TQWidget *parent, const char *name ):
KStatusBar(parent,name){
insertItem(i18n("Ready."), S_READY_ID);
setMaximumHeight(TQFontMetrics(font()).height()+2);
}
-KrusadertqStatus::~KrusadertqStatus(){
+KrusaderStatus::~KrusaderStatus(){
}
#include "krusaderstatus.moc"
diff --git a/krusader/GUI/krusaderstatus.h b/krusader/GUI/krusaderstatus.h
index 95da4dd..22f4dc9 100644
--- a/krusader/GUI/krusaderstatus.h
+++ b/krusader/GUI/krusaderstatus.h
@@ -42,12 +42,12 @@
#include
#include
-class KrusadertqStatus : public KStatusBar {
+class KrusaderStatus : public KStatusBar {
Q_OBJECT
TQ_OBJECT
public:
- KrusadertqStatus(TQWidget *parent=0, const char *name=0);
- ~KrusadertqStatus();
+ KrusaderStatus(TQWidget *parent=0, const char *name=0);
+ ~KrusaderStatus();
private:
TQLabel *mess;
diff --git a/krusader/KViewer/diskusageviewer.cpp b/krusader/KViewer/diskusageviewer.cpp
index ebaf6bd..bdc2bbb 100644
--- a/krusader/KViewer/diskusageviewer.cpp
+++ b/krusader/KViewer/diskusageviewer.cpp
@@ -56,8 +56,8 @@ void DiskUsageViewer::openURL( KURL url )
{
diskUsage = new DiskUsage( "DiskUsageViewer", this );
- 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( enteringDirectory( Directory * ) ), this, TQT_SLOT( slotUpdateStatus() ) );
+ connect( diskUsage, TQT_SIGNAL( status( TQString ) ), this, TQT_SLOT( slotUpdateStatus( TQString ) ) );
connect( diskUsage, TQT_SIGNAL( newSearch() ), this, TQT_SLOT( slotNewSearch() ) );
tqlayout->addWidget( diskUsage, 0, 0 );
this->show();
@@ -109,7 +109,7 @@ void DiskUsageViewer::setStatusLabel( TQLabel *statLabel, TQString pref )
prefix = pref;
}
-void DiskUsageViewer::slotUpdatetqStatus( TQString status )
+void DiskUsageViewer::slotUpdateStatus( TQString status )
{
if( statusLabel ) {
if( status.isEmpty() ) {
diff --git a/krusader/KViewer/diskusageviewer.h b/krusader/KViewer/diskusageviewer.h
index b7ef603..f38100d 100644
--- a/krusader/KViewer/diskusageviewer.h
+++ b/krusader/KViewer/diskusageviewer.h
@@ -55,7 +55,7 @@ signals:
void openURLRequest(const KURL &);
protected slots:
- void slotUpdatetqStatus( TQString status = TQString() );
+ void slotUpdateStatus( TQString status = TQString() );
void slotNewSearch();
protected:
diff --git a/krusader/KViewer/kimagefilepreview.cpp b/krusader/KViewer/kimagefilepreview.cpp
index 302e8c2..ebc428a 100644
--- a/krusader/KViewer/kimagefilepreview.cpp
+++ b/krusader/KViewer/kimagefilepreview.cpp
@@ -36,8 +36,8 @@ m_job( 0L ) {
imageLabel = new TQLabel( this );
imageLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
- imageLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
- imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
+ imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+ imageLabel->setSizePolicy( 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::tqsizeHint() const {
+TQSize KrusaderImageFilePreview::sizeHint() const {
return TQSize( 20, 200 ); // otherwise it ends up huge???
}
diff --git a/krusader/KViewer/kimagefilepreview.h b/krusader/KViewer/kimagefilepreview.h
index 23cce72..64c8e46 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 tqsizeHint() const;
+ virtual TQSize sizeHint() const;
public slots:
virtual void showPreview( const KURL &url );
diff --git a/krusader/KViewer/panelviewer.cpp b/krusader/KViewer/panelviewer.cpp
index d2205fa..6f16dd5 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 ) {
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
mimes = new TQDict( DICTSIZE, false );
mimes->setAutoDelete( true );
cpart = 0;
fallback = new TQLabel( i18n( "No file selected or selected file can't be displayed." ), this );
- fallback->tqsetAlignment( AlignCenter | ExpandTabs | WordBreak );
+ fallback->setAlignment( AlignCenter | ExpandTabs | WordBreak );
addWidget( fallback );
raiseWidget( fallback );
}
diff --git a/krusader/Konfigurator/kgadvanced.cpp b/krusader/Konfigurator/kgadvanced.cpp
index 9fc62f0..e119549 100644
--- a/krusader/Konfigurator/kgadvanced.cpp
+++ b/krusader/Konfigurator/kgadvanced.cpp
@@ -111,7 +111,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) :
TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), parent, "kgFineTuneGrp" );
TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->tqlayout() );
- fineTuneGrid->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop );
+ fineTuneGrid->setAlignment( 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->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+ spinBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed);
fineTuneGrid->addWidget( spinBox, 0, 1 );
addLabel( fineTuneGrid, 1, 0, i18n( "Arguments of updatedb:" ),
diff --git a/krusader/Konfigurator/kgcolors.cpp b/krusader/Konfigurator/kgcolors.cpp
index 01e4a7e..920e4e0 100644
--- a/krusader/Konfigurator/kgcolors.cpp
+++ b/krusader/Konfigurator/kgcolors.cpp
@@ -170,7 +170,7 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) :
int index = itemList.count() - offset;
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->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ dimFactor->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
connect( dimFactor, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( generatePreview() ) );
colorsGrid->addWidget( dimFactor, index++, 1 );
@@ -243,7 +243,7 @@ int KgColors::addColorSelector( TQString cfgName, TQString name, TQColor dflt, T
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->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ chooser->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
if( !dfltName.isEmpty() )
chooser->setDefaultText( dfltName );
diff --git a/krusader/Konfigurator/kgdependencies.cpp b/krusader/Konfigurator/kgdependencies.cpp
index a9f2c96..c6b4d77 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->tqsetAlignment( TQt::AlignTop );
+ pathsGrid->setAlignment( 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->tqsetAlignment( TQt::AlignTop );
+ archGrid1->setAlignment( 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->tqsetAlignment( TQt::AlignTop );
+ archGrid2->setAlignment( TQt::AlignTop );
addApplication( "md5sum", archGrid2, 0, checksum_tab, PAGE_CHECKSUM );
addApplication( "sha1sum", archGrid2, 1, checksum_tab, PAGE_CHECKSUM );
diff --git a/krusader/Konfigurator/kgstartup.cpp b/krusader/Konfigurator/kgstartup.cpp
index 6201039..2698ae4 100644
--- a/krusader/Konfigurator/kgstartup.cpp
+++ b/krusader/Konfigurator/kgstartup.cpp
@@ -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->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ profileCombo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed);
panelsGrid->addWidget( profileCombo, 0, 1 );
//------------------------------------------------
diff --git a/krusader/Konfigurator/konfiguratorpage.cpp b/krusader/Konfigurator/konfiguratorpage.cpp
index 0ae9e3d..0f924bb 100644
--- a/krusader/Konfigurator/konfiguratorpage.cpp
+++ b/krusader/Konfigurator/konfiguratorpage.cpp
@@ -164,7 +164,7 @@ TQGroupBox* KonfiguratorPage::createFrame( TQString text, TQWidget *parent,
TQGridLayout* KonfiguratorPage::createGridLayout( TQLayout *parent )
{
TQGridLayout *gridLayout = new TQGridLayout( parent );
- gridLayout->tqsetAlignment( TQt::AlignTop );
+ gridLayout->setAlignment( TQt::AlignTop );
gridLayout->setSpacing( 6 );
gridLayout->setMargin( 11 );
return gridLayout;
@@ -235,7 +235,7 @@ KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup( TQString cls
radioWidget->setColumnLayout(0, Qt::Vertical );
TQGridLayout *tqlayout = new TQGridLayout( radioWidget->tqlayout() );
- tqlayout->tqsetAlignment( TQt::AlignTop );
+ tqlayout->setAlignment( TQt::AlignTop );
tqlayout->setSpacing( 6 );
tqlayout->setMargin( 0 );
diff --git a/krusader/Konfigurator/krresulttable.cpp b/krusader/Konfigurator/krresulttable.cpp
index 32f2691..9abc8a1 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()->tqsizeHint().width() + 15 );
+ child->widget()->setMinimumWidth( child->widget()->sizeHint().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->tqsetAlignment(TQt::AlignTop);
+ _label->setAlignment(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->tqsetAlignment( TQt::AlignTop );
+ _label->setAlignment( 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->tqsetAlignment( TQt::AlignTop );
+ _label->setAlignment( 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->tqsetAlignment( TQt::AlignTop | TQt::WordBreak ); // wrap words
+ _label->setAlignment( 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->tqsetAlignment( TQt::AlignTop );
+ _label->setAlignment( TQt::AlignTop );
grid->addWidget(_label, _numRows, 0);
// Tool column
@@ -331,7 +331,7 @@ bool KrToolResultTable::addRow(SearchObject* search, TQGridLayout* grid)
for( TQValueVector::Iterator it=_apps.begin(); it!=_apps.end(); it++ )
{
KURLLabel* l = new KURLLabel( (*it)->getWebsite(), (*it)->getAppName(), toolBox);
- l->tqsetAlignment(TQt::AlignLeft | TQt::AlignTop);
+ l->setAlignment(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->tqsetAlignment( TQt::AlignTop );
+ _label->setAlignment( TQt::AlignTop );
}
grid->addWidget(vbox, _numRows, 2);
- // tqStatus column
+ // Status column
_label = new TQLabel(this);
_label->setMargin(5);
- _label->tqsetAlignment( TQt::AlignTop );
+ _label->setAlignment( TQt::AlignTop );
if( appGroup->getFoundGroup() ) {
_label->setText( i18n("enabled") );
_label->setPaletteForegroundColor("darkgreen");
diff --git a/krusader/Konfigurator/krresulttabledialog.cpp b/krusader/Konfigurator/krresulttabledialog.cpp
index 179099a..f7f6571 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->tqsetAlignment( TQt::AlignTop );
+ _topLayout->setAlignment( 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->tqsetAlignment( TQt::AlignLeft | TQt::AlignVCenter );
- _iconLabel->setFixedSize( _iconLabel->tqsizeHint() );
+ _iconLabel->setAlignment( TQt::AlignLeft | TQt::AlignVCenter );
+ _iconLabel->setFixedSize( _iconLabel->sizeHint() );
_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->tqsetAlignment(TQt::AlignRight);
+ _hintLabel->setAlignment(TQt::AlignRight);
_topLayout->addWidget(_hintLabel);
}
- this->setFixedSize( this->tqsizeHint() ); // make non-resizeable
+ this->setFixedSize( this->sizeHint() ); // make non-resizeable
}
KrResultTableDialog::~KrResultTableDialog()
diff --git a/krusader/Locate/locate.cpp b/krusader/Locate/locate.cpp
index d4cc981..b4d75e1 100755
--- a/krusader/Locate/locate.cpp
+++ b/krusader/Locate/locate.cpp
@@ -117,7 +117,7 @@ LocateDlg::LocateDlg() : KDialogBase(0,0,false,"Locate", KDialogBase::User1 | KD
locateSearchFor->setHistoryItems(list);
locateSearchFor->setEditable( true );
locateSearchFor->setDuplicatesEnabled( false );
- locateSearchFor->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed);
+ locateSearchFor->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed);
locateSearchFor->lineEdit()->setFocus();
grid->addWidget( hbox, 0, 0 );
diff --git a/krusader/MountMan/kdiskfreesp.cpp b/krusader/MountMan/kdiskfreesp.cpp
index 25de916..66b2c97 100644
--- a/krusader/MountMan/kdiskfreesp.cpp
+++ b/krusader/MountMan/kdiskfreesp.cpp
@@ -99,7 +99,7 @@ void KDiskFreeSp::dfDone()
TQTextStream t (dfStringErrOut, IO_ReadOnly);
TQString s=t.readLine();
- if ( (s.isEmpty()) || ( s.left(10) != TQString::tqfromLatin1("Filesystem") ) )
+ if ( (s.isEmpty()) || ( s.left(10) != TQString::fromLatin1("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 9ddc29b..e1af1f3 100644
--- a/krusader/MountMan/kmountman.cpp
+++ b/krusader/MountMan/kmountman.cpp
@@ -148,7 +148,7 @@ void KMountMan::unmount( TQString mntPoint, bool blocking ) {
}
}
-KMountMan::mnttqStatus KMountMan::gettqStatus( TQString mntPoint ) {
+KMountMan::mntStatus KMountMan::getStatus( TQString mntPoint ) {
KMountPoint::List::iterator it;
KMountPoint *m;
@@ -170,7 +170,7 @@ KMountMan::mnttqStatus KMountMan::gettqStatus( TQString mntPoint ) {
void KMountMan::toggleMount( TQString mntPoint ) {
- mnttqStatus status = gettqStatus(mntPoint);
+ mntStatus status = getStatus(mntPoint);
switch (status) {
case MOUNTED:
unmount(mntPoint);
@@ -185,7 +185,7 @@ void KMountMan::toggleMount( TQString mntPoint ) {
}
void KMountMan::autoMount( TQString path ) {
- if ( gettqStatus( path ) == NOT_MOUNTED )
+ if ( getStatus( path ) == NOT_MOUNTED )
mount( path );
}
diff --git a/krusader/MountMan/kmountman.h b/krusader/MountMan/kmountman.h
index 2cc4934..6e31748 100644
--- a/krusader/MountMan/kmountman.h
+++ b/krusader/MountMan/kmountman.h
@@ -53,7 +53,7 @@ class KMountMan : public TQObject {
friend class KMountManGUI;
public:
- enum mnttqStatus {DOESNT_EXIST, NOT_MOUNTED, MOUNTED};
+ enum mntStatus {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
- mnttqStatus gettqStatus( TQString mntPoint ); // return the status of a mntPoint (if any)
+ mntStatus getStatus( 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 030bfd5..d5fb8d2 100644
--- a/krusader/MountMan/kmountmangui.cpp
+++ b/krusader/MountMan/kmountmangui.cpp
@@ -73,10 +73,10 @@ info( 0 ), mountList( 0 ) {
widget = new KJanusWidget( this, 0, KJanusWidget::Tabbed );
createLayout();
setMainWidget( widget );
- widget->setMinimumSize( widget->tqsizeHint().width() + mountList->columnWidth( 5 ),
- widget->tqsizeHint().height() );
- setMinimumSize( widget->tqminimumSize().width(), widget->tqminimumSize().height() );
- resize( tqminimumSize() );
+ widget->setMinimumSize( widget->sizeHint().width() + mountList->columnWidth( 5 ),
+ widget->sizeHint().height() );
+ setMinimumSize( widget->minimumSize().width(), widget->minimumSize().height() );
+ resize( minimumSize() );
// connections
connect( mountList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), this,
@@ -139,7 +139,7 @@ void KMountManGUI::createMainPage() {
// now the list is created, time to fill it with data.
//=>krMtMan.forceUpdate();
TQGroupBox *box = new TQGroupBox( "MountMan.Info", mainPage );
- box->tqsetAlignment( TQt::AlignHCenter );
+ box->setAlignment( TQt::AlignHCenter );
info = new KRFSDisplay( box );
info->resize( info->width(), height() );
tqlayout->addWidget( box, 0, 0 );
diff --git a/krusader/Panel/krdetailedview.cpp b/krusader/Panel/krdetailedview.cpp
index cf0886f..5ef7300 100644
--- a/krusader/Panel/krdetailedview.cpp
+++ b/krusader/Panel/krdetailedview.cpp
@@ -832,11 +832,11 @@ TQRect KrDetailedView::drawItemHighlighter(TQPainter *painter, TQListViewItem *i
{
TQRect r;
if( _currDragItem && item ) {
- r = tqitemRect(item);
+ r = itemRect(item);
if (painter)
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, tqcolorGroup(),
- TQStyle::Style_FocusAtBorder, tqcolorGroup().highlight());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
+ TQStyle::Style_FocusAtBorder, colorGroup().highlight());
}
return r;
}
@@ -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( tqitemRect( i ) );
+ TQRect r( itemRect( 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( tqitemRect( i ) );
+ TQRect r( itemRect( i ) );
if ( !r.height() ) break;
for ( int page = visibleHeight() / r.height() - 1; page > 0 && ( j = i->itemAbove() ); --page )
i = j;
diff --git a/krusader/Panel/krdrag.cpp b/krusader/Panel/krdrag.cpp
index f015143..95bcae8 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::tqencodedData( const char* mime ) const
+TQByteArray KRDrag::encodedData( const char* mime ) const
{
TQByteArray a;
TQCString mimetype( mime );
if ( mimetype == "text/uri-list" )
- return TQUriDrag::tqencodedData( mime );
+ return TQUriDrag::encodedData( 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::tqencodedData( const char* mime ) const
bool KRDrag::decodeIsCutSelection( const TQMimeSource *e )
{
- TQByteArray a = e->tqencodedData( "application/x-kde-cutselection" );
+ TQByteArray a = e->encodedData( "application/x-kde-cutselection" );
if ( a.isEmpty() )
return false;
else
diff --git a/krusader/Panel/krdrag.h b/krusader/Panel/krdrag.h
index 11f87ac..400294e 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 tqencodedData( const char* mime ) const;
+ virtual TQByteArray encodedData( const char* mime ) const;
void setMoveSelection( bool move ) { m_bCutSelection = move; }
diff --git a/krusader/Panel/krpopupmenu.cpp b/krusader/Panel/krpopupmenu.cpp
index 13bbd57..99a7e62 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.gettqStatus( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) ) == KMountMan::MOUNTED )
+ if ( krMtMan.getStatus( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) ) == KMountMan::MOUNTED )
insertItem( i18n( "Unmount" ), UNMOUNT_ID );
- else if ( krMtMan.gettqStatus( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) ) == KMountMan::NOT_MOUNTED )
+ else if ( krMtMan.getStatus( 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 );
diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp
index f5b8709..2d99db4 100644
--- a/krusader/Panel/listpanel.cpp
+++ b/krusader/Panel/listpanel.cpp
@@ -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( handleDropOntqStatus(TQDropEvent *) ) );
+ connect( status, TQT_SIGNAL( dropped( TQDropEvent *) ), this, TQT_SLOT( handleDropOnStatus(TQDropEvent *) ) );
// ... create the history button
dirHistoryQueue = new DirHistoryQueue( this );
@@ -770,7 +770,7 @@ void ListPanel::handleDropOnTotals( TQDropEvent *e ) {
handleDropOnView( e, totals );
}
-void ListPanel::handleDropOntqStatus( TQDropEvent *e ) {
+void ListPanel::handleDropOnStatus( TQDropEvent *e ) {
handleDropOnView( e, status );
}
diff --git a/krusader/Panel/listpanel.h b/krusader/Panel/listpanel.h
index 9d5c313..3107325 100644
--- a/krusader/Panel/listpanel.h
+++ b/krusader/Panel/listpanel.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 handleDropOntqStatus( TQDropEvent * ); // handles drops on the status line
+ void handleDropOnStatus( 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 signaltqStatus( TQString msg ); // emmited when we need to update the status bar
+ void signalStatus( 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
diff --git a/krusader/Panel/panelpopup.cpp b/krusader/Panel/panelpopup.cpp
index 45ff3d9..3234d9b 100644
--- a/krusader/Panel/panelpopup.cpp
+++ b/krusader/Panel/panelpopup.cpp
@@ -162,7 +162,7 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ),
if ( i > 0 )
quickSelectCombo->insertStrList( lst );
quickSelectCombo->setCurrentText( "*" );
- quickSelectCombo->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+ quickSelectCombo->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
connect(quickSelectCombo, TQT_SIGNAL(returnPressed(const TQString& )),
this, TQT_SLOT(quickSelect(const TQString& )));
diff --git a/krusader/RemoteMan/remotemanbase.cpp b/krusader/RemoteMan/remotemanbase.cpp
index 104ed0a..4f5864f 100644
--- a/krusader/RemoteMan/remotemanbase.cpp
+++ b/krusader/RemoteMan/remotemanbase.cpp
@@ -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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, protocol->sizePolicy().hasHeightForWidth() ) );
+ protocol->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, protocol->sizePolicy().hasHeightForWidth() ) );
Layout11->addWidget( protocol, 1, 0 );
hostName = new TQLineEdit( this, "hostName" );
- hostName->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, hostName->sizePolicy().hasHeightForWidth() ) );
+ hostName->setSizePolicy( 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->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel1_4->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
remoteManBaseLayout->addWidget( TextLabel1_4, 3, 1 );
diff --git a/krusader/Search/krsearchdialog.cpp b/krusader/Search/krsearchdialog.cpp
index 9032edc..ba9cc5c 100644
--- a/krusader/Search/krsearchdialog.cpp
+++ b/krusader/Search/krsearchdialog.cpp
@@ -160,7 +160,7 @@ KrSearchDialog::KrSearchDialog( TQString profile, TQWidget* parent, const char*
resultLabelLayout->setMargin( 0 );
foundLabel = new TQLabel( resultTab, "foundLabel" );
- foundLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, foundLabel->sizePolicy().hasHeightForWidth() ) );
+ foundLabel->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, l1->sizePolicy().hasHeightForWidth() ) );
+ l1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, l1->sizePolicy().hasHeightForWidth() ) );
l1->setFrameShape( TQLabel::StyledPanel );
l1->setFrameShadow( TQLabel::Sunken );
l1->setText(i18n("Text found:"));
diff --git a/krusader/Splitter/splittergui.cpp b/krusader/Splitter/splittergui.cpp
index 2c575bc..a17c861 100644
--- a/krusader/Splitter/splittergui.cpp
+++ b/krusader/Splitter/splittergui.cpp
@@ -75,7 +75,7 @@ SplitterGUI::SplitterGUI( TQWidget* parent, KURL fileURL, KURL defaultDir ) :
TQLabel *spacer = new TQLabel( splitSizeLine );
spacer->setText( " " );
- spacer->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+ spacer->setSizePolicy( 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->tqsizeHint().height() );
+ separator->setFixedHeight( separator->sizeHint().height() );
grid->addWidget( separator,3 ,0 );
diff --git a/krusader/Synchronizer/feedtolistboxdialog.cpp b/krusader/Synchronizer/feedtolistboxdialog.cpp
index 7436c93..2b3dc27 100644
--- a/krusader/Synchronizer/feedtolistboxdialog.cpp
+++ b/krusader/Synchronizer/feedtolistboxdialog.cpp
@@ -118,10 +118,10 @@ FeedToListBoxDialog::FeedToListBoxDialog(TQWidget *parent, const char *name, Sy
TQHBox *hbox = new TQHBox( widget, "fbHBox" );
TQLabel *label2 = new TQLabel( i18n( "Side to feed:" ), hbox, "fbSideLabel" );
- label2->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+ label2->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
sideCombo = new TQComboBox( hbox, "fbSideCombo" );
- sideCombo->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+ sideCombo->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
sideCombo->insertItem( i18n( "Left" ) );
sideCombo->insertItem( i18n( "Right" ) );
sideCombo->insertItem( i18n( "Both" ) );
@@ -136,10 +136,10 @@ FeedToListBoxDialog::FeedToListBoxDialog(TQWidget *parent, const char *name, Sy
TQFrame *line = new TQFrame( hbox, "fbVLine" );
line->setFrameStyle( TQFrame::VLine | TQFrame::Sunken );
- line->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+ line->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
cbSelected = new TQCheckBox( i18n( "Selected files only" ), hbox, "cbSelected" );
- cbSelected->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+ cbSelected->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
cbSelected->setEnabled( selectedNum != 0 );
cbSelected->setChecked( selectedNum != 0 );
diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp
index cd52b55..0526a38 100755
--- a/krusader/Synchronizer/synchronizergui.cpp
+++ b/krusader/Synchronizer/synchronizergui.cpp
@@ -1108,7 +1108,7 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL
synchronizerGrid->setMargin( 11 );
TQGroupBox *compareDirs = new TQGroupBox( synchronizerTab, "SyncCompareDirectories" );
- compareDirs->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ compareDirs->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed);
compareDirs->setTitle( i18n( "Directory Comparison" ) );
compareDirs->setColumnLayout(0, Qt::Vertical );
compareDirs->tqlayout()->setSpacing( 0 );
@@ -1119,16 +1119,16 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL
grid->setMargin( 11 );
leftDirLabel = new TQLabel( compareDirs, "leftDirLabel" );
- leftDirLabel->tqsetAlignment( TQt::AlignHCenter );
+ leftDirLabel->setAlignment( TQt::AlignHCenter );
grid->addWidget( leftDirLabel, 0 ,0 );
TQLabel *filterLabel = new TQLabel( compareDirs, "filterLabel" );
filterLabel->setText( i18n( "File &Filter:" ) );
- filterLabel->tqsetAlignment( TQt::AlignHCenter );
+ filterLabel->setAlignment( TQt::AlignHCenter );
grid->addWidget( filterLabel, 0 ,1 );
rightDirLabel = new TQLabel( compareDirs, "rightDirLabel" );
- rightDirLabel->tqsetAlignment( TQt::AlignHCenter );
+ rightDirLabel->setAlignment( 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->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Fixed);
+ leftLocation->setSizePolicy(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->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+ fileFilter->setSizePolicy(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->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Fixed);
+ rightLocation->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Fixed);
list = krConfig->readListEntry("Right Directory History");
rightLocation->setHistoryItems(list);
KURLRequester *rightUrlReq = new KURLRequester( rightLocation, compareDirs, "RightDirectory" );
@@ -1209,7 +1209,7 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL
TQGroupBox *showOptions = new TQGroupBox( optionBox, "SyncOptionBox" );
showOptions->setTitle( i18n( "S&how options" ) );
- showOptions->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+ showOptions->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed);
showOptions->setColumnLayout(0, Qt::Vertical );
showOptions->tqlayout()->setSpacing( 0 );
showOptions->tqlayout()->setMargin( 0 );
@@ -1357,7 +1357,7 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL
optionsGroup->tqlayout()->setSpacing( 0 );
optionsGroup->tqlayout()->setMargin( 0 );
TQGridLayout *optionsLayout = new TQGridLayout( optionsGroup->tqlayout() );
- optionsLayout->tqsetAlignment( TQt::AlignTop );
+ optionsLayout->setAlignment( TQt::AlignTop );
optionsLayout->setSpacing( 6 );
optionsLayout->setMargin( 11 );
diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp
index 2b9bbce..43c2bef 100644
--- a/krusader/UserAction/kraction.cpp
+++ b/krusader/UserAction/kraction.cpp
@@ -103,16 +103,16 @@ _stdout(0), _stderr(0), _currentTextEdit(0) {
void KrActionProcDlg::addStderr( KProcess *, char *buffer, int buflen ) {
if (_stderr)
- _stderr->append( TQString::tqfromLatin1( buffer, buflen ) );
+ _stderr->append( TQString::fromLatin1( buffer, buflen ) );
else {
_stdout->setItalic(true);
- _stdout->append( TQString::tqfromLatin1( buffer, buflen ) );
+ _stdout->append( TQString::fromLatin1( buffer, buflen ) );
_stdout->setItalic(false);
}
}
void KrActionProcDlg::addStdout( KProcess *, char *buffer, int buflen ) {
- _stdout->append( TQString::tqfromLatin1( buffer, buflen ) );
+ _stdout->append( TQString::fromLatin1( buffer, buflen ) );
}
void KrActionProcDlg::toggleFixedFont( bool state ) {
diff --git a/krusader/VFS/krarchandler.cpp b/krusader/VFS/krarchandler.cpp
index c5507f4..8a183ba 100644
--- a/krusader/VFS/krarchandler.cpp
+++ b/krusader/VFS/krarchandler.cpp
@@ -201,7 +201,7 @@ long KRarcHandler::arcFileCount( TQString archive, TQString type, TQString passw
krApp->stopWait();
- if( !list.normalExit() || !checktqStatus( type, list.exitStatus() ) ) {
+ if( !list.normalExit() || !checkStatus( 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,7 +258,7 @@ 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() || !checktqStatus( "cpio", cpio.exitStatus() ) ) {
+ if( !cpio.normalExit() || !checkStatus( "cpio", cpio.exitStatus() ) ) {
KMessageBox::detailedError (krApp, i18n( "Failed to convert rpm (%1) to cpio!" ).tqarg( archive ),
cpio.getErrorMsg(), i18n("Error" ) );
return 0;
@@ -275,7 +275,7 @@ 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() || !checktqStatus( "-deb", dpkg.exitStatus() ) ) {
+ if( !dpkg.normalExit() || !checkStatus( "-deb", dpkg.exitStatus() ) ) {
KMessageBox::detailedError (krApp, i18n( "Failed to convert deb (%1) to tar!" ).tqarg( archive ),
dpkg.getErrorMsg(), i18n("Error" ) );
return 0;
@@ -335,7 +335,7 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T
TQFile( cpioName ).remove(); /* remove the cpio file */
// check the return value
- if ( !proc.normalExit() || !checktqStatus( type, proc.exitStatus() ) ) {
+ if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) {
KMessageBox::detailedError (krApp, i18n( "Failed to unpack %1!" ).tqarg( archive ),
krApp->wasWaitingCancelled() ? i18n( "User cancelled." ) :
proc.getErrorMsg(), i18n("Error" ) );
@@ -397,7 +397,7 @@ bool KRarcHandler::test( TQString archive, TQString type, TQString password, lon
krApp->stopWait();
// check the return value
- if ( !proc.normalExit() || !checktqStatus( type, proc.exitStatus() ) )
+ if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) )
return false;
return true; // SUCCESS
@@ -504,7 +504,7 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l
krApp->stopWait();
// check the return value
- if ( !proc.normalExit() || !checktqStatus( type, proc.exitStatus() ) ) {
+ if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) {
KMessageBox::detailedError (krApp, i18n( "Failed to pack %1!" ).tqarg( dest ),
krApp->wasWaitingCancelled() ? i18n( "User cancelled." ) : proc.getErrorMsg(),
i18n("Error" ) );
@@ -597,7 +597,7 @@ TQString KRarcHandler::getType( bool &encrypted, TQString fileName, TQString mim
}
-bool KRarcHandler::checktqStatus( TQString type, int exitCode ) {
+bool KRarcHandler::checkStatus( 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 70dff00..6324976 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 checktqStatus( TQString type, int exitCode );
+ static bool checkStatus( TQString type, int exitCode );
static KWallet::Wallet * wallet;
};
diff --git a/krusader/VFS/krquery.cpp b/krusader/VFS/krquery.cpp
index 1735169..a3d3e84 100644
--- a/krusader/VFS/krquery.cpp
+++ b/krusader/VFS/krquery.cpp
@@ -571,16 +571,16 @@ void KRQuery::setContent( const TQString &content, bool cs, bool wholeWord, bool
containOnRemote = remoteSearch;
}
-void KRQuery::setMinimumFileSize( KIO::filesize_t tqminimumSize )
+void KRQuery::setMinimumFileSize( KIO::filesize_t minimumSize )
{
bNull = false;
- minSize = tqminimumSize;
+ minSize = minimumSize;
}
-void KRQuery::setMaximumFileSize( KIO::filesize_t tqmaximumSize )
+void KRQuery::setMaximumFileSize( KIO::filesize_t maximumSize )
{
bNull = false;
- maxSize = tqmaximumSize;
+ maxSize = maximumSize;
}
void KRQuery::setNewerThan( time_t time )
diff --git a/krusader/VFS/normal_vfs.cpp b/krusader/VFS/normal_vfs.cpp
index 9db06a7..6ab0f55 100644
--- a/krusader/VFS/normal_vfs.cpp
+++ b/krusader/VFS/normal_vfs.cpp
@@ -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::tqfromLatin1( aclString );
+ TQString ret = TQString::fromLatin1( aclString );
acl_free( (void*)aclString );
acl_free( acl );
diff --git a/krusader/VFS/preservingcopyjob.cpp b/krusader/VFS/preservingcopyjob.cpp
index d374004..03b98c8 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::tqfromLatin1( aclString );
+ aclStr = TQString::fromLatin1( aclString );
acl_free( (void*)aclString );
acl_free( acl );
}
diff --git a/krusader/defaults.h b/krusader/defaults.h
index c3087a8..485ea53 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->tqsizeHint().width()/2,TQApplication::desktop()->height()/2 - 250)
+#define _StartPosition new TQPoint(TQApplication::desktop()->width()/2 - mainView->sizeHint().width()/2,TQApplication::desktop()->height()/2 - 250)
// Start Size /////////
-#define _StartSize new TQSize(mainView->tqsizeHint().width(),500)
+#define _StartSize new TQSize(mainView->sizeHint().width(),500)
// Panel Size /////////
#define _PanelSize 0
// Terminal Size //////
diff --git a/krusader/krslots.cpp b/krusader/krslots.cpp
index 706a9dd..5d09815 100644
--- a/krusader/krslots.cpp
+++ b/krusader/krslots.cpp
@@ -219,7 +219,7 @@ void KRslots::rightclickMenu() {
{
ACTIVE_PANEL->popRightClickMenu(
ACTIVE_PANEL->mapToGlobal(
- dynamic_cast(ACTIVE_PANEL->view)->tqitemRect( currentItem ).topLeft()
+ dynamic_cast(ACTIVE_PANEL->view)->itemRect( currentItem ).topLeft()
)
);
}
diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp
index b98edd4..608f3ba 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 KrusadertqStatus( this );
+ status = new KrusaderStatus( 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 KrusadertqStatus.
+ // the creation of the KDE default status bar instead of KrusaderStatus.
statusBar() ->message( mess, 5000 );
}
@@ -963,7 +963,7 @@ bool Krusader::queryClose() {
main window close. */
for(;;) {
- TQWidgetList * list = TQApplication::tqtopLevelWidgets();
+ TQWidgetList * list = TQApplication::topLevelWidgets();
TQWidget *activeModal = TQT_TQWIDGET(TQApplication::activeModalWidget());
TQWidget *w = list->first();
diff --git a/krusader/krusader.h b/krusader/krusader.h
index c0fa70d..bcbead1 100644
--- a/krusader/krusader.h
+++ b/krusader/krusader.h
@@ -53,7 +53,7 @@
class KrJS;
#endif
-class KrusadertqStatus;
+class KrusaderStatus;
class KRPleaseWaitHandler;
class KrusaderView;
class KProcess;
@@ -159,7 +159,7 @@ class Krusader : public KParts::MainWindow, public DCOPObject {
void stopWait();
bool wasWaitingCancelled() const;
- KrusadertqStatus *status;
+ KrusaderStatus *status;
KRslots *slot;
KAccel *accels; // global accelerators
diff --git a/krusader/krusaderview.cpp b/krusader/krusaderview.cpp
index c8fb622..1abe99e 100644
--- a/krusader/krusaderview.cpp
+++ b/krusader/krusaderview.cpp
@@ -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->tqfocusWidget();
+ TQWidget *focusW = tqApp->focusWidget();
// Create the part
konsole_part = ( KParts::ReadOnlyPart * )
factory->create( TQT_TQOBJECT(terminal_dock), "konsolepart",
diff --git a/krusader/mount.ui b/krusader/mount.ui
index 005df4a..fe7ddaf 100644
--- a/krusader/mount.ui
+++ b/krusader/mount.ui
@@ -54,7 +54,7 @@
Expanding
-
+
20
20
diff --git a/krusader/recode.ui b/krusader/recode.ui
index f0c3e1a..263c7e5 100644
--- a/krusader/recode.ui
+++ b/krusader/recode.ui
@@ -55,7 +55,7 @@
Expanding
-
+
20
20
diff --git a/tar/tar.cc b/tar/tar.cc
index cc0e804..74b0a3d 100644
--- a/tar/tar.cc
+++ b/tar/tar.cc
@@ -148,7 +148,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path ) {
if ( path[ len - 1 ] == '/' )
path.truncate( len - 1 );
} else
- path = TQString::tqfromLatin1( "/" );
+ path = TQString::fromLatin1( "/" );
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::tqfromLatin1( ":/" ) );
+ KURL redir( url.protocol() + TQString::fromLatin1( ":/" ) );
kdDebug( 7109 ) << "url.path()==" << url.path() << endl;
- redir.setPath( url.path() + TQString::tqfromLatin1( "/" ) );
+ redir.setPath( url.path() + TQString::fromLatin1( "/" ) );
kdDebug( 7109 ) << "ArchiveProtocol::listDir: redirection " << redir.url() << endl;
redirection( redir );
finished();
@@ -333,7 +333,7 @@ void ArchiveProtocol::stat( const KURL & url ) {
const KArchiveDirectory* root = m_archiveFile->directory();
const KArchiveEntry* archiveEntry;
if ( path.isEmpty() ) {
- path = TQString::tqfromLatin1( "/" );
+ path = TQString::fromLatin1( "/" );
archiveEntry = root;
} else {
archiveEntry = root->entry( path );