summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kcron/ctcron.cpp4
-rw-r--r--kcron/ktapp.cpp2
-rw-r--r--kcron/ktapp.h4
-rw-r--r--kcron/ktlisttasks.cpp2
-rw-r--r--kcron/ktlistvars.cpp2
-rw-r--r--kcron/ktprint.cpp6
-rw-r--r--kcron/ktprint.h2
-rw-r--r--kcron/ktview.cpp8
-rw-r--r--kdat/Archive.cpp8
-rw-r--r--kdat/Archive.h14
-rw-r--r--kdat/BackupDlg.cpp2
-rw-r--r--kdat/File.cpp16
-rw-r--r--kdat/File.h18
-rw-r--r--kdat/IndexDlg.cpp6
-rw-r--r--kdat/InfoShellWidget.h2
-rw-r--r--kdat/KDat.kdoc4
-rw-r--r--kdat/KDatMainWindow.cpp42
-rw-r--r--kdat/Node.cpp30
-rw-r--r--kdat/Node.h16
-rw-r--r--kdat/Tape.cpp44
-rw-r--r--kdat/Tape.h4
-rw-r--r--kdat/TapeInfoWidget.cpp6
-rw-r--r--kdat/VerifyDlg.cpp2
-rw-r--r--kdat/ktreeview.cpp76
-rw-r--r--kdat/ktreeview.h26
-rw-r--r--kfile-plugins/rpm/kfile_rpm.cpp6
-rw-r--r--knetworkconf/backends/parse.pl.in10
-rw-r--r--knetworkconf/backends/replace.pl.in18
-rw-r--r--knetworkconf/backends/xml.pl.in68
-rw-r--r--knetworkconf/knetworkconf/knetworkconf.cpp6
-rw-r--r--knetworkconf/knetworkconf/knetworkconfigparser.cpp4
-rw-r--r--knetworkconf/knetworkconf/knetworkconfmodule.cpp2
-rw-r--r--knetworkconf/knetworkconf/kprofileslistviewtooltip.h20
-rw-r--r--knetworkconf/knetworkconf/kreloadnetworkdlg.ui2
-rw-r--r--kpackage/cache.cpp6
-rw-r--r--kpackage/debAptInterface.cpp12
-rw-r--r--kpackage/fbsdInterface.cpp2
-rw-r--r--kpackage/kpackage.cpp6
-rw-r--r--kpackage/managementWidget.h2
-rw-r--r--kpackage/options.cpp4
-rw-r--r--kpackage/pkgInterface.cpp4
-rw-r--r--kpackage/pkgOptions.cpp2
-rw-r--r--kpackage/procbuf.cpp4
-rw-r--r--kpackage/search.cpp2
-rw-r--r--ksysv/IOCore.cpp42
-rw-r--r--ksysv/OldView.cpp36
-rw-r--r--ksysv/RunlevelAuthIcon.cpp4
-rw-r--r--ksysv/TopWidget.cpp6
-rw-r--r--ksysv/configwizard.ui4
-rw-r--r--ksysv/kdltooltip.cpp6
-rw-r--r--ksysv/ksv_conf.cpp2
-rw-r--r--ksysv/ksvdraglist.cpp2
-rw-r--r--ksysv/lookandfeelconfig.ui12
-rw-r--r--ksysv/trash.cpp4
-rw-r--r--kuser/addUser.cpp18
-rw-r--r--kuser/delUser.cpp6
-rw-r--r--kuser/editGroup.cpp6
-rw-r--r--kuser/kgroupfiles.cpp10
-rw-r--r--kuser/kuser.cpp58
-rw-r--r--kuser/kuserfiles.cpp16
-rw-r--r--kuser/kuserldap.cpp8
-rw-r--r--kuser/kuservw.cpp4
-rw-r--r--kuser/kuservw.h2
-rw-r--r--kuser/mainView.cpp12
-rw-r--r--kuser/misc.cpp8
-rw-r--r--kuser/passwordpolicy.ui8
-rw-r--r--kuser/propdlg.cpp12
-rw-r--r--lilo-config/kde-qt-common/EditWidget.h2
68 files changed, 407 insertions, 407 deletions
diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp
index 58d389a..e470a72 100644
--- a/kcron/ctcron.cpp
+++ b/kcron/ctcron.cpp
@@ -60,7 +60,7 @@ CTCron::CTCron(bool _syscron, string _login) :
writeCommand = TQString("crontab -u ") + _login.c_str() + " " + KProcess::quote(tmpFileName);
if (!initFromPasswd(getpwnam(_login.c_str())))
{
- error = i18n("No password entry found for user '%1'").tqarg(_login.c_str());
+ error = i18n("No password entry found for user '%1'").arg(_login.c_str());
}
}
}
@@ -71,7 +71,7 @@ CTCron::CTCron(bool _syscron, string _login) :
writeCommand = "crontab " + KProcess::quote(tmpFileName);
if (!initFromPasswd(getpwuid(uid)))
{
- error = i18n("No password entry found for uid '%1'").tqarg(uid);
+ error = i18n("No password entry found for uid '%1'").arg(uid);
}
}
diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp
index dfbe15e..8efbb05 100644
--- a/kcron/ktapp.cpp
+++ b/kcron/ktapp.cpp
@@ -70,7 +70,7 @@ bool KTApp::init()
if (cthost->isError())
{
KMessageBox::error(this, i18n("The following error occurred while initializing KCron:"
- "\n\n%1\n\nKCron will now exit.\n").tqarg(cthost->errorMessage()));
+ "\n\n%1\n\nKCron will now exit.\n").arg(cthost->errorMessage()));
return false;
}
diff --git a/kcron/ktapp.h b/kcron/ktapp.h
index 6b28354..a60c7ca 100644
--- a/kcron/ktapp.h
+++ b/kcron/ktapp.h
@@ -238,13 +238,13 @@ private:
/**
* Read general options again and initialize all variables like the
- * tqgeometry.
+ * geometry.
*/
void readOptions();
/**
* Save general options like all bar positions and status as well as the
- * tqgeometry to the configuration file.
+ * geometry to the configuration file.
*/
void saveOptions();
diff --git a/kcron/ktlisttasks.cpp b/kcron/ktlisttasks.cpp
index db153e6..e35f053 100644
--- a/kcron/ktlisttasks.cpp
+++ b/kcron/ktlisttasks.cpp
@@ -77,7 +77,7 @@ void KTListTasks::print (KTPrint& printer) const
printer.setFont(stnd);
- //firstChild() does not return null if there are no tqchildren, therefore
+ //firstChild() does not return null if there are no children, therefore
//we need to check the validation of the pointer without terminating
//the application. This maybe a bug in QT 1.44
diff --git a/kcron/ktlistvars.cpp b/kcron/ktlistvars.cpp
index 567d3d1..cf4a6d1 100644
--- a/kcron/ktlistvars.cpp
+++ b/kcron/ktlistvars.cpp
@@ -73,7 +73,7 @@ void KTListVars::print(KTPrint& printer) const
printer.setFont(stnd);
- //firstChild() does not return null if there are no tqchildren, therefore
+ //firstChild() does not return null if there are no children, therefore
//we need to check the validation of the pointer without terminating
//the application. This maybe a bug in QT 1.44
diff --git a/kcron/ktprint.cpp b/kcron/ktprint.cpp
index ceb1482..b1de5c6 100644
--- a/kcron/ktprint.cpp
+++ b/kcron/ktprint.cpp
@@ -104,7 +104,7 @@ TQFont KTPrint :: getFont () const
return paint->font();
}
-void KTPrint :: print (const TQString &str, int col, int tqalignment, bool wordWrap)
+void KTPrint :: print (const TQString &str, int col, int alignment, bool wordWrap)
{
//Prints the string str into the column col using
//the remaining arguments as format flags
@@ -115,8 +115,8 @@ void KTPrint :: print (const TQString &str, int col, int tqalignment, bool wordW
return;
- //Setup the tqalignment
- switch (tqalignment) {
+ //Setup the alignment
+ switch (alignment) {
case alignTextLeft : format = AlignLeft | AlignTop | DontClip | ExpandTabs; break;
case alignTextCenter : format = AlignHCenter | AlignTop | DontClip | ExpandTabs; break;
case alignTextRight : format = AlignRight | AlignTop | DontClip | ExpandTabs; break;
diff --git a/kcron/ktprint.h b/kcron/ktprint.h
index 34b0254..b035626 100644
--- a/kcron/ktprint.h
+++ b/kcron/ktprint.h
@@ -87,7 +87,7 @@ public:
/**
* Print text
*/
- void print (const TQString &str, int col =1, int tqalignment=KTPrint::defaultLeftMargin, bool wordWrap = true);
+ void print (const TQString &str, int col =1, int alignment=KTPrint::defaultLeftMargin, bool wordWrap = true);
/**
* Constructs the columns
diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp
index af2b780..27341de 100644
--- a/kcron/ktview.cpp
+++ b/kcron/ktview.cpp
@@ -273,9 +273,9 @@ void KTView :: pageHeading (KTListItem* user, KTPrint &printer) const
// SSA : Fix Me user name, logon name and host name musst be
// SSA : not only in us-ascii ??
logonInfo = i18n("user on host", "%1 <%2> on %3")
- .tqarg(TQString::fromLocal8Bit(user->getCTCron()->name.c_str()))
- .tqarg(TQString::fromLocal8Bit(user->getCTCron()->login.c_str()))
- .tqarg(TQString::fromLocal8Bit(hostName));
+ .arg(TQString::fromLocal8Bit(user->getCTCron()->name.c_str()))
+ .arg(TQString::fromLocal8Bit(user->getCTCron()->login.c_str()))
+ .arg(TQString::fromLocal8Bit(hostName));
stnd = printer.getFont();
printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 14, TQFont::Bold ));
@@ -315,7 +315,7 @@ void KTView::resizeEvent (TQResizeEvent*)
{
listView->setFixedWidth(width());
listView->setFixedHeight(height());
- tqrepaint();
+ repaint();
}
void KTView::copy()
diff --git a/kdat/Archive.cpp b/kdat/Archive.cpp
index ad66dbd..5e8ef65 100644
--- a/kdat/Archive.cpp
+++ b/kdat/Archive.cpp
@@ -94,7 +94,7 @@ void Archive::read( int version )
}
}
- // Number of immediate tqchildren (4 bytes).
+ // Number of immediate children (4 bytes).
fread( &ival, sizeof( ival ), 1, _fptr );
//===== Read files =====
@@ -148,7 +148,7 @@ void Archive::write( FILE* fptr )
fwrite( &ival, sizeof( ival ), 1, _fptr );
}
- // Number of immediate tqchildren (4 bytes).
+ // Number of immediate children (4 bytes).
ival = getChildren().count();
fwrite( &ival, sizeof( ival ), 1, _fptr );
@@ -202,7 +202,7 @@ const TQPtrList<File>& Archive::getChildren()
{
read();
- return _tqchildren;
+ return _children;
}
const TQPtrList<Range>& Archive::getRanges()
@@ -255,7 +255,7 @@ void Archive::addChild( File* file )
{
read();
- _tqchildren.append( file );
+ _children.append( file );
}
File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, const TQString & filename )
diff --git a/kdat/Archive.h b/kdat/Archive.h
index 7527073..9f42684 100644
--- a/kdat/Archive.h
+++ b/kdat/Archive.h
@@ -39,7 +39,7 @@ class Archive {
FILE* _fptr;
int _offset;
TQString _name;
- TQPtrList<File> _tqchildren;
+ TQPtrList<File> _children;
RangeList _ranges;
Tape* _tape;
public:
@@ -67,7 +67,7 @@ public:
Archive( Tape* tape, FILE* fptr, int offset );
/**
- * Destroy the archive entry and all of its tqchildren.
+ * Destroy the archive entry and all of its children.
*/
~Archive();
@@ -82,7 +82,7 @@ public:
/**
* Recursively read the instance data for this archive entry and all of its
- * tqchildren. This method is used when converting from an older index format.
+ * children. This method is used when converting from an older index format.
*
* @param version The version of the old tape index.
*/
@@ -90,7 +90,7 @@ public:
/**
* Write out the archive entry to the open file. Entries for each of its
- * tqchildren will also be written.
+ * children will also be written.
*/
void write( FILE* fptr );
@@ -125,12 +125,12 @@ public:
/**
* Get the list of top-level files in this archive.
*
- * @return A list of the immediate tqchildren of this archive.
+ * @return A list of the immediate children of this archive.
*/
const TQPtrList<File>& getChildren();
/**
- * Get the list of ranges of this file and all of its tqchildren.
+ * Get the list of ranges of this file and all of its children.
*
* @return A list of ranges.
*/
@@ -176,7 +176,7 @@ public:
File* addFile( int size, int mtime, int startRecord, int endRecord, const TQString & filename );
/**
- * Recursively calculate the list of ranges for all of the archive's tqchildren.
+ * Recursively calculate the list of ranges for all of the archive's children.
*/
void calcRanges();
};
diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp
index bd47226..e32f680 100644
--- a/kdat/BackupDlg.cpp
+++ b/kdat/BackupDlg.cpp
@@ -426,7 +426,7 @@ void BackupDlg::updateStats()
_kbytesWritten->setText( str );
if ( elapsed > 0 ) {
- str = i18n( "%1/min" ).tqarg(Util::kbytesToString( (int)_totalKBytes *60 / elapsed ) );
+ str = i18n( "%1/min" ).arg(Util::kbytesToString( (int)_totalKBytes *60 / elapsed ) );
_transferRate->setText( str );
}
}
diff --git a/kdat/File.cpp b/kdat/File.cpp
index ce05aeb..fd766b3 100644
--- a/kdat/File.cpp
+++ b/kdat/File.cpp
@@ -44,9 +44,9 @@ File::File( File* parent, FILE* fptr, int offset )
File::~File()
{
- while ( _tqchildren.first() ) {
- delete _tqchildren.first();
- _tqchildren.removeFirst();
+ while ( _children.first() ) {
+ delete _children.first();
+ _children.removeFirst();
}
}
@@ -164,7 +164,7 @@ void File::write( FILE* fptr )
fwrite( &ival, sizeof( ival ), 1, fptr );
}
- // Number of immediate tqchildren (4 bytes).
+ // Number of immediate children (4 bytes).
ival = getChildren().count();
fwrite( &ival, sizeof( ival ), 1, fptr );
@@ -175,10 +175,10 @@ void File::write( FILE* fptr )
}
//===== Write files =====
- ival = _tqchildren.count();
+ ival = _children.count();
fwrite( &ival, sizeof( ival ), 1, fptr );
- TQPtrListIterator<File> i( _tqchildren );
+ TQPtrListIterator<File> i( _children );
int count = 0;
for ( ; i.current(); ++i, count++ ) {
// Fill in the file offset.
@@ -252,7 +252,7 @@ const TQPtrList<File>& File::getChildren()
{
read();
- return _tqchildren;
+ return _children;
}
const TQPtrList<Range>& File::getRanges()
@@ -266,7 +266,7 @@ void File::addChild( File* file )
{
read();
- _tqchildren.append( file );
+ _children.append( file );
}
void File::calcRanges()
diff --git a/kdat/File.h b/kdat/File.h
index 71167f2..75b1d87 100644
--- a/kdat/File.h
+++ b/kdat/File.h
@@ -46,7 +46,7 @@ class File {
} _union;
TQString _name;
File* _parent;
- TQPtrList<File> _tqchildren;
+ TQPtrList<File> _children;
RangeList _ranges;
public:
/**
@@ -80,7 +80,7 @@ public:
File( File* parent, FILE* fptr, int offset );
/**
- * Destroy the file entry and all of its tqchildren.
+ * Destroy the file entry and all of its children.
*/
~File();
@@ -95,7 +95,7 @@ public:
/**
* Recursively read the instance for this file entry and all of it's
- * tqchildren. This method is used when converting from an older index format.
+ * children. This method is used when converting from an older index format.
*
* @param version The version of the old tape index.
*/
@@ -103,7 +103,7 @@ public:
/**
* Write out the file entry to the open file. Entries for each of its
- * tqchildren will also be written.
+ * children will also be written.
*/
void write( FILE* fptr );
@@ -171,15 +171,15 @@ public:
File* getParent();
/**
- * Get the tqchildren of this file entry. A normal file will never have any
- * tqchildren. A directory may or may not have tqchildren.
+ * Get the children of this file entry. A normal file will never have any
+ * children. A directory may or may not have children.
*
- * @return A list of the immediate tqchildren of this file entry.
+ * @return A list of the immediate children of this file entry.
*/
const TQPtrList<File>& getChildren();
/**
- * Get the list of ranges of this file and all of its tqchildren.
+ * Get the list of ranges of this file and all of its children.
*
* @return A list of ranges.
*/
@@ -193,7 +193,7 @@ public:
void addChild( File* file );
/**
- * Recursively calculate the list of ranges for all of the file's tqchildren.
+ * Recursively calculate the list of ranges for all of the file's children.
*/
void calcRanges();
};
diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index 92621b6..1d19d0a 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -275,10 +275,10 @@ void IndexDlg::timerEvent( TQTimerEvent* )
_archiveCount++;
msg.setNum( _archiveCount );
_archives->setText( msg );
- msg = i18n( "Indexing archive %1." ).tqarg( _archiveCount );
+ msg = i18n( "Indexing archive %1." ).arg( _archiveCount );
_log->append( msg );
- msg = i18n( "Archive %1" ).tqarg( _archiveCount );
+ msg = i18n( "Archive %1" ).arg( _archiveCount );
_archive = new Archive( _tape, 0, msg );
_fileName = TQString();
_fileSize = -1;
@@ -349,7 +349,7 @@ void IndexDlg::updateStats()
_kbytesRead->setText( str );
if ( elapsed > 0 ) {
- str = i18n( "%1/min" ).tqarg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
+ str = i18n( "%1/min" ).arg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
_transferRate->setText( str );
}
}
diff --git a/kdat/InfoShellWidget.h b/kdat/InfoShellWidget.h
index 0f87585..62f2c5f 100644
--- a/kdat/InfoShellWidget.h
+++ b/kdat/InfoShellWidget.h
@@ -42,7 +42,7 @@ public:
~InfoShellWidget();
protected:
/**
- * Resize all tqchildren to fill all of the available space within the shell.
+ * Resize all children to fill all of the available space within the shell.
*/
virtual void resizeEvent( TQResizeEvent* e );
};
diff --git a/kdat/KDat.kdoc b/kdat/KDat.kdoc
index 2bf6349..7297e64 100644
--- a/kdat/KDat.kdoc
+++ b/kdat/KDat.kdoc
@@ -12,7 +12,7 @@ Archive::startBlock=Archive.html#startBlock
Archive::endBlock=Archive.html#endBlock
Archive::name=Archive.html#name
Archive::files=Archive.html#files
-Archive::tqchildren=Archive.html#tqchildren
+Archive::children=Archive.html#children
Archive::setEndBlock=Archive.html#setEndBlock
Archive::setName=Archive.html#setName
Archive::addFile=Archive.html#addFile
@@ -94,7 +94,7 @@ File::size=File.html#size
File::mtime=File.html#mtime
File::record=File.html#record
File::name=File.html#name
-File::tqchildren=File.html#tqchildren
+File::children=File.html#children
IndexDlg=IndexDlg.html
IndexDlg=IndexDlg.html
IndexDlg::_tarParser=IndexDlg.html#_tarParser
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index 9a7d776..110296b 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -152,7 +152,7 @@ KDatMainWindow::KDatMainWindow()
_menu->insertItem( i18n( "&File" ), _fileMenu );
_menu->insertItem( i18n( "&Settings" ), _editMenu );
_menu->insertSeparator();
- TQString about = i18n( "KDat Version %1\n\nKDat is a tar-based tape archiver.\n\nCopyright (c) 1998-2000 Sean Vyain\nCopyright (c) 2001-2002 Lawrence Widman\nkdat@cardiothink.com" ).tqarg( KDAT_VERSION );
+ TQString about = i18n( "KDat Version %1\n\nKDat is a tar-based tape archiver.\n\nCopyright (c) 1998-2000 Sean Vyain\nCopyright (c) 2001-2002 Lawrence Widman\nkdat@cardiothink.com" ).arg( KDAT_VERSION );
_menu->insertItem( i18n( "&Help" ), helpMenu( about ) );
_toolbar = new KToolBar( this );
@@ -387,7 +387,7 @@ void KDatMainWindow::localSelected( int index )
_tree->expandItem( index );
_tree->collapseItem( index ); // 2002-01-30 LEW
}
- // tqrepaint(); // this doesn't work 2002-01-30 LEW
+ // repaint(); // this doesn't work 2002-01-30 LEW
/* 2002-01-30 LEW: RG and I don't like this behavior */
}
@@ -419,7 +419,7 @@ void KDatMainWindow::fileBackup()
TQString msg = i18n("KDat will dump your files properly to tape, but may not be able\n"
"to restore them. To restore your files by hand, you need to know\n"
"the name of the *non-rewinding* version of your tape device %1.\n"
- ).tqarg(Options::instance()->getTapeDevice());
+ ).arg(Options::instance()->getTapeDevice());
TQString msg2 = i18n("For example, if your device is /dev/st0, the non-rewinding version\n"
"is /dev/nst0. If your device name doesn't look like that, type\n"
"\"ls -l %2\" in a terminal window to see the real name of your\n"
@@ -430,7 +430,7 @@ void KDatMainWindow::fileBackup()
"The third call to \"tar\" will retrieve your data into your\n"
"current directory. Please let us know if this happens to you!\n"
" - KDat Maintenance Team\n"
- ).tqarg(Options::instance()->getTapeDevice());
+ ).arg(Options::instance()->getTapeDevice());
msg = msg.append(msg2);
KMessageBox::sorry( this, msg);
/* 2002-01-28 LEW */
@@ -446,7 +446,7 @@ void KDatMainWindow::fileBackup()
backupProfile.setRemoveSnapshot( bp->getRemoveSnapshot() );
} else {
TQString name;
- name = i18n( "Archive created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
+ name = i18n( "Archive created on %1" ).arg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
name = name.stripWhiteSpace();
TQStringList files;
@@ -486,8 +486,8 @@ void KDatMainWindow::fileBackup()
msg = i18n( "WARNING: The estimated archive size is %1 KB but "
"the tape has only %2 KB of space!\n"
"Back up anyway?" )
- .tqarg(KGlobal::locale()->formatNumber(size, 0))
- .tqarg(KGlobal::locale()->formatNumber(TapeManager::instance()->getMountedTape()->getSize() - tapeSize, 0 ));
+ .arg(KGlobal::locale()->formatNumber(size, 0))
+ .arg(KGlobal::locale()->formatNumber(TapeManager::instance()->getMountedTape()->getSize() - tapeSize, 0 ));
int result = KMessageBox::warningContinueCancel( this,
msg, i18n("Backup"), i18n("Backup") );
if ( result != KMessageBox::Continue) {
@@ -600,7 +600,7 @@ void KDatMainWindow::doVerify( bool restore )
ranges.addRange( it.current()->getStart(), it.current()->getEnd() );
}
if ( rangeableNode->isType( Node::MountedArchiveNodeType ) ) {
- // Make sure the mounted archive node has populated its tqchildren.
+ // Make sure the mounted archive node has populated its children.
archiveNode = (MountedArchiveNode*)rangeableNode;
if ( archiveNode->childCount() == 0 ) {
bool dummy = TRUE;
@@ -627,7 +627,7 @@ void KDatMainWindow::doVerify( bool restore )
// Compile a list of files to verify/restore.
TQPtrStack<RangeableNode> stack;
- // Make sure the mounted archive node has populated its tqchildren.
+ // Make sure the mounted archive node has populated its children.
if ( archiveNode->childCount() == 0 ) {
bool dummy = TRUE;
archiveNode->expanding( dummy );
@@ -697,7 +697,7 @@ void KDatMainWindow::fileMountTape()
"correct device is selected as the tape drive (e.g.\n"
"/dev/st0). If you hear the tape drive moving, wait\n"
"until it stops and then try mounting it again.")
- .tqarg(Options::instance()->getTapeDevice());
+ .arg(Options::instance()->getTapeDevice());
if ( !TapeManager::instance()->getMountedTape() ) {
if ( Options::instance()->getLoadOnMount() ) {
@@ -727,7 +727,7 @@ void KDatMainWindow::fileIndexTape()
IndexDlg dlg( TapeManager::instance()->getMountedTape(), this );
if ( dlg.exec() == TQDialog::Accepted ) {
TQString title;
- title = i18n( "KDat: %1" ).tqarg( TapeManager::instance()->getMountedTape()->getName() );
+ title = i18n( "KDat: %1" ).arg( TapeManager::instance()->getMountedTape()->getName() );
setCaption( title );
setIconText( title );
@@ -776,7 +776,7 @@ void KDatMainWindow::fileDeleteArchive()
}
TQString msg =
- i18n( "An archive cannot be removed from the middle of the tape. If\nthe archive '%1' is deleted then\nthe following archives will also be deleted:\n%2\n\nDelete all listed archives?" ).tqarg(archive->getName()).tqarg(list);
+ i18n( "An archive cannot be removed from the middle of the tape. If\nthe archive '%1' is deleted then\nthe following archives will also be deleted:\n%2\n\nDelete all listed archives?" ).arg(archive->getName()).arg(list);
int result = KMessageBox::warningContinueCancel( this,
msg, i18n("Delete Archive"), i18n("Delete All"));
if (result == KMessageBox::Continue) {
@@ -790,7 +790,7 @@ void KDatMainWindow::fileDeleteArchive()
} else {
// This is the last (known) archive on the tape.
TQString msg =
- i18n( "Really delete the archive '%1'?" ).tqarg(archive->getName());
+ i18n( "Really delete the archive '%1'?" ).arg(archive->getName());
int result = KMessageBox::warningContinueCancel( this,
msg, i18n("Delete Archive"), i18n("Delete"));
if (result == KMessageBox::Continue) {
@@ -824,7 +824,7 @@ void KDatMainWindow::fileDeleteIndex()
}
TQString msg =
- i18n( "Really delete the index for '%1'?" ).tqarg(tape->getName());
+ i18n( "Really delete the index for '%1'?" ).arg(tape->getName());
int result = KMessageBox::warningContinueCancel( this,
msg, i18n("Delete Tape Index"), i18n("Delete"));
if (result == KMessageBox::Continue) {
@@ -847,7 +847,7 @@ void KDatMainWindow::fileFormatTape()
"correct device is selected as the tape drive (e.g.\n"
"/dev/st0). If you hear the tape drive moving, wait\n"
"until it stops and then try mounting it again.")
- .tqarg(Options::instance()->getTapeDevice());
+ .arg(Options::instance()->getTapeDevice());
if ( !TapeDrive::instance()->isTapePresent() ) {
KMessageBox::sorry( this, msg );
@@ -865,7 +865,7 @@ void KDatMainWindow::fileFormatTape()
i18n("Format Tape"), i18n("Format"));
if (result == KMessageBox::Continue ) {
TQString name;
- name = i18n( "Tape created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
+ name = i18n( "Tape created on %1" ).arg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
FormatOptDlg dlg( name.stripWhiteSpace(), this );
if ( dlg.exec() != TQDialog::Accepted ) {
return;
@@ -898,7 +898,7 @@ void KDatMainWindow::fileNewBackupProfile()
// Pick a unique name.
TQString name;
for ( int i = 1; ; i++ ) {
- name = i18n( "Backup Profile %1").tqarg( i );
+ name = i18n( "Backup Profile %1").arg( i );
TQStringList list = BackupProfileManager::instance()->getBackupProfileNames();
TQStringList::Iterator it = list.begin();
for ( ; it != list.end(); ++it ) {
@@ -946,7 +946,7 @@ void KDatMainWindow::fileDeleteBackupProfile()
assert( backupProfile );
TQString msg =
- i18n("Really delete backup profile '%1'?").tqarg(backupProfile->getName());
+ i18n("Really delete backup profile '%1'?").arg(backupProfile->getName());
int result = KMessageBox::warningContinueCancel( this,
msg, i18n("Delete Backup Profile"), i18n("Delete"));
if (result == KMessageBox::Continue) {
@@ -1103,8 +1103,8 @@ int KDatMainWindow::calcBackupSize( const TQString& workingDir, bool local, cons
if( stop_flag == TRUE ) break;
TQString* path = dirStack.pop();
msg = i18n("Estimating backup size: %1, %2" )
- .tqarg(Util::kbytesToString( size / 2 ))
- .tqarg(KStringHandler::csqueeze(*path, 60));
+ .arg(Util::kbytesToString( size / 2 ))
+ .arg(KStringHandler::csqueeze(*path, 60));
status( msg );
KApplication::kApplication()->processEvents();
dir.setPath( *path );
@@ -1232,7 +1232,7 @@ void KDatMainWindow::configureUI( Tape* tape )
// Title bar
if ( tape ) {
TQString title;
- title = i18n( "KDat: %1" ).tqarg(tape->getName());
+ title = i18n( "KDat: %1" ).arg(tape->getName());
setCaption( title );
setIconText( title );
} else {
diff --git a/kdat/Node.cpp b/kdat/Node.cpp
index 6e1b174..cfc0610 100644
--- a/kdat/Node.cpp
+++ b/kdat/Node.cpp
@@ -211,7 +211,7 @@ void TapeNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the tqchildren added
+ // We already have the children added
return;
}
@@ -280,7 +280,7 @@ void ArchiveNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the tqchildren added.
+ // We already have the children added.
return;
}
@@ -338,7 +338,7 @@ void TapeDirectoryNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the tqchildren added.
+ // We already have the children added.
return;
}
@@ -443,7 +443,7 @@ void SelectableNode::doUpdateState()
void SelectableNode::doSetSelected( bool select )
{
- // All my tqchildren get the same selection state.
+ // All my children get the same selection state.
for ( uint i = 0; i < childCount(); i++ ) {
if ( select ) {
if ( !((SelectableNode*)childAt( i ))->isSelected() ) {
@@ -605,7 +605,7 @@ void SelectableNode::setSelected( bool select )
((SelectableNode*)getParent())->doUpdateState();
}
- owner->tqrepaint();
+ owner->repaint();
KDatMainWindow::getInstance()->configureUI( TapeManager::instance()->getMountedTape() );
}
@@ -680,7 +680,7 @@ void MountedArchiveNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the tqchildren added.
+ // We already have the children added.
return;
}
@@ -780,7 +780,7 @@ void MountedTapeDirectoryNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the tqchildren added.
+ // We already have the children added.
return;
}
@@ -934,7 +934,7 @@ void RootNode::expanding( bool expand )
{
expand = TRUE;
- // If we already have some tqchildren, check to see if the directory has been modified.
+ // If we already have some children, check to see if the directory has been modified.
if ( childCount() > 0 ) {
struct stat statinfo;
if ( stat( "/", &statinfo ) < 0 ) {
@@ -950,7 +950,7 @@ void RootNode::expanding( bool expand )
_mtime = statinfo.st_mtime;
- // Remove all the tqchildren.
+ // Remove all the children.
Node* n;
while ( ( n = (Node*)getChild() ) ) {
removeChild( n );
@@ -975,7 +975,7 @@ void RootNode::expanding( bool expand )
return;
}
- // Fill in the child's tqchildren.
+ // Fill in the child's children.
const TQFileInfoList* list = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, TQDir::Name | TQDir::DirsFirst );
if ( list ) {
TQFileInfoListIterator it( *list );
@@ -1050,7 +1050,7 @@ void DirectoryNode::expanding( bool expand )
}
path.prepend( "/" );
- // If we already have some tqchildren, check to see if the directory has been modified.
+ // If we already have some children, check to see if the directory has been modified.
if ( childCount() > 0 ) {
struct stat statinfo;
if ( stat( TQFile::encodeName(path), &statinfo ) < 0 ) {
@@ -1066,7 +1066,7 @@ void DirectoryNode::expanding( bool expand )
_mtime = statinfo.st_mtime;
- // Remove all the tqchildren.
+ // Remove all the children.
Node* n;
while ( ( n = (Node*)getChild() ) ) {
removeChild( n );
@@ -1091,7 +1091,7 @@ void DirectoryNode::expanding( bool expand )
return;
}
- // Fill in the child's tqchildren.
+ // Fill in the child's children.
const TQFileInfoList* list = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, TQDir::Name | TQDir::DirsFirst );
if ( list ) {
TQFileInfoListIterator it( *list );
@@ -1210,7 +1210,7 @@ void TapeDriveNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the tqchildren added
+ // We already have the children added
return;
}
@@ -1254,7 +1254,7 @@ void TapeDriveNode::slotTapeUnmounted()
setPixmap( *ImageCache::instance()->getTapeUnmounted() );
setText( i18n( "<no tape>" ) );
- // Remove all the tqchildren.
+ // Remove all the children.
Node* n;
while ( ( n = (Node*)getChild() ) ) {
Node::removeChild( n );
diff --git a/kdat/Node.h b/kdat/Node.h
index d2d0c26..2caa24b 100644
--- a/kdat/Node.h
+++ b/kdat/Node.h
@@ -90,7 +90,7 @@ public:
/**
* This method is called immediately before the node is to be expanded.
- * This method can be used to fill in the tqchildren of this node, or
+ * This method can be used to fill in the children of this node, or
* prevent the node from expanding. The default implementation does
* nothing.
*
@@ -359,7 +359,7 @@ public:
virtual bool isType( int type );
/**
- * Determine whether the node and all of its tqchildren are selected.
+ * Determine whether the node and all of its children are selected.
*
* @return TRUE if the node is selected, otherwise FALSE.
*/
@@ -373,7 +373,7 @@ public:
bool hasSelectedChildren();
/**
- * Select/deselect this node and all of its tqchildren.
+ * Select/deselect this node and all of its children.
*
* @param selected TRUE means the node will be selected, FALSE means the
* node will be deselected.
@@ -445,7 +445,7 @@ public:
virtual const TQPtrList<Range>& getRanges();
/**
- * Select/deselect this node and all of its tqchildren.
+ * Select/deselect this node and all of its children.
*
* @param selected TRUE means the node will be selected, FALSE means the
* node will be deselected.
@@ -516,7 +516,7 @@ public:
virtual const TQPtrList<Range>& getRanges();
/**
- * Select/deselect this node and all of its tqchildren.
+ * Select/deselect this node and all of its children.
*
* @param selected TRUE means the node will be selected, FALSE means the
* node will be deselected.
@@ -596,7 +596,7 @@ public:
virtual const TQPtrList<Range>& getRanges();
/**
- * Select/deselect this node and all of its tqchildren.
+ * Select/deselect this node and all of its children.
*
* @param selected TRUE means the node will be selected, FALSE means the
* node will be deselected.
@@ -863,7 +863,7 @@ public slots:
/**
* Locate the child associated with the modified tape index, and make sure
- * that the displayed information (including all tqchildren) is updated.
+ * that the displayed information (including all children) is updated.
*
* @param tape A pointer to the tape index that was modified.
*/
@@ -924,7 +924,7 @@ public slots:
/**
* Locate the child associated with the modified tape index, and make sure
- * that the displayed information (including all tqchildren) is updated.
+ * that the displayed information (including all children) is updated.
*
* @param tape A pointer to the tape index that was modified.
*/
diff --git a/kdat/Tape.cpp b/kdat/Tape.cpp
index 1f762c3..ff35d1a 100644
--- a/kdat/Tape.cpp
+++ b/kdat/Tape.cpp
@@ -216,7 +216,7 @@ void Tape::read()
default:
{
KMessageBox::sorry( KDatMainWindow::getInstance(),
- i18n( "The tape index file format is version %d. The index cannot be read by this version of KDat. Perhaps the tape index file was created by a newer version of KDat?" ).tqarg(version ),
+ i18n( "The tape index file format is version %d. The index cannot be read by this version of KDat. Perhaps the tape index file was created by a newer version of KDat?" ).arg(version ),
i18n("Tape Index") );
}
}
@@ -226,7 +226,7 @@ void Tape::readAll( int version )
{
read();
- TQPtrListIterator<Archive> i( _tqchildren );
+ TQPtrListIterator<Archive> i( _children );
for ( ; i.current(); ++i ) {
i.current()->readAll( version );
}
@@ -282,7 +282,7 @@ void Tape::write()
memset( buf, 0, 4096 );
memcpy( buf, _name.ascii(), _name.length() > 4095 ? 4095 : _name.length() );
fwrite( buf, sizeof( char ), 4096, _fptr );
- int ival = _tqchildren.count();
+ int ival = _children.count();
fwrite( &ival, sizeof( ival ), 1, _fptr );
// Fill in the archive offsets later...
@@ -292,7 +292,7 @@ void Tape::write()
}
//===== Write archives =====
- TQPtrListIterator<Archive> i( _tqchildren );
+ TQPtrListIterator<Archive> i( _children );
int count = 0;
for ( ; i.current(); ++i, count++ ) {
// Fill in the file offset.
@@ -346,7 +346,7 @@ const TQPtrList<Archive>& Tape::getChildren()
{
read();
- return _tqchildren;
+ return _children;
}
void Tape::setName( const TQString & name )
@@ -528,7 +528,7 @@ void Tape::addChild( Archive* archive )
archive->calcRanges();
- _tqchildren.append( archive );
+ _children.append( archive );
char buf[4096];
fseek( _fptr, 0, SEEK_END );
@@ -537,9 +537,9 @@ void Tape::addChild( Archive* archive )
fgets( buf, 4096, _fptr );
fgets( buf, 4096, _fptr );
fseek( _fptr, 12 + 4096, SEEK_CUR );
- int ival = _tqchildren.count();
+ int ival = _children.count();
fwrite( &ival, sizeof( ival ), 1, _fptr );
- fseek( _fptr, ( _tqchildren.count() - 1 ) * 4, SEEK_CUR );
+ fseek( _fptr, ( _children.count() - 1 ) * 4, SEEK_CUR );
fwrite( &here, sizeof( here ), 1, _fptr );
fseek( _fptr, here, SEEK_SET );
archive->write( _fptr );
@@ -559,21 +559,21 @@ void Tape::removeChild( Archive* archive )
{
read();
- while ( _tqchildren.last() != archive ) {
- _tqchildren.removeLast();
+ while ( _children.last() != archive ) {
+ _children.removeLast();
}
- _tqchildren.removeLast();
+ _children.removeLast();
char buf[4096];
fseek( _fptr, 0, SEEK_SET );
fgets( buf, 4096, _fptr );
fgets( buf, 4096, _fptr );
fseek( _fptr, 12 + 4096, SEEK_CUR );
- int ival = _tqchildren.count();
+ int ival = _children.count();
fwrite( &ival, sizeof( ival ), 1, _fptr );
int here;
if ( ival > 0 ) {
- fseek( _fptr, _tqchildren.count() * 4, SEEK_CUR );
+ fseek( _fptr, _children.count() * 4, SEEK_CUR );
fread( &here, sizeof( here ), 1, _fptr );
} else {
fseek( _fptr, MAX_NUM_ARCHIVES * 4, SEEK_CUR );
@@ -593,13 +593,13 @@ void Tape::removeChild( Archive* archive )
void Tape::clear()
{
- if ( _tqchildren.count() < 1 ) {
+ if ( _children.count() < 1 ) {
return;
}
- while ( _tqchildren.first() ) {
- delete _tqchildren.first();
- _tqchildren.removeFirst();
+ while ( _children.first() ) {
+ delete _children.first();
+ _children.removeFirst();
}
char buf[4096];
@@ -607,7 +607,7 @@ void Tape::clear()
fgets( buf, 4096, _fptr );
fgets( buf, 4096, _fptr );
fseek( _fptr, 12 + 4096, SEEK_CUR );
- int ival = _tqchildren.count();
+ int ival = _children.count();
fwrite( &ival, sizeof( ival ), 1, _fptr );
fseek( _fptr, MAX_NUM_ARCHIVES * 4, SEEK_CUR );
int here = ftell( _fptr );
@@ -711,7 +711,7 @@ void Tape::readVersion1Index( FILE* fptr )
Archive* archive = new Archive( this, archiveTimeStamp, archiveName );
archive->setEndBlock( archiveEndBlock - archiveStartBlock );
- _tqchildren.append( archive );
+ _children.append( archive );
// Read the number of files.
if ( !fgets( buf, 4096, fptr ) ) {
@@ -827,7 +827,7 @@ void Tape::readVersion2Index( FILE* fptr )
int ival;
for ( ; numArchives; numArchives-- ) {
fread( &ival, sizeof( ival ), 1, fptr );
- _tqchildren.append( new Archive( this, fptr, ival ) );
+ _children.append( new Archive( this, fptr, ival ) );
}
}
@@ -870,7 +870,7 @@ void Tape::readVersion3Index( FILE* fptr )
int ival;
for ( ; numArchives; numArchives-- ) {
fread( &ival, sizeof( ival ), 1, fptr );
- _tqchildren.append( new Archive( this, fptr, ival ) );
+ _children.append( new Archive( this, fptr, ival ) );
}
}
@@ -913,7 +913,7 @@ void Tape::readVersion4Index( FILE* fptr )
int ival;
for ( ; numArchives; numArchives-- ) {
fread( &ival, sizeof( ival ), 1, fptr );
- _tqchildren.append( new Archive( this, fptr, ival ) );
+ _children.append( new Archive( this, fptr, ival ) );
}
/* 2002-01-31 LEW */
diff --git a/kdat/Tape.h b/kdat/Tape.h
index 153561e..335619c 100644
--- a/kdat/Tape.h
+++ b/kdat/Tape.h
@@ -34,7 +34,7 @@ class Tape {
int _mtime;
TQString _name;
int _size;
- TQPtrList<Archive> _tqchildren;
+ TQPtrList<Archive> _children;
FILE* _fptr;
@@ -148,7 +148,7 @@ public:
void removeChild( Archive* archive );
/**
- * Recursively destroy all tqchildren of the tape index.
+ * Recursively destroy all children of the tape index.
*/
void clear();
};
diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp
index 9ee819a..1455743 100644
--- a/kdat/TapeInfoWidget.cpp
+++ b/kdat/TapeInfoWidget.cpp
@@ -203,9 +203,9 @@ void TapeInfoWidget::setTape( Tape* tape )
}
if ( _tape->getSize() > 0 ) {
tmp = TQString::fromLatin1( "%1 / %2 (%3%)")
- .tqarg(Util::kbytesToString( used ))
- .tqarg(Util::kbytesToString( _tape->getSize() ))
- .tqarg(used * 100 / _tape->getSize() );
+ .arg(Util::kbytesToString( used ))
+ .arg(Util::kbytesToString( _tape->getSize() ))
+ .arg(used * 100 / _tape->getSize() );
} else {
tmp = Util::kbytesToString( used );
}
diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp
index f15dcff..19477c9 100644
--- a/kdat/VerifyDlg.cpp
+++ b/kdat/VerifyDlg.cpp
@@ -409,7 +409,7 @@ void VerifyDlg::updateStats()
_kbytesRead->setText( str );
if ( elapsed > 0 ) {
- str = i18n( "%1/min" ).tqarg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
+ str = i18n( "%1/min" ).arg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
_transferRate->setText( str );
}
}
diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp
index 9c08c54..df68b3d 100644
--- a/kdat/ktreeview.cpp
+++ b/kdat/ktreeview.cpp
@@ -79,7 +79,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText,
KTreeViewItem::~KTreeViewItem()
{
if (deleteChildren) {
- // remove the tqchildren
+ // remove the children
KTreeViewItem* i = child;
while (i) {
KTreeViewItem* d = i;
@@ -133,7 +133,7 @@ KTreeViewItem* KTreeViewItem::childAt(int index) const
return item;
}
-// returns the number of tqchildren this item has
+// returns the number of children this item has
uint KTreeViewItem::childCount() const
{
return numChildren;
@@ -193,7 +193,7 @@ const TQString& KTreeViewItem::getText() const
return text;
}
-// indicates whether this item has any tqchildren
+// indicates whether this item has any children
bool KTreeViewItem::hasChild() const
{
return child != 0;
@@ -260,7 +260,7 @@ void KTreeViewItem::insertChild(int index, KTreeViewItem* newChild)
// indicates whether this item is displayed expanded
// NOTE: a TRUE response does not necessarily indicate the item
-// has any tqchildren
+// has any children
bool KTreeViewItem::isExpanded() const
{
return expanded;
@@ -403,7 +403,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
p->drawLine(parentLeaderX, cellCenterY, parentLeaderX, cellBottomY);
/*
- * If this item has tqchildren or siblings in the tree or is a child of
+ * If this item has children or siblings in the tree or is a child of
* an item other than the root item then draw the little line from the
* item out to the left.
*/
@@ -411,7 +411,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
parent->parent != 0 ||
/*
* The following handles the case of an item at the end of the
- * topmost level which doesn't have tqchildren.
+ * topmost level which doesn't have children.
*/
parent->getChild() != this)
{
@@ -435,7 +435,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
// removes the given (direct) child from the branch
bool KTreeViewItem::removeChild(KTreeViewItem* theChild)
{
- // search item in list of tqchildren
+ // search item in list of children
KTreeViewItem* prevItem = 0;
KTreeViewItem* toRemove = getChild();
while (toRemove && toRemove != theChild) {
@@ -646,7 +646,7 @@ void KTreeView::appendChildItem(const TQString & theText, const TQPixmap& thePix
appendChildItem(item, thePath);
}
-// appends the given item to the tqchildren of the item at the given index
+// appends the given item to the children of the item at the given index
void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
{
/* find parent item and append new item to parent's sub tree */
@@ -656,7 +656,7 @@ void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
appendChildItem(parentItem, newItem);
}
-// appends the given item to the tqchildren of the item at the end of the
+// appends the given item to the children of the item at the end of the
// given path
void KTreeView::appendChildItem(KTreeViewItem* newItem, const KPath& thePath)
{
@@ -744,7 +744,7 @@ void KTreeView::clear()
if(goingDown || TQApplication::closingDown())
return;
if(autoU && isVisible())
- tqrepaint();
+ repaint();
setAutoUpdate(autoU);
}
@@ -789,7 +789,7 @@ int KTreeView::expandLevel() const
// expands or collapses the subtree rooted at the given item,
// as approptiate
-// if item has no tqchildren, does nothing
+// if item has no children, does nothing
void KTreeView::expandOrCollapseItem(int index)
{
KTreeViewItem *item = itemAt(index);
@@ -813,7 +813,7 @@ bool KTreeView::forEveryItem(KForEvery func, void* user, KTreeViewItem* item)
if ((*func)(item, user)) {
return true;
}
- // visit the tqchildren (recursively)
+ // visit the children (recursively)
if (item->hasChild()) {
if (forEveryItem(func, user, item))
return true;
@@ -833,7 +833,7 @@ bool KTreeView::forEveryVisibleItem(KForEvery func, void *user,
if (item == 0) {
item = treeRoot;
} else {
- // tqchildren are invisible (hence, nothing to do)
+ // children are invisible (hence, nothing to do)
// if item is invisible or collapsed
if (!item->isVisible() || !item->isExpanded()) {
return false;
@@ -847,7 +847,7 @@ bool KTreeView::forEveryVisibleItem(KForEvery func, void *user,
if ((*func)(item, user)) {
return true;
}
- // visit the tqchildren (recursively)
+ // visit the children (recursively)
if (item->hasChild() && item->isExpanded()) {
if (forEveryVisibleItem(func, user, item))
return true;
@@ -1113,7 +1113,7 @@ void KTreeView::setExpandButtonDrawing(bool enable)
drawExpandButton = enable;
forEveryItem(&KTreeView::setItemExpandButtonDrawing, 0);
if(autoUpdate() && isVisible())
- tqrepaint();
+ repaint();
}
// sets depth to which subtrees are automatically expanded, and
@@ -1132,7 +1132,7 @@ void KTreeView::setExpandLevel(int level)
}
setCurrentItem(itemRow(item));
if(autoUpdate() && isVisible())
- tqrepaint();
+ repaint();
}
// sets the indent margin for all branches and repaints if auto update enabled
@@ -1143,7 +1143,7 @@ void KTreeView::setIndentSpacing(int spacing)
itemIndent = spacing;
updateCellWidth();
if (autoUpdate() && isVisible())
- tqrepaint();
+ repaint();
}
// enables/disables vertical scrollbar
@@ -1160,7 +1160,7 @@ void KTreeView::setShowItemText(bool enable)
showText = enable;
forEveryItem(&KTreeView::setItemShowText, 0);
if(autoUpdate() && isVisible())
- tqrepaint();
+ repaint();
}
// indicates whether vertical scrolling is by pixel or row
@@ -1177,7 +1177,7 @@ void KTreeView::setTreeDrawing(bool enable)
drawTree = enable;
forEveryItem(&KTreeView::setItemTreeDrawing, 0);
if(autoUpdate() && isVisible())
- tqrepaint();
+ repaint();
}
// indicates whether item text keys are displayed
@@ -1251,18 +1251,18 @@ void KTreeView::appendChildItem(KTreeViewItem* theParent,
newItem->setExpanded(true);
}
- // fix up branch levels of any tqchildren that the new item may already have
+ // fix up branch levels of any children that the new item may already have
if(newItem->hasChild()) {
fixChildren(newItem);
}
- // if necessary, adjust cell width, number of rows and tqrepaint
+ // if necessary, adjust cell width, number of rows and repaint
if (newItem->isVisible() || theParent->childCount() == 1) {
bool autoU = autoUpdate();
setAutoUpdate(false);
updateVisibleItems();
if(autoU && isVisible())
- tqrepaint();
+ repaint();
setAutoUpdate(autoU);
}
}
@@ -1302,7 +1302,7 @@ void KTreeView::collapseSubTree(KTreeViewItem* subRoot)
}
}
// roland
- tqrepaint();
+ repaint();
setAutoUpdate(TRUE);
// roland
}
@@ -1331,7 +1331,7 @@ void KTreeView::expandOrCollapse(KTreeViewItem* parent)
emit expanded(parentIndex);
}
if (autoU && isVisible())
- tqrepaint();
+ repaint();
setAutoUpdate(autoU);
}
@@ -1361,7 +1361,7 @@ void KTreeView::expandSubTree(KTreeViewItem* subRoot)
}
}
// roland
- tqrepaint();
+ repaint();
setAutoUpdate(TRUE);
// roland
@@ -1493,7 +1493,7 @@ bool KTreeView::insertItem(KTreeViewItem* referenceItem,
}
else {
// no reference item, append at end of visible tree
- // need to tqrepaint
+ // need to repaint
parentItem = treeRoot;
parentItem->appendChild(newItem);
}
@@ -1502,18 +1502,18 @@ bool KTreeView::insertItem(KTreeViewItem* referenceItem,
if (level(newItem) < expansion)
newItem->setExpanded(true);
- // fix up branch levels of any tqchildren
+ // fix up branch levels of any children
if (newItem->hasChild())
fixChildren(newItem);
- // if tqrepaint necessary, do it if visible and auto update
+ // if repaint necessary, do it if visible and auto update
// enabled
if (newItem->isVisible() || parentItem->childCount() == 1) {
bool autoU = autoUpdate();
setAutoUpdate(FALSE);
updateVisibleItems();
if(autoU && isVisible())
- tqrepaint();
+ repaint();
setAutoUpdate(autoU);
}
return true;
@@ -1545,7 +1545,7 @@ void KTreeView::join(KTreeViewItem *item)
takeItem(item);
insertItem(itemParent, item, FALSE);
if(autoU && isVisible())
- tqrepaint();
+ repaint();
setAutoUpdate(autoU);
}
}
@@ -1651,7 +1651,7 @@ void KTreeView::lowerItem(KTreeViewItem *item)
takeItem(item);
insertItem(itemParent->childAt(itemChildIndex), item, FALSE);
if(autoU && isVisible())
- tqrepaint();
+ repaint();
setAutoUpdate(autoU);
}
}
@@ -1877,7 +1877,7 @@ void KTreeView::raiseItem(KTreeViewItem *item)
takeItem(item);
insertItem(itemParent->childAt(--itemChildIndex), item, TRUE);
if(autoU && isVisible())
- tqrepaint();
+ repaint();
setAutoUpdate(autoU);
}
}
@@ -1897,7 +1897,7 @@ KTreeViewItem* KTreeView::recursiveFind(KPath& path)
return 0;
/*
- * Iterate through the parent's tqchildren searching for searchString.
+ * Iterate through the parent's children searching for searchString.
*/
KTreeViewItem* sibling = parent->getChild();
while (sibling != 0) {
@@ -1963,7 +1963,7 @@ void KTreeView::split(KTreeViewItem *item)
takeItem(item);
appendChildItem(itemParent->childAt(--itemChildIndex), item);
if(autoU && isVisible())
- tqrepaint();
+ repaint();
setAutoUpdate(autoU);
}
@@ -2003,7 +2003,7 @@ void KTreeView::takeItem(KTreeViewItem* item)
updateVisibleItems();
if (autoU && isVisible())
- tqrepaint();
+ repaint();
setAutoUpdate(autoU);
}
@@ -2041,10 +2041,10 @@ void KTreeView::updateVisibleItemRec(KTreeViewItem* item, int& index, int& count
}
/*
- * Record the tqchildren of item in the list of visible items.
+ * Record the children of item in the list of visible items.
*
* Don't register item itself, it's already in the list. Also only
- * allocate new space for tqchildren.
+ * allocate new space for children.
*/
count += item->childCount();
if (count > itemCapacity) {
@@ -2066,7 +2066,7 @@ void KTreeView::updateVisibleItemRec(KTreeViewItem* item, int& index, int& count
visibleItems = newItems;
itemCapacity = newCapacity;
}
- // insert tqchildren
+ // insert children
for (KTreeViewItem* i = item->getChild(); i != 0; i = i->getSibling()) {
visibleItems[index++] = i;
updateVisibleItemRec(i, index, count);
diff --git a/kdat/ktreeview.h b/kdat/ktreeview.h
index deed0f8..6e43518 100644
--- a/kdat/ktreeview.h
+++ b/kdat/ktreeview.h
@@ -43,18 +43,18 @@ public:
* item can be constructed this way, the text has to be non-null when
* the item is added to the tree, or it will not be inserted.
*
- * The constructor sets the delete-tqchildren flag to false. This flag
+ * The constructor sets the delete-children flag to false. This flag
* tells the item whether it shall delete the child items when it is
* itself deleted. By default the creator of the item is responsible to
* also delete the child items. (However, the versions of
* KTreeView::appendChildItem and KTreeView::insertChildItem that do
- * not take a KTreeViewItem set the delete-tqchildren flag to true.)
+ * not take a KTreeViewItem set the delete-children flag to true.)
*/
KTreeViewItem(const TQString& theText = TQString()); // text can not be null when added to the list!
KTreeViewItem(const TQString& theText, const TQPixmap& thePixmap);
/**
- * Destructor. It destroys its tqchildren if this item has been marked
+ * Destructor. It destroys its children if this item has been marked
* with setDeleteChildren(true).
*/
virtual ~KTreeViewItem();
@@ -123,7 +123,7 @@ public:
const TQString& getText() const;
/**
- * Indicates whether this item has any tqchildren.
+ * Indicates whether this item has any children.
*/
bool hasChild() const;
@@ -152,7 +152,7 @@ public:
* items (if any) would be visible if this item were visible.
*
* Note: If this function returns true, it does not necessarily indicate that
- * this item is visible or that this item has any tqchildren.
+ * this item is visible or that this item has any children.
*/
bool isExpanded() const;
@@ -174,12 +174,12 @@ public:
* Sets the delayed-expanding flag. If this flag is true, the expanding
* signal is emitted when the item is about to be expanded. The expand
* button is always painted for this item, even if it doesn't have
- * tqchildren.
+ * children.
*/
void setDelayedExpanding(bool flag);
/**
- * Tells the item whether it should delete its tqchildren when it is
+ * Tells the item whether it should delete its children when it is
* deleted. The default is false, which means that the child items must
* be deleted explicitly.
*/
@@ -417,8 +417,8 @@ public:
/**
* Appends a new child item to the item at the specified row. If that
- * item already has tqchildren, the new item is appended below these
- * tqchildren. A KTreeViewItem is created for which the delete-tqchildren
+ * item already has children, the new item is appended below these
+ * children. A KTreeViewItem is created for which the delete-children
* flag is set to true.
*/
void appendChildItem(const TQString & theText, const TQPixmap& thePixmap,
@@ -432,8 +432,8 @@ public:
/**
* Appendss the specified item as a child of the item that is at the
- * specified row. If that item already has tqchildren, the new item is
- * appended below these tqchildren.
+ * specified row. If that item already has children, the new item is
+ * appended below these children.
*/
void appendChildItem(KTreeViewItem* newItem, int index);
@@ -529,7 +529,7 @@ public:
/**
* Iterates every item in the tree, visible or not, and applies the
* function func with a pointer to each item and user data supplied as
- * parameters. The tqchildren of the specified root item are visited
+ * parameters. The children of the specified root item are visited
* (root itself is not visited!). If root is 0 all items in the tree
* are visited. KForEveryFunc is defined as:
*
@@ -568,7 +568,7 @@ public:
* the value of prefix. The new item is added to the same branch as the
* referenced item. If row is -1, the item is simply appended to the
* tree at the topmost level. A KTreeViewItem is created for which the
- * delete-tqchildren flag is set to true. Returns true if the item has
+ * delete-children flag is set to true. Returns true if the item has
* been successfully inserted in the tree, otherwise false.
*/
bool insertItem(const TQString & theText, const TQPixmap& thePixmap,
diff --git a/kfile-plugins/rpm/kfile_rpm.cpp b/kfile-plugins/rpm/kfile_rpm.cpp
index 72cf72a..39ef9c1 100644
--- a/kfile-plugins/rpm/kfile_rpm.cpp
+++ b/kfile-plugins/rpm/kfile_rpm.cpp
@@ -126,18 +126,18 @@ bool KRpmPlugin::readInfo( KFileMetaInfo& info, uint what)
case RPM_INT32_TYPE: uint32_t int32tag;
dstream >> int32tag;
if ( !tagname.isEmpty() ) appendItem(general, tagname, int(int32tag));
- if ( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), TQString("%1").tqarg( int32tag ));
+ if ( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), TQString("%1").arg( int32tag ));
break;
case RPM_INT16_TYPE: uint16_t int16tag;
dstream >> int16tag;
if ( !tagname.isEmpty() ) appendItem(general, tagname, int(int16tag));
- if ( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), TQString("%1").tqarg( int16tag ));
+ if ( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), TQString("%1").arg( int16tag ));
break;
case RPM_I18NSTRING_TYPE: // Fallthru
case RPM_STRING_TYPE: TQString strtag; char in;
while ( ( in = file.getch() ) != '\0' ) strtag += in;
if ( !tagname.isEmpty() ) appendItem(general, tagname, strtag);
- if( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), strtag);
+ if( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), strtag);
break;
}
file.at(oldPos); // Restore old position
diff --git a/knetworkconf/backends/parse.pl.in b/knetworkconf/backends/parse.pl.in
index 0a02012..25c9373 100644
--- a/knetworkconf/backends/parse.pl.in
+++ b/knetworkconf/backends/parse.pl.in
@@ -1451,12 +1451,12 @@ sub gst_parse_xml
sub gst_parse_xml_child_names
{
my ($file, $varpath) = @_;
- my ($model, $branch, @tqchildren);
+ my ($model, $branch, @children);
($model) = &gst_xml_model_scan ($file);
$branch = &gst_xml_model_find ($model, $varpath);
- if (!$branch) { return @tqchildren; }
+ if (!$branch) { return @children; }
my @list = @$branch;
shift @list; # Attributes
@@ -1465,7 +1465,7 @@ sub gst_parse_xml_child_names
{
if ($list [0] ne "__unparsed__" && $list [0] ne "0")
{
- push @tqchildren, shift @list;
+ push @children, shift @list;
}
else
{
@@ -1475,7 +1475,7 @@ sub gst_parse_xml_child_names
shift @list;
}
- return @tqchildren;
+ return @children;
}
sub gst_parse_alchemist
@@ -1505,7 +1505,7 @@ sub gst_parse_alchemist_print_option
return undef if (!$branch);
- $options = &gst_xml_model_get_tqchildren ($branch);
+ $options = &gst_xml_model_get_children ($branch);
foreach $o (@$options)
{
diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in
index 8114f19..a72e3ef 100644
--- a/knetworkconf/backends/replace.pl.in
+++ b/knetworkconf/backends/replace.pl.in
@@ -1457,22 +1457,22 @@ sub gst_replace_alchemist_ensure_list_types
for $elem (@path)
{
next if ($elem eq "");
- my @tqchildren = @$branch;
- shift @tqchildren; # Attributes
+ my @children = @$branch;
+ shift @children; # Attributes
$branch = undef;
- while (@tqchildren)
+ while (@children)
{
- if ($tqchildren [0] eq $elem)
+ if ($children [0] eq $elem)
{
- shift @tqchildren;
- $branch = shift @tqchildren;
+ shift @children;
+ $branch = shift @children;
&gst_xml_model_set_attribute ($branch, "TYPE", "LIST");
last;
}
- shift @tqchildren;
- shift @tqchildren;
+ shift @children;
+ shift @children;
}
last if ($branch == undef);
@@ -1532,7 +1532,7 @@ sub gst_replace_alchemist_print_option
# See if option is already defined.
- $options = &gst_xml_model_get_tqchildren ($branch);
+ $options = &gst_xml_model_get_children ($branch);
foreach $o (@$options)
{
diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in
index cd2201c..b9810c6 100644
--- a/knetworkconf/backends/xml.pl.in
+++ b/knetworkconf/backends/xml.pl.in
@@ -352,34 +352,34 @@ sub gst_xml_model_print_recurse
my ($tree, $indent) = @_;
my ($string);
- my @tqchildren = @$tree;
- shift @tqchildren; # Attributes
+ my @children = @$tree;
+ shift @children; # Attributes
- while (@tqchildren)
+ while (@children)
{
- my $branch = $tqchildren [1];
+ my $branch = $children [1];
- if ($tqchildren [0] eq "__unparsed__")
+ if ($children [0] eq "__unparsed__")
{
- $string .= "<" . $tqchildren [1] . ">";
+ $string .= "<" . $children [1] . ">";
}
- elsif ($tqchildren [0] eq "0")
+ elsif ($children [0] eq "0")
{
- $string .= $tqchildren [1];
+ $string .= $children [1];
}
elsif (@$branch == 1) # Empty tag.
{
- $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . "/>";
+ $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . "/>";
}
else
{
- $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . ">";
+ $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . ">";
$string .= &gst_xml_model_print_recurse ($branch);
- $string .= "</" . $tqchildren [0] . ">";
+ $string .= "</" . $children [0] . ">";
}
- shift @tqchildren;
- shift @tqchildren;
+ shift @children;
+ shift @children;
}
# if ($branch)
@@ -825,21 +825,21 @@ sub gst_xml_model_find
for $elem (@path)
{
next if ($elem eq "");
- my @tqchildren = @$branch;
- shift @tqchildren; # Attributes
+ my @children = @$branch;
+ shift @children; # Attributes
$branch = undef;
- while (@tqchildren)
+ while (@children)
{
- if ($tqchildren [0] eq $elem)
+ if ($children [0] eq $elem)
{
- shift @tqchildren;
- $branch = shift @tqchildren;
+ shift @children;
+ $branch = shift @children;
last;
}
- shift @tqchildren;
- shift @tqchildren;
+ shift @children;
+ shift @children;
}
last if ($branch == undef);
@@ -890,23 +890,23 @@ sub gst_xml_model_ensure
{
next if ($elem eq "");
- my @tqchildren = @$branch;
+ my @children = @$branch;
my $parent_branch = $branch;
- shift @tqchildren; # Attributes
+ shift @children; # Attributes
$branch = undef;
- while (@tqchildren)
+ while (@children)
{
- if ($tqchildren [0] eq $elem)
+ if ($children [0] eq $elem)
{
- shift @tqchildren;
- $branch = shift @tqchildren;
+ shift @children;
+ $branch = shift @children;
last;
}
- shift @tqchildren;
- shift @tqchildren;
+ shift @children;
+ shift @children;
}
if ($branch == undef)
@@ -950,22 +950,22 @@ sub gst_xml_model_remove
return -1;
}
-sub gst_xml_model_get_tqchildren
+sub gst_xml_model_get_children
{
my ($branch) = @_;
- my (@tqchildren);
+ my (@children);
- if (!$branch) { return \@tqchildren; }
+ if (!$branch) { return \@children; }
for ($i = 1; $i < @$branch; $i += 2)
{
if (@$branch [$i] ne "__unparsed__" && @$branch [$i] ne "0")
{
- push @tqchildren, @$branch [$i + 1];
+ push @children, @$branch [$i + 1];
}
}
- return \@tqchildren;
+ return \@children;
}
sub gst_xml_model_get_pcdata
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
index a769705..2a5c4c0 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -230,7 +230,7 @@ void KNetworkConf::configureDeviceSlot(){
if (item != NULL)
{
TQString currentDevice = item->text(0);
- configDlg.setCaption(i18n("Configure Device %1").tqarg(currentDevice));
+ configDlg.setCaption(i18n("Configure Device %1").arg(currentDevice));
KNetworkInterface *dev = getDeviceInfo(currentDevice);
KAddDeviceDlgExtension *advancedOptions = (KAddDeviceDlgExtension *)configDlg.extension();
@@ -677,9 +677,9 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){
KInterfaceUpDownDlg* dialog = new KInterfaceUpDownDlg(this,"Changing device state");
if (state == DEVICE_UP)
- dialog->label->setText(i18n("Enabling interface <b>%1</b>").tqarg(dev));
+ dialog->label->setText(i18n("Enabling interface <b>%1</b>").arg(dev));
else
- dialog->label->setText(i18n("Disabling interface <b>%1</b>").tqarg(dev));
+ dialog->label->setText(i18n("Disabling interface <b>%1</b>").arg(dev));
dialog->setModal(true);
dialog->show();
diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
index e6aa338..5f4d44e 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
@@ -38,7 +38,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){
if (pathToProgram.isEmpty())
{
KMessageBox::error(0,
- i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that \n{KDE_PATH}/%1 \nfile is present.").tqarg(BACKEND_PATH),
+ i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that \n{KDE_PATH}/%1 \nfile is present.").arg(BACKEND_PATH),
i18n("Could Not Find Network Configuration Backend Script"));
dialog->close();
//kapp->quit();
@@ -301,7 +301,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo)
// KDetectDistroDlg* dialog = new KDetectDistroDlg(0, 0, true,TQDialog::WStyle_Customize|TQDialog::WStyle_NormalBorder|TQDialog::WStyle_Title|TQDialog::WStyle_SysMenu); //made it semi-modal
KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)parent(), 0, true);
dialog->setCaption(i18n("Reloading Network"));
- dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").tqarg("<center>").tqarg("</center>"));
+ dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").arg("<center>").arg("</center>"));
dialog->show();
xmlOuput = "";
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
index f25c99d..3f67b0c 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
@@ -110,7 +110,7 @@ KAboutData *aboutData = new KAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"
TQString KNetworkConfModule::quickHelp() const
{
- return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").tqarg("<h1>").tqarg("</h1><p>").tqarg("</p>");
+ return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").arg("<h1>").arg("</h1><p>").arg("</p>");
}
//#include "knetworkconfmodule.moc"
diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
index 03bf9a4..dc30c12 100644
--- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
+++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
@@ -91,31 +91,31 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
{
if (device->getType() != LOOPBACK_IFACE_TYPE)
{
- tipStr.append(i18n("<p><b>Interface:</b> %1").tqarg(device->getDeviceName().latin1()));
- tipStr.append(i18n("<br><b>Type:</b> %1").tqarg(device->getType()));
+ tipStr.append(i18n("<p><b>Interface:</b> %1").arg(device->getDeviceName().latin1()));
+ tipStr.append(i18n("<br><b>Type:</b> %1").arg(device->getType()));
TQString bootProto;
if (device->getBootProto() == "none")
bootProto = "Manual";
else
bootProto = device->getBootProto();
- tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").tqarg(bootProto));
+ tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").arg(bootProto));
if (bootProto != "dhcp")
{
- tipStr.append(i18n("<br><b>IP Address:</b> %1").tqarg(device->getIpAddress()));
- tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").tqarg(device->getBroadcast()));
+ tipStr.append(i18n("<br><b>IP Address:</b> %1").arg(device->getIpAddress()));
+ tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").arg(device->getBroadcast()));
}
- tipStr.append(i18n("<br><b>On Boot:</b> %1").tqarg(device->getOnBoot()));
+ tipStr.append(i18n("<br><b>On Boot:</b> %1").arg(device->getOnBoot()));
}
}
KRoutingInfo *route = profile->getRoutingInfo();
- tipStr.append(i18n("</p><p><b>Default Gateway:</b> %1").tqarg(route->getGateway()));
+ tipStr.append(i18n("</p><p><b>Default Gateway:</b> %1").arg(route->getGateway()));
KDNSInfo *dns = profile->getDNSInfo();
- tipStr.append(i18n("<br><b>Domain Name:</b> %1").tqarg(dns->getDomainName()));
- tipStr.append(i18n("<br><b>Machine Name:</b> %1").tqarg(dns->getMachineName()));
+ tipStr.append(i18n("<br><b>Domain Name:</b> %1").arg(dns->getDomainName()));
+ tipStr.append(i18n("<br><b>Machine Name:</b> %1").arg(dns->getMachineName()));
TQStringList nameServers = dns->getNameServers();
for ( TQStringList::Iterator it = nameServers.begin(); it != nameServers.end(); ++it)
{
- tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").tqarg((*it)));
+ tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").arg((*it)));
}
}
}
diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
index f56d9ef..705396e 100644
--- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
+++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
@@ -50,7 +50,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kpackage/cache.cpp b/kpackage/cache.cpp
index d60be2f..69ef37b 100644
--- a/kpackage/cache.cpp
+++ b/kpackage/cache.cpp
@@ -60,7 +60,7 @@ TQString cacheObj::PDir()
TQDir d(tmpd);
if (!d.exists()) {
if (!d.mkdir(tmpd)) {
- KpMsgE(i18n("Cannot create folder %1").tqarg(tmpd),TRUE);
+ KpMsgE(i18n("Cannot create folder %1").arg(tmpd),TRUE);
tmpd = "";
} else {
chown(TQFile::encodeName(tmpd),buf.st_uid,buf.st_gid);
@@ -81,7 +81,7 @@ TQString cacheObj::CDir()
TQDir d(tmpd);
if (!d.exists()) {
if (!d.mkdir(tmpd)) {
- KpMsgE(i18n("Cannot create folder %1").tqarg(tmpd),TRUE);
+ KpMsgE(i18n("Cannot create folder %1").arg(tmpd),TRUE);
tmpd = "";
} else {
chown(TQFile::encodeName(tmpd),buf.st_uid,buf.st_gid);
@@ -95,7 +95,7 @@ int cacheObj::newDCache(const TQString &url, const TQString &fn, TQString &fnam
KURL u(url);
if ( !u.isValid() ) {
- KpMsgE(i18n("Malformed URL: %1").tqarg(url),TRUE);
+ KpMsgE(i18n("Malformed URL: %1").arg(url),TRUE);
return -1;
}
diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index 498f93c..f7c6ee0 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -156,7 +156,7 @@ void DEBAPT::fileS()
kprun->exec();
}
} else {
- KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
+ KpMsg("Error",i18n("The %1 program needs to be installed").arg("apt-file"), TRUE);
}
}
@@ -185,13 +185,13 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
packageInfo *p;
TQStringList plist;
- kpackage->setStatus(i18n("Querying DEB APT remote package list: %1").tqarg(hostName));
+ kpackage->setStatus(i18n("Querying DEB APT remote package list: %1").arg(hostName));
kpackage->setPercent(0);
TQString cmd = "cat " STATUS;
TQStringList list = kpty->run(cmd);
- kpackage->setStatus(i18n("Processing DEB APT remote package list: %1").tqarg(hostName));
+ kpackage->setStatus(i18n("Processing DEB APT remote package list: %1").arg(hostName));
// kdDebug() << "P=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -243,14 +243,14 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
if (hostName.isEmpty())
kpackage->setStatus(i18n("Querying DEB APT available list"));
else
- kpackage->setStatus(i18n("Querying DEB APT available list: %1").tqarg(hostName));
+ kpackage->setStatus(i18n("Querying DEB APT available list: %1").arg(hostName));
kpackage->setPercent(0);
TQStringList list = kpty->run("apt-cache dumpavail");
if (hostName.isEmpty())
kpackage->setStatus(i18n("Processing DEB APT available list"));
else
- kpackage->setStatus(i18n("Processing DEB APT available list: %1").tqarg(hostName));
+ kpackage->setStatus(i18n("Processing DEB APT available list: %1").arg(hostName));
// kdDebug() << "A=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -365,7 +365,7 @@ TQStringList DEBAPT::FindFile(const TQString &name, bool searchAll)
return filelist;
} else {
- KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
+ KpMsg("Error",i18n("The %1 program needs to be installed").arg("apt-file"), TRUE);
TQStringList nill;
return nill;
}
diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp
index 730e769..167ec1b 100644
--- a/kpackage/fbsdInterface.cpp
+++ b/kpackage/fbsdInterface.cpp
@@ -527,7 +527,7 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
// Find the last word on this line (which should be the package name) minus a trailing :.
TQString pkg = name.section(' ',-1);
if (pkg.isEmpty()) {
- KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").tqarg(value), TRUE);
+ KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").arg(value), TRUE);
kpackage->setStatus(TQString());
return;
} else {
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 041c793..2c90b9f 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -485,9 +485,9 @@ pkgInterface *KPACKAGE::pkType(const TQString &fname)
}
}
fclose(file);
- KpMsgE(i18n("Unknown package type: %1").tqarg(fname),TRUE);
+ KpMsgE(i18n("Unknown package type: %1").arg(fname),TRUE);
} else {
- KpMsgE(i18n("File not found: %1").tqarg(fname),TRUE);
+ KpMsgE(i18n("File not found: %1").arg(fname),TRUE);
}
return 0;
@@ -585,7 +585,7 @@ TQString KPACKAGE::getFileName(const KURL & url, TQString &cacheName )
TQString fname = "";
if ( !url.isValid() ) {
- KpMsgE(i18n("Malformed URL: %1").tqarg(url.url()),TRUE);
+ KpMsgE(i18n("Malformed URL: %1").arg(url.url()),TRUE);
} else {
// Just a usual file ?
diff --git a/kpackage/managementWidget.h b/kpackage/managementWidget.h
index f4bd82a..28d8132 100644
--- a/kpackage/managementWidget.h
+++ b/kpackage/managementWidget.h
@@ -181,7 +181,7 @@ private:
// This widget displays the package info / file-list
TQBoxLayout *top, *leftbox, *rightbox, *lbuttons, *rbuttons;
- // These are the tqgeometry managers
+ // These are the geometry managers
TQFrame *leftpanel, *rightpanel;
// frame to put TQBox in
diff --git a/kpackage/options.cpp b/kpackage/options.cpp
index a65e17a..8d86470 100644
--- a/kpackage/options.cpp
+++ b/kpackage/options.cpp
@@ -96,8 +96,8 @@ Options::Options(TQWidget *parent)
} else {
msgStr = kpinterface[i]->name;
msgStr = i18n("%1: %2 not found")
- .tqarg(kpinterface[i]->name)
- .tqarg(kpinterface[i]->errExe);
+ .arg(kpinterface[i]->name)
+ .arg(kpinterface[i]->errExe);
}
packageBox[i] = new TQGroupBox(2,Qt::Horizontal,msgStr, framet, "box");
packageHandle[i] = new TQCheckBox(i18n("Enable"), packageBox[i]);
diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index 93c7d28..435e830 100644
--- a/kpackage/pkgInterface.cpp
+++ b/kpackage/pkgInterface.cpp
@@ -197,7 +197,7 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
}
} else {
// directory is not readable
- kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").tqarg(d.absPath() ) << endl;
+ kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").arg(d.absPath() ) << endl;
}
} else {
TQFile f(fname);
@@ -297,7 +297,7 @@ TQString pkgInterface::getDir(cacheObj *cp) {
cl.write();
return tmpDir;
} else {
- KpMsgE(i18n("Cannot read folder %1").tqarg(url),FALSE);
+ KpMsgE(i18n("Cannot read folder %1").arg(url),FALSE);
unlink(tmpDir.ascii());
return TQString();
}
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index 4775fce..04516dc 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -202,7 +202,7 @@ bool pkgOptions::setup(TQPtrList<packageInfo> *pl, const TQString &)
}
}
- s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).tqarg(insType,pkgInt->name);
+ s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).arg(insType,pkgInt->name);
title->setText(s);
for (TQStringList::Iterator pit = plist.begin(); pit != plist.end(); ++pit ) {
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index a17e9cb..568e651 100644
--- a/kpackage/procbuf.cpp
+++ b/kpackage/procbuf.cpp
@@ -136,13 +136,13 @@ int procbuf::start (TQString msg, bool errorDlg,
<< " exit=" << proc->exitStatus() << endl;
if (timed) {
kdDebug() << "timeout..................\n";
- KpMsg("Error",i18n("Timeout: %1").tqarg(timeMsg), TRUE);
+ KpMsg("Error",i18n("Timeout: %1").arg(timeMsg), TRUE);
delete proc; proc = 0;
return 0;
} else {
if (!proc->normalExit() || proc->exitStatus()) {
if (errorDlg) {
- KpMsg("Error",i18n("Kprocess error:%1").tqarg(buf), TRUE);
+ KpMsg("Error",i18n("Kprocess error:%1").arg(buf), TRUE);
}
delete proc; proc = 0;
return 0;
diff --git a/kpackage/search.cpp b/kpackage/search.cpp
index 8338ee8..a2cf9ff 100644
--- a/kpackage/search.cpp
+++ b/kpackage/search.cpp
@@ -104,7 +104,7 @@ void Search::ok_slot()
}
if (pkg == 0)
KpMsg(i18n("Note"),
- i18n("%1 was not found.").tqarg(to_find),TRUE);
+ i18n("%1 was not found.").arg(to_find),TRUE);
}
void Search::done_slot()
diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 001227d..1951aa2 100644
--- a/ksysv/IOCore.cpp
+++ b/ksysv/IOCore.cpp
@@ -49,23 +49,23 @@ void ksv::IO::removeFile (const TQFileInfo& info, TQDir& dir, TQString& rich, TQ
if (!dir.remove(info.fileName(), FALSE))
{
rich = (i18n ("<error>FAILED</error> to remove <cmd>%1</cmd> from <cmd>%2</cmd>: \"%3\"<br/>")
- .tqarg(info.fileName())
- .tqarg(dir.path())
- .tqarg(strerror(errno)));
+ .arg(info.fileName())
+ .arg(dir.path())
+ .arg(strerror(errno)));
plain = (i18n ("FAILED to remove %1 from %2: \"%3\"\n")
- .tqarg(info.fileName())
- .tqarg(dir.path())
- .tqarg(strerror(errno)));
+ .arg(info.fileName())
+ .arg(dir.path())
+ .arg(strerror(errno)));
}
else
{
rich = i18n("removed <cmd>%1</cmd> from <cmd>%2</cmd><br/>")
- .tqarg(info.fileName())
- .tqarg(dir.path());
+ .arg(info.fileName())
+ .arg(dir.path());
plain = i18n("removed %1 from %2\n")
- .tqarg(info.fileName())
- .tqarg(dir.path());
+ .arg(info.fileName())
+ .arg(dir.path());
}
}
@@ -80,8 +80,8 @@ void ksv::IO::dissectFilename (const TQString& file, TQString& base, int& nr)
void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start,
TQString& rich, TQString& plain)
{
- const TQString symName = TQString("%1%2%3").tqarg(start ? "S" : "K").tqarg(data.numberString()).tqarg(data.label());
- const TQString symPath = TQString("%1/rc%2.d/").tqarg(KSVConfig::self()->runlevelPath()).tqarg(runlevel);
+ const TQString symName = TQString("%1%2%3").arg(start ? "S" : "K").arg(data.numberString()).arg(data.label());
+ const TQString symPath = TQString("%1/rc%2.d/").arg(KSVConfig::self()->runlevelPath()).arg(runlevel);
const TQString symbol = symPath + symName;
TQString target = data.filename();
@@ -92,20 +92,20 @@ void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start,
if (symlink(target.local8Bit(), symbol.local8Bit()) == 0)
{
- rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").tqarg(symName).tqarg(symPath);
- plain = i18n("created %1 in %2\n").tqarg(symName).tqarg(symPath);
+ rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").arg(symName).arg(symPath);
+ plain = i18n("created %1 in %2\n").arg(symName).arg(symPath);
}
else
{
rich = i18n("<error>FAILED</error> to create <cmd>%1</cmd> in <cmd>%2</cmd>: \"%3\"<br/>")
- .tqarg(symName)
- .tqarg(symPath)
- .tqarg(strerror(errno));
+ .arg(symName)
+ .arg(symPath)
+ .arg(strerror(errno));
plain = i18n("FAILED to create %1 in %2: \"%3\"\n")
- .tqarg(symName)
- .tqarg(symPath)
- .tqarg(strerror(errno));
+ .arg(symName)
+ .arg(symPath)
+ .arg(strerror(errno));
}
}
@@ -201,7 +201,7 @@ bool ksv::IO::loadSavedConfiguration (TQDataStream& s,
s >> rlMagic;
s >> section;
- if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").tqarg(i))
+ if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").arg(i))
return false;
if (section != "START")
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index 2a7523c..efd1878 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -251,9 +251,9 @@ void KSVContent::initLList()
mRunlevels[i]->setSpacing (KDialog::spacingHint());
// create TQString for label
- TQString _label (i18n("Runlevel &%1").tqarg(i));
+ TQString _label (i18n("Runlevel &%1").arg(i));
// and for the name
- TQString _name (i18n("Runlevel %1").tqarg(i));
+ TQString _name (i18n("Runlevel %1").arg(i));
TQVBox* startBox = new TQVBox (mRunlevels[i]);
TQWhatsThis::add (startBox,
@@ -262,7 +262,7 @@ void KSVContent::initLList()
"determines the order in which the services are started. " \
"You can arrange them via drag and drop, as long as a suitable " \
"<em>sorting number</em> can be generated.</p><p>If that's not possible, you have " \
- "to change the number manually via the <strong>Properties dialog box</strong>.</p>").tqarg(i));
+ "to change the number manually via the <strong>Properties dialog box</strong>.</p>").arg(i));
TQLabel* rlL = new TQLabel(_label, startBox);
new TQLabel(i18n("Start"), startBox);
@@ -280,7 +280,7 @@ void KSVContent::initLList()
"determines the order in which the services are stopped. " \
"You can arrange them via drag and drop, as long as a suitable " \
"<em>sorting number</em> can be generated.</p><p>If that's not possible, you have " \
- "to change the number manually via the <strong>Properties dialog box</strong>.</p>").tqarg(i));
+ "to change the number manually via the <strong>Properties dialog box</strong>.</p>").arg(i));
// create the "STOP" list:
stopRL[i] = new KSVDragList(stopBox, (_name + " STOP").latin1());
@@ -351,9 +351,9 @@ void KSVContent::initLList()
// use this loop for setting tooltips
startRL[i]->setToolTip (i18n("Drag here to start services\n" \
- "when entering runlevel %1").tqarg(i));
+ "when entering runlevel %1").arg(i));
stopRL[i]->setToolTip (i18n("Drag here to stop services\n" \
- "when entering runlevel %1").tqarg(i));
+ "when entering runlevel %1").arg(i));
for (int j = 0; j < ksv::runlevelNumber; ++j)
{
@@ -422,7 +422,7 @@ void KSVContent::initRunlevels()
startRL[i]->clear();
stopRL[i]->clear();
- const TQString _path = conf->runlevelPath() + TQString("/rc%1.d").tqarg(i);
+ const TQString _path = conf->runlevelPath() + TQString("/rc%1.d").arg(i);
if (!TQDir(_path).exists())
continue;
@@ -476,8 +476,8 @@ void KSVContent::slotWriteSysV()
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
- appendLog(i18n("<rl>RUNLEVEL %1</rl>").tqarg(i),
- i18n("** RUNLEVEL %1 **").tqarg(i));
+ appendLog(i18n("<rl>RUNLEVEL %1</rl>").arg(i),
+ i18n("** RUNLEVEL %1 **").arg(i));
clearRL(i); // rm changed/deleted entries
@@ -525,7 +525,7 @@ void KSVContent::repaintRunlevels ()
void KSVContent::clearRL(int _rl)
{
- TQString path = conf->runlevelPath() + TQString("/rc%1.d").tqarg(_rl);
+ TQString path = conf->runlevelPath() + TQString("/rc%1.d").arg(_rl);
TQDir dir (path);
@@ -539,7 +539,7 @@ void KSVContent::clearRL(int _rl)
if (d->newEntry() && d->originalRunlevel() != startRL[_rl]->name())
break;
- TQFileInfo file (path + TQString("/S%1%2").tqarg(d->numberString()).tqarg(d->label()));
+ TQFileInfo file (path + TQString("/S%1%2").arg(d->numberString()).arg(d->label()));
TQString rich, plain;
ksv::IO::removeFile (file, dir, rich, plain);
@@ -557,7 +557,7 @@ void KSVContent::clearRL(int _rl)
if (d->newEntry() && d->originalRunlevel() != stopRL[_rl]->name())
break;
- TQFileInfo file (path + TQString("/K%1%2").tqarg(d->numberString()).tqarg(d->label()));
+ TQFileInfo file (path + TQString("/K%1%2").arg(d->numberString()).arg(d->label()));
TQString rich, plain;
ksv::IO::removeFile (file, dir, rich, plain);
@@ -613,8 +613,8 @@ void KSVContent::stopService (const TQString& path)
connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
// refresh textDisplay
- appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").tqarg(path),
- i18n("** Stopping %1 **").tqarg(path));
+ appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").arg(path),
+ i18n("** Stopping %1 **").arg(path));
_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
@@ -639,8 +639,8 @@ void KSVContent::startService (const TQString& path)
connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
// refresh textDisplay
- appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").tqarg(path),
- i18n("** Starting %1 **").tqarg(path));
+ appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").arg(path),
+ i18n("** Starting %1 **").arg(path));
_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
@@ -679,8 +679,8 @@ void KSVContent::restartService (const TQString& path)
connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
// refresh textDisplay
- appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").tqarg(path),
- i18n("** Re-starting %1 **").tqarg(path));
+ appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").arg(path),
+ i18n("** Re-starting %1 **").arg(path));
_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp
index e766e77..bac5b30 100644
--- a/ksysv/RunlevelAuthIcon.cpp
+++ b/ksysv/RunlevelAuthIcon.cpp
@@ -44,7 +44,7 @@ RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
- mRLInfo[i] = new TQFileInfo ((runlevelPath + "/rc%1.d").tqarg(i));
+ mRLInfo[i] = new TQFileInfo ((runlevelPath + "/rc%1.d").arg(i));
}
updateStatus();
@@ -122,7 +122,7 @@ void RunlevelAuthIcon::setRunlevelPath (const TQString& path)
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
- mRLInfo[i]->setFile ((path + "/rc%1.d").tqarg(i));
+ mRLInfo[i]->setFile ((path + "/rc%1.d").arg(i));
}
mTimer->start(mInterval);
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index 4dedbe3..5530f97 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -426,7 +426,7 @@ void KSVTopLevel::initStatusBar()
"or ask your sysadmin to install %1 <em>suid</em> or " \
"<em>sgid</em>.</p><p>The latter way is <strong>not</strong> "\
"recommended though, due to security issues.</p>")
- .tqarg (kapp->aboutData()->programName()).tqarg(kapp->aboutData()->programName()));
+ .arg (kapp->aboutData()->programName()).arg(kapp->aboutData()->programName()));
authIconBox->setMinimumSize (authIconBox->minimumSizeHint());
visBox->setMinimumSize (visBox->minimumSizeHint());
@@ -659,7 +659,7 @@ void KSVTopLevel::print()
// p.setFont (TQFont("courier", 16, TQFont::Bold));
// TQFontMetrics fm = p.fontMetrics();
-// p.drawText (10, y, i18n ("Runlevel %1").tqarg(i));
+// p.drawText (10, y, i18n ("Runlevel %1").arg(i));
// y += fm.lineSpacing();
// checkPage
@@ -775,7 +775,7 @@ void KSVTopLevel::printLog()
y += tmp_h;
- TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())),
+ TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())),
TQFont("times"), TQString(), ksv::styleSheet(),
TQMimeSourceFactory::defaultFactory());
rdate.setWidth (&p, width);
diff --git a/ksysv/configwizard.ui b/ksysv/configwizard.ui
index 7255ac6..2594b01 100644
--- a/ksysv/configwizard.ui
+++ b/ksysv/configwizard.ui
@@ -10,7 +10,7 @@
<cstring>ConfigWizard</cstring>
</property>
<property stdset="1">
- <name>tqgeometry</name>
+ <name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
@@ -590,7 +590,7 @@ You have finished the initial configuration of SysV-Init Editor. &lt;b&gt;Press&
<enum>RichText</enum>
</property>
<property stdset="1">
- <name>tqalignment</name>
+ <name>alignment</name>
<set>AlignTop|AlignLeft</set>
</property>
<property>
diff --git a/ksysv/kdltooltip.cpp b/ksysv/kdltooltip.cpp
index 1ff34e2..7b3a421 100644
--- a/ksysv/kdltooltip.cpp
+++ b/ksysv/kdltooltip.cpp
@@ -39,8 +39,8 @@ void KDLToolTip::maybeTip (const TQPoint& p)
TQString text;
TQRect rect;
- const TQRect vert = mParent->verticalScrollBar()->tqgeometry();
- const TQRect horiz = mParent->horizontalScrollBar()->tqgeometry();
+ const TQRect vert = mParent->verticalScrollBar()->geometry();
+ const TQRect horiz = mParent->horizontalScrollBar()->geometry();
if (vert.contains(p))
{
@@ -66,7 +66,7 @@ void KDLToolTip::maybeTip (const TQPoint& p)
TQListViewItem* i = mParent->itemAt (rp);
KSVItem* item = static_cast<KSVItem*> (i);
- rect = mParent->header()->tqgeometry();
+ rect = mParent->header()->geometry();
if (rect.contains (p))
{
text = mParent->tooltip();
diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp
index a4a713d..7ad9090 100644
--- a/ksysv/ksv_conf.cpp
+++ b/ksysv/ksv_conf.cpp
@@ -100,7 +100,7 @@ void KSVConfig::writeSettings() {
mConfig->writeEntry("Service Font", mServiceFont);
mConfig->writeEntry("Number Font", mNumberFont);
- // save screen tqgeometry
+ // save screen geometry
KMainWindow* mw = static_cast<KMainWindow*>(kapp->mainWidget());
if (mw)
diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp
index f4e8770..65a1b3e 100644
--- a/ksysv/ksvdraglist.cpp
+++ b/ksysv/ksvdraglist.cpp
@@ -385,7 +385,7 @@ void KSVDragList::initItem (TQString file, TQString path, TQString name, TQ_INT8
tmp->setChanged (false);
setUpdatesEnabled(true);
- tqrepaint(false);
+ repaint(false);
}
void KSVDragList::setDefaultIcon (const TQPixmap& icon)
diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui
index 75fefc8..9a902a5 100644
--- a/ksysv/lookandfeelconfig.ui
+++ b/ksysv/lookandfeelconfig.ui
@@ -133,7 +133,7 @@
<property name="text">
<string>Services:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -149,7 +149,7 @@
<property name="text">
<string>Sorting numbers:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -265,7 +265,7 @@
<property name="text">
<string>&amp;Changed:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -313,7 +313,7 @@
<property name="text">
<string>&amp;New:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -393,7 +393,7 @@
<property name="text">
<string>New &amp;&amp; &amp;selected:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -409,7 +409,7 @@
<property name="text">
<string>Changed &amp;&amp; s&amp;elected:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp
index 1ecf522..aab746c 100644
--- a/ksysv/trash.cpp
+++ b/ksysv/trash.cpp
@@ -75,7 +75,7 @@ void KSVTrash::dropEvent (TQDropEvent* e)
if (mOpen)
{
- mLabel->tqrepaint();
+ mLabel->repaint();
mOpen = false;
}
}
@@ -102,7 +102,7 @@ void KSVTrash::dragLeaveEvent ( TQDragLeaveEvent* )
{
if (mOpen)
{
- mLabel->tqrepaint();
+ mLabel->repaint();
mOpen = false;
}
}
diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp
index 828e225..8021f9e 100644
--- a/kuser/addUser.cpp
+++ b/kuser/addUser.cpp
@@ -65,14 +65,14 @@ void addUser::slotOk()
if ( ( user->getCaps() & KU::KUser::Cap_POSIX ) &&
kug->getUsers().lookup( user->getUID() ) ) {
- KMessageBox::sorry( 0, i18n("User with UID %1 already exists.").tqarg( user->getUID() ) );
+ KMessageBox::sorry( 0, i18n("User with UID %1 already exists.").arg( user->getUID() ) );
return;
}
if ( ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) &&
( user->getCaps() & KU::KUser::Cap_Samba ) ) {
if ( kug->getUsers().lookup_sam( user->getSID().getRID() ) ) {
- KMessageBox::sorry( 0, i18n("User with RID %1 already exists.").tqarg( user->getSID().getRID() ) );
+ KMessageBox::sorry( 0, i18n("User with RID %1 already exists.").arg( user->getSID().getRID() ) );
return;
}
}
@@ -115,15 +115,15 @@ bool addUser::checkHome()
if ( KMessageBox::
warningContinueCancel ( 0,
i18n("Folder %1 already exists!\n%2 may become owner and permissions may change.\nDo you really want to use %3?").
- tqarg(h_dir).tqarg(user->getName()).tqarg(h_dir), TQString(), KStdGuiItem::cont() ) == KMessageBox::Cancel )
+ arg(h_dir).arg(user->getName()).arg(h_dir), TQString(), KStdGuiItem::cont() ) == KMessageBox::Cancel )
return false;
else
return true;
} else
- KMessageBox::error( 0, i18n("%1 is not a folder.").tqarg(h_dir) );
+ KMessageBox::error( 0, i18n("%1 is not a folder.").arg(h_dir) );
} else
- KMessageBox::error( 0, i18n("stat() failed on %1.").tqarg(h_dir) );
+ KMessageBox::error( 0, i18n("stat() failed on %1.").arg(h_dir) );
return false;
}
@@ -145,13 +145,13 @@ bool addUser::checkMailBox()
if (r == 0)
if (S_ISREG(s.st_mode))
KMessageBox::error( 0, i18n("Mailbox %1 already exists (uid=%2).")
- .tqarg(mailboxpath)
- .tqarg(s.st_uid) );
+ .arg(mailboxpath)
+ .arg(s.st_uid) );
else
KMessageBox::error( 0, i18n("%1 exists but is not a regular file.")
- .tqarg(mailboxpath) );
+ .arg(mailboxpath) );
else
- KMessageBox::error( 0, i18n("stat() failed on %1.").tqarg(mailboxpath) );
+ KMessageBox::error( 0, i18n("stat() failed on %1.").arg(mailboxpath) );
return false;
}
diff --git a/kuser/delUser.cpp b/kuser/delUser.cpp
index 775ff6c..b1ee7e0 100644
--- a/kuser/delUser.cpp
+++ b/kuser/delUser.cpp
@@ -30,11 +30,11 @@ delUser::delUser(KU::KUser *AUser, TQWidget *parent, const char *name)
{
TQVBox *page = makeVBoxMainWidget();
new TQLabel( i18n("<p>Deleting user <b>%1</b>"
- "<p>Also perform the following actions:").tqarg(AUser->getName()),
+ "<p>Also perform the following actions:").arg(AUser->getName()),
page);
- m_deleteHomeDir = new TQCheckBox(i18n("Delete &home folder: %1").tqarg(AUser->getHomeDir()), page);
+ m_deleteHomeDir = new TQCheckBox(i18n("Delete &home folder: %1").arg(AUser->getHomeDir()), page);
TQString mailboxpath = TQFile::decodeName(MAIL_SPOOL_DIR) + "/" + AUser->getName();
- m_deleteMailBox = new TQCheckBox(i18n("Delete &mailbox: %1").tqarg(mailboxpath), page);
+ m_deleteMailBox = new TQCheckBox(i18n("Delete &mailbox: %1").arg(mailboxpath), page);
setButtonGuiItem(KDialogBase::Ok, KStdGuiItem::del());
}
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index 0cea581..afb0da3 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -274,19 +274,19 @@ void editGroup::slotOk()
kug->getGroups().lookup( legrpname->text() ) ) {
KMessageBox::sorry( 0,
- i18n("Group with name %1 already exists.").tqarg(legrpname->text()) );
+ i18n("Group with name %1 already exists.").arg(legrpname->text()) );
return;
}
if ( mAdd ) {
if ( mSamba && !cbsamba->isChecked() && kug->getGroups().lookup_sam( sid ) ) {
KMessageBox::sorry( 0,
- i18n("Group with SID %1 already exists.").tqarg( sid.getSID() ) );
+ i18n("Group with SID %1 already exists.").arg( sid.getSID() ) );
return;
}
if (kug->getGroups().lookup(s.toInt())) {
KMessageBox::sorry( 0,
- i18n("Group with gid %1 already exists.").tqarg(s.toInt()) );
+ i18n("Group with gid %1 already exists.").arg(s.toInt()) );
return;
}
}
diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp
index eed0ee5..8734936 100644
--- a/kuser/kgroupfiles.cpp
+++ b/kuser/kgroupfiles.cpp
@@ -95,7 +95,7 @@ bool KGroupFiles::reload()
rc = stat(TQFile::encodeName(filename), &st);
if(rc != 0) {
KMessageBox::error( 0, i18n("stat call on file %1 failed: %2\nCheck KUser settings.").
- tqarg(filename).tqarg(TQString::fromLatin1(strerror(errno))) );
+ arg(filename).arg(TQString::fromLatin1(strerror(errno))) );
if( (processing_file & GROUP) != 0 ) {
group_errno = errno;
if(!nisgroup_filename.isEmpty()) {
@@ -121,7 +121,7 @@ bool KGroupFiles::reload()
FILE *fgrp = fopen(TQFile::encodeName(filename), "r");
TQString tmp;
if (fgrp == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(filename) );
return FALSE;
}
@@ -233,14 +233,14 @@ bool KGroupFiles::save()
if(!group_filename.isEmpty()) {
if((group_fd = fopen(TQFile::encodeName(new_group_filename), "w")) == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_group_filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_group_filename) );
return false;
}
}
if(!gshadow_filename.isEmpty()) {
if((gshadow_fd = fopen(TQFile::encodeName(new_gshadow_filename), "w")) == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_gshadow_filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_gshadow_filename) );
if ( group_fd ) fclose ( group_fd );
return false;
}
@@ -248,7 +248,7 @@ bool KGroupFiles::save()
if(!nisgroup_filename.isEmpty() && (nisgroup_filename != group_filename)) {
if((nisgroup_fd = fopen(TQFile::encodeName(new_nisgroup_filename), "w")) == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_nisgroup_filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_nisgroup_filename) );
if ( group_fd ) fclose ( group_fd );
if ( gshadow_fd ) fclose ( gshadow_fd );
return false;
diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index 6369ee7..4ac7c43 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -548,24 +548,24 @@ int KU::KUser::createHome()
{
if(p_dir.isNull() || p_dir.isEmpty()) {
- KMessageBox::sorry( 0, i18n("Cannot create home folder for %1: it is null or empty.").tqarg(p_name) );
+ KMessageBox::sorry( 0, i18n("Cannot create home folder for %1: it is null or empty.").arg(p_name) );
return(0);
}
if (mkdir(TQFile::encodeName(p_dir), 0700) != 0) {
if (errno != EEXIST)
{
- KMessageBox::error( 0, i18n("Cannot create home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Cannot create home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
return(0);
}
}
if (chown(TQFile::encodeName(p_dir), p_uid, p_gid) != 0) {
- KMessageBox::error( 0, i18n("Cannot change owner of home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Cannot change owner of home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
return(1);
}
if (chmod(TQFile::encodeName(p_dir), KU_HOMEDIR_PERM) != 0) {
- KMessageBox::error( 0, i18n("Cannot change permissions on home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Cannot change permissions on home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
return(1);
}
return(1);
@@ -580,33 +580,33 @@ int KU::KUser::tryCreate(const TQString &dir)
if (rc == 0) {
if (S_ISDIR(sb.st_mode)) {
if (KMessageBox::warningContinueCancel( 0,
- i18n("Folder %1 already exists!\nWill make %2 owner and change permissions.\nDo you want to continue?").tqarg(dir).tqarg(p_name),
+ i18n("Folder %1 already exists!\nWill make %2 owner and change permissions.\nDo you want to continue?").arg(dir).arg(p_name),
TQString(), KStdGuiItem::cont() ) == KMessageBox::Continue) {
if (chown(TQFile::encodeName(dir), p_uid, p_gid) != 0) {
- KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2") .tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2") .arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
return(0);
} else {
- KMessageBox::information( 0, i18n("Folder %1 left 'as is'.\nVerify ownership and permissions for user %2 who may not be able to log in!").tqarg(dir).tqarg(p_name) );
+ KMessageBox::information( 0, i18n("Folder %1 left 'as is'.\nVerify ownership and permissions for user %2 who may not be able to log in!").arg(dir).arg(p_name) );
return(-1);
}
} else {
- KMessageBox::information( 0, i18n("%1 exists and is not a folder. User %2 will not be able to log in!").tqarg(dir).tqarg(p_name) );
+ KMessageBox::information( 0, i18n("%1 exists and is not a folder. User %2 will not be able to log in!").arg(dir).arg(p_name) );
return(-1);
}
} else {
if (errno == ENOENT) {
if (mkdir(TQFile::encodeName(dir), 0700) != 0) {
- KMessageBox::error( 0, i18n("Cannot create %1 folder.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))));
+ KMessageBox::error( 0, i18n("Cannot create %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))));
return(-1);
}
if (chown(TQFile::encodeName(dir), p_uid, p_gid) != 0) {
- KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
return(0);
} else {
- KMessageBox::error( 0, i18n("stat call on %1 failed.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("stat call on %1 failed.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
return(-1);
}
}
@@ -622,8 +622,8 @@ int KU::KUser::createMailBox()
if (errno != EEXIST)
{
KMessageBox::error( 0, i18n("Cannot create %1: %2")
- .tqarg(mailboxpath)
- .tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(mailboxpath)
+ .arg(TQString::fromLocal8Bit(strerror(errno))) );
return -1;
}
}
@@ -632,13 +632,13 @@ int KU::KUser::createMailBox()
if (chown(TQFile::encodeName(mailboxpath), p_uid, KU_MAILBOX_GID) != 0) {
KMessageBox::error( 0, i18n("Cannot change owner on mailbox: %1\nError: %2")
- .tqarg(mailboxpath).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(mailboxpath).arg(TQString::fromLocal8Bit(strerror(errno))) );
return -1;
}
if (chmod(TQFile::encodeName(mailboxpath), KU_MAILBOX_PERM) != 0) {
KMessageBox::error( 0, i18n("Cannot change permissions on mailbox: %1\nError: %2")
- .tqarg(mailboxpath).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(mailboxpath).arg(TQString::fromLocal8Bit(strerror(errno))) );
return -1;
}
@@ -683,7 +683,7 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
if (symlink(TQFile::encodeName(link),TQFile::encodeName(d.filePath(name))) != 0) {
KMessageBox::error( 0, i18n("Error creating symlink %1.\nError: %2")
- .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
} else if ( info.isDir() ) {
TQDir dir(filename);
@@ -693,12 +693,12 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
if (chown(TQFile::encodeName(d.filePath(name)), p_uid, p_gid) != 0) {
KMessageBox::error( 0, i18n("Cannot change owner of folder %1.\nError: %2")
- .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
if (chmod(TQFile::encodeName(d.filePath(name)), mode) != 0) {
KMessageBox::error( 0, i18n("Cannot change permissions on folder %1.\nError: %2")
- .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
} else {
@@ -708,12 +708,12 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
if (chown(TQFile::encodeName(d.filePath(name)), p_uid, p_gid) != 0) {
KMessageBox::error( 0, i18n("Cannot change owner of file %1.\nError: %2")
- .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
if (chmod(TQFile::encodeName(d.filePath(name)), mode) != 0) {
KMessageBox::error( 0, i18n("Cannot change permissions on file %1.\nError: %2")
- .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
}
}
@@ -726,12 +726,12 @@ int KU::KUser::copySkel()
mode_t mode;
if (!s.exists()) {
- KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton for %2.").tqarg(s.absPath()).tqarg(p_name) );
+ KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton for %2.").arg(s.absPath()).arg(p_name) );
return (-1);
}
if (!d.exists()) {
- KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton.").tqarg(d.absPath()) );
+ KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton.").arg(d.absPath()) );
return (-1);
}
@@ -750,14 +750,14 @@ int KU::KUser::removeHome()
if (S_ISDIR(sb.st_mode) && sb.st_uid == p_uid) {
if (!KIO::NetAccess::del(KURL::fromPathOrURL(p_dir))) {
KMessageBox::error( 0, i18n("Cannot remove home folder %1.\nError: %2")
- .tqarg(p_dir).tqarg(KIO::NetAccess::lastErrorString()) );
+ .arg(p_dir).arg(KIO::NetAccess::lastErrorString()) );
}
} else {
- KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").tqarg(p_dir).tqarg(sb.st_uid).tqarg(sb.st_gid) );
+ KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").arg(p_dir).arg(sb.st_uid).arg(sb.st_gid) );
}
else {
KMessageBox::error( 0, i18n("stat call on file %1 failed.\nError: %2")
- .tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
return 0;
@@ -772,10 +772,10 @@ int KU::KUser::removeCrontabs()
file = TQFile::decodeName(CRONTAB_DIR) + "/" + p_name;
if ( access(TQFile::encodeName(file), F_OK) == 0 ) {
- command = TQString::fromLatin1("crontab -u %1 -r").tqarg(KProcess::quote(p_name));
+ command = TQString::fromLatin1("crontab -u %1 -r").arg(KProcess::quote(p_name));
if ( system(TQFile::encodeName(command)) != 0 ) {
KMessageBox::error( 0, i18n("Cannot remove crontab %1.\nError: %2")
- .tqarg(command).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(command).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
}
@@ -789,7 +789,7 @@ int KU::KUser::removeMailBox()
file = TQFile::decodeName(MAIL_SPOOL_DIR) + "/" + p_name;
if (remove(TQFile::encodeName(file)) != 0) {
KMessageBox::error( 0, i18n("Cannot remove mailbox %1.\nError: %2")
- .tqarg(file).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(file).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
return 0;
@@ -808,7 +808,7 @@ int KU::KUser::removeProcesses()
break;
case -1:
KMessageBox::error( 0,
- i18n("Cannot fork while trying to kill processes for uid %1.").tqarg(p_uid) );
+ i18n("Cannot fork while trying to kill processes for uid %1.").arg(p_uid) );
break;
}
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index cc67a8a..5ccfe58 100644
--- a/kuser/kuserfiles.cpp
+++ b/kuser/kuserfiles.cpp
@@ -115,7 +115,7 @@ bool KUserFiles::loadpwd()
mCfg->setPasswdsrc( PASSWORD_FILE );
mCfg->setGroupsrc( GROUP_FILE );
passwd_filename = mCfg->passwdsrc();
- KMessageBox::error( 0, i18n("KUser sources were not configured.\nLocal passwd source set to %1\nLocal group source set to %2.").tqarg(mCfg->passwdsrc().tqarg(mCfg->groupsrc())) );
+ KMessageBox::error( 0, i18n("KUser sources were not configured.\nLocal passwd source set to %1\nLocal group source set to %2.").arg(mCfg->passwdsrc().arg(mCfg->groupsrc())) );
}
if(!passwd_filename.isEmpty()) {
@@ -128,7 +128,7 @@ bool KUserFiles::loadpwd()
for(int i = 0; i < MAXFILES; i++) {
rc = stat(TQFile::encodeName(filename), &st);
if(rc != 0) {
- KMessageBox::error( 0, i18n("Stat call on file %1 failed: %2\nCheck KUser settings.").tqarg(filename).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Stat call on file %1 failed: %2\nCheck KUser settings.").arg(filename).arg(TQString::fromLocal8Bit(strerror(errno))) );
if( (processing_file & P_PASSWD) != 0 ) {
passwd_errno = errno;
if(!nispasswd_filename.isEmpty()) {
@@ -155,7 +155,7 @@ bool KUserFiles::loadpwd()
#ifdef HAVE_FGETPWENT
FILE *fpwd = fopen(TQFile::encodeName(filename), "r");
if(fpwd == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(filename) );
return FALSE;
}
@@ -238,7 +238,7 @@ bool KUserFiles::loadsdw()
FILE *f;
kdDebug() << "open shadow file: " << shadow_file << endl;
if ((f = fopen( TQFile::encodeName(shadow_file), "r")) == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(shadow_file) );
+ KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(shadow_file) );
caps &= ~Cap_Shadow;
return TRUE;
}
@@ -250,7 +250,7 @@ bool KUserFiles::loadsdw()
kdDebug() << "shadow entry: " << spw->sp_namp << endl;
if ((up = lookup(TQString::fromLocal8Bit(spw->sp_namp))) == NULL) {
- KMessageBox::error( 0, i18n("No /etc/passwd entry for %1.\nEntry will be removed at the next `Save'-operation.").tqarg(TQString::fromLocal8Bit(spw->sp_namp)) );
+ KMessageBox::error( 0, i18n("No /etc/passwd entry for %1.\nEntry will be removed at the next `Save'-operation.").arg(TQString::fromLocal8Bit(spw->sp_namp)) );
continue;
}
@@ -343,13 +343,13 @@ bool KUserFiles::savepwd()
if(!passwd_filename.isEmpty()) {
if ((passwd_fd =
fopen(TQFile::encodeName(new_passwd_filename),"w")) == NULL)
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(passwd_filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(passwd_filename) );
}
if(!nispasswd_filename.isEmpty() && (nispasswd_filename != passwd_filename)){
if ((nispasswd_fd =
fopen(TQFile::encodeName(new_nispasswd_filename),"w")) == NULL)
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(nispasswd_filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(nispasswd_filename) );
}
TQPtrListIterator<KU::KUser> it( mUsers );
@@ -523,7 +523,7 @@ bool KUserFiles::savesdw()
}
if ((f = fopen(TQFile::encodeName(new_shadow_file), "w")) == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_shadow_file) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_shadow_file) );
return FALSE;
}
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index d661e35..74ee465 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -373,10 +373,10 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
if ( cn.isEmpty() ) cn = user->getName();
gecos = TQString::fromLatin1("%1,%2,%3,%4")
- .tqarg(user->getFullName())
- .tqarg(user->getOffice1())
- .tqarg(user->getOffice2())
- .tqarg(user->getAddress());
+ .arg(user->getFullName())
+ .arg(user->getOffice1())
+ .arg(user->getOffice2())
+ .arg(user->getAddress());
samflags = "[U";
samflags += user->getDisabled() ? 'D' : ' ';
diff --git a/kuser/kuservw.cpp b/kuser/kuservw.cpp
index 43bb19b..6059726 100644
--- a/kuser/kuservw.cpp
+++ b/kuser/kuservw.cpp
@@ -45,7 +45,7 @@ int KUserViewItem::compare( TQListViewItem *i, int col, bool ascending ) const
}
void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment )
+ int column, int width, int alignment )
{
TQColorGroup _cg( cg );
TQColor c = _cg.text();
@@ -53,7 +53,7 @@ void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg,
if ( mUser->getDisabled() )
_cg.setColor( TQColorGroup::Text, KGlobalSettings::visitedLinkColor() );
- KListViewItem::paintCell( p, _cg, column, width, tqalignment );
+ KListViewItem::paintCell( p, _cg, column, width, alignment );
_cg.setColor( TQColorGroup::Text, c );
}
diff --git a/kuser/kuservw.h b/kuser/kuservw.h
index fa5827f..f69573d 100644
--- a/kuser/kuservw.h
+++ b/kuser/kuservw.h
@@ -35,7 +35,7 @@ public:
private:
virtual TQString text ( int ) const;
virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment );
+ int column, int width, int alignment );
virtual int compare( TQListViewItem *i, int col, bool ascending ) const;
KU::KUser *mUser;
};
diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp
index 5d168ac..fd9eee6 100644
--- a/kuser/mainView.cpp
+++ b/kuser/mainView.cpp
@@ -165,7 +165,7 @@ void mainView::userdel()
if ( group &&
KMessageBox::questionYesNo( 0, i18n("You are using private groups.\n"
"Do you want to delete the user's private group '%1'?")
- .tqarg(group->getName()), TQString(),
+ .arg(group->getName()), TQString(),
KStdGuiItem::del(), i18n("Do Not Delete")) == KMessageBox::Yes) {
kdDebug() << "del private group" << endl;
kug->getGroups().del( group );
@@ -203,7 +203,7 @@ void mainView::useradd()
if ( !ok ) return;
if ( kug->getUsers().lookup( name ) ) {
- KMessageBox::sorry( 0, i18n("User with name %1 already exists.").tqarg( name ) );
+ KMessageBox::sorry( 0, i18n("User with name %1 already exists.").arg( name ) );
return;
}
@@ -305,7 +305,7 @@ void mainView::setpwd()
if ( count > 1 ) {
if ( KMessageBox::questionYesNo( 0,
i18n("You have selected %1 users. Do you really want to change the password for all the selected users?")
- .tqarg( count ), TQString(), i18n("Change"), i18n("Do Not Change") ) == KMessageBox::No ) return;
+ .arg( count ), TQString(), i18n("Change"), i18n("Do Not Change") ) == KMessageBox::No ) return;
}
pwddlg d( this );
if ( d.exec() != TQDialog::Accepted ) return;
@@ -444,7 +444,7 @@ void mainView::grpdel()
KU::KUser *user = kug->getUsers().first();
while ( user ) {
if ( user->getGID() == group->getGID() ) {
- KMessageBox::error( 0, i18n( "The group '%1' is the primary group of one or more users (such as '%2'); it cannot be deleted." ).tqarg( group->getName() ).tqarg( user->getName() ) );
+ KMessageBox::error( 0, i18n( "The group '%1' is the primary group of one or more users (such as '%2'); it cannot be deleted." ).arg( group->getName() ).arg( user->getName() ) );
return;
}
user = kug->getUsers().next();
@@ -457,12 +457,12 @@ void mainView::grpdel()
case 0: return;
case 1:
if (KMessageBox::warningContinueCancel( 0,
- i18n("Do you really want to delete the group '%1'?").tqarg(group->getName()),
+ i18n("Do you really want to delete the group '%1'?").arg(group->getName()),
TQString(), KStdGuiItem::del()) != KMessageBox::Continue) return;
break;
default:
if (KMessageBox::warningContinueCancel( 0,
- i18n("Do you really want to delete the %1 selected groups?").tqarg(selected),
+ i18n("Do you really want to delete the %1 selected groups?").arg(selected),
TQString(), KStdGuiItem::del()) != KMessageBox::Continue) return;
}
diff --git a/kuser/misc.cpp b/kuser/misc.cpp
index 659ff73..6b26a72 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -43,7 +43,7 @@ bool backup(const TQString & name)
if (copyFile(TQFile::encodeName(name), TQFile::encodeName(tmp)) == -1)
{
TQString str;
- KMessageBox::error( 0, i18n("Can't create backup file for %1").tqarg(name) );
+ KMessageBox::error( 0, i18n("Can't create backup file for %1").arg(name) );
return false;
}
return true;
@@ -68,17 +68,17 @@ int copyFile(const TQString & from, const TQString & to)
fo.setName(to);
if (!fi.exists()) {
- KMessageBox::error( 0, i18n("File %1 does not exist.").tqarg(from) );
+ KMessageBox::error( 0, i18n("File %1 does not exist.").arg(from) );
return (-1);
}
if (!fi.open(IO_ReadOnly)) {
- KMessageBox::error( 0, i18n("Cannot open file %1 for reading.").tqarg(from) );
+ KMessageBox::error( 0, i18n("Cannot open file %1 for reading.").arg(from) );
return (-1);
}
if (!fo.open(IO_Raw | IO_WriteOnly | IO_Truncate)) {
- KMessageBox::error( 0, i18n("Cannot open file %1 for writing.").tqarg(to) );
+ KMessageBox::error( 0, i18n("Cannot open file %1 for writing.").arg(to) );
return (-1);
}
diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui
index 4893e04..cc662be 100644
--- a/kuser/passwordpolicy.ui
+++ b/kuser/passwordpolicy.ui
@@ -39,7 +39,7 @@
<property name="text">
<string>Time before password expires to issue an expire warning:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -53,7 +53,7 @@
<property name="text">
<string>Time when password expires after last password change:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -67,7 +67,7 @@
<property name="text">
<string>Time when account will be disabled after expiration of password:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -115,7 +115,7 @@
<property name="text">
<string>Time before password may not be changed after last password change:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index cd431c0..e1fb80e 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -346,7 +346,7 @@ propdlg::propdlg( const TQPtrList<KU::KUser> &users,
{
mUsers = users;
if ( mUsers.getFirst() != mUsers.getLast() )
- setCaption( i18n("User Properties - %1 Selected Users").tqarg( mUsers.count() ) );
+ setCaption( i18n("User Properties - %1 Selected Users").arg( mUsers.count() ) );
initDlg();
loadgroups( false );
selectuser();
@@ -658,14 +658,14 @@ void propdlg::setpgroup()
{
item->setEnabled(true);
item->setOn(prevPrimaryGroupWasOn);
- item->tqrepaint();
+ item->repaint();
}
if ( groupName == primaryGroup )
{
primaryGroupWasOn = item->isOn();
item->setEnabled(false);
item->setOn(true);
- item->tqrepaint();
+ item->repaint();
}
item = (TQCheckListItem *) item->nextSibling();
@@ -941,7 +941,7 @@ void propdlg::slotOk()
{
if (kug->getUsers().lookup(newuid)) {
KMessageBox::sorry( 0,
- i18n("User with UID %1 already exists").tqarg(newuid) );
+ i18n("User with UID %1 already exists").arg(newuid) );
return;
}
}
@@ -951,7 +951,7 @@ void propdlg::slotOk()
if ( oldrid != newrid ) {
if (kug->getUsers().lookup_sam(newrid)) {
KMessageBox::sorry( 0,
- i18n("User with RID %1 already exists").tqarg(newrid) );
+ i18n("User with RID %1 already exists").arg(newrid) );
return;
}
}
@@ -968,7 +968,7 @@ void propdlg::slotOk()
i18n("<p>The shell %1 is not yet listed in the file %2. "
"In order to use this shell you must add it to "
"this file first."
- "<p>Do you want to add it now?").tqarg(newshell).tqarg(TQFile::decodeName(SHELL_FILE)),
+ "<p>Do you want to add it now?").arg(newshell).arg(TQFile::decodeName(SHELL_FILE)),
i18n("Unlisted Shell"),
i18n("&Add Shell"),
i18n("Do &Not Add"));
diff --git a/lilo-config/kde-qt-common/EditWidget.h b/lilo-config/kde-qt-common/EditWidget.h
index b781cf2..89b037c 100644
--- a/lilo-config/kde-qt-common/EditWidget.h
+++ b/lilo-config/kde-qt-common/EditWidget.h
@@ -59,7 +59,7 @@ public:
void copy() const { line->copy(); };
void paste() { line->paste(); };
void setAlignment(int flag) { line->setAlignment(flag); };
- int tqalignment() const { return line->tqalignment(); };
+ int alignment() const { return line->alignment(); };
void cursorLeft(bool mark, int steps=1) { line->cursorLeft(mark, steps); };
void cursorRight(bool mark, int steps=1) { line->cursorRight(mark, steps); };
void cursorWordForward(bool mark) { line->cursorWordForward(mark); };