summaryrefslogtreecommitdiffstats
path: root/kpackage
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-19 11:52:44 -0600
committerTimothy Pearson <[email protected]>2011-12-19 11:52:44 -0600
commit6b7a8ff33a6383be4a9dea3c4225d142aab79b78 (patch)
tree5350a439bb05233ff6ee4a4368cdd59de686c685 /kpackage
parentb836ed566cdce05ae8408705487cd10a423f3a90 (diff)
downloadtdeadmin-6b7a8ff33a6383be4a9dea3c4225d142aab79b78.tar.gz
tdeadmin-6b7a8ff33a6383be4a9dea3c4225d142aab79b78.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kpackage')
-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
10 files changed, 22 insertions, 22 deletions
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()