summaryrefslogtreecommitdiffstats
path: root/kpackage
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:15 -0600
commit377fa3a2775cdb3194315bb83e21744dc7c97bbf (patch)
treeb6f515484589d67271adb168a1ead39f1c98493d /kpackage
parentd1248617107f659af9d03cf1ef6d783571a0cba8 (diff)
downloadtdeadmin-377fa3a2775cdb3194315bb83e21744dc7c97bbf.tar.gz
tdeadmin-377fa3a2775cdb3194315bb83e21744dc7c97bbf.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit d1248617107f659af9d03cf1ef6d783571a0cba8.
Diffstat (limited to 'kpackage')
-rw-r--r--kpackage/cache.cpp6
-rw-r--r--kpackage/debAptInterface.cpp20
-rw-r--r--kpackage/debInterface.cpp2
-rw-r--r--kpackage/debInterface.h2
-rw-r--r--kpackage/fbsdInterface.cpp18
-rw-r--r--kpackage/findf.cpp2
-rw-r--r--kpackage/findf.h2
-rw-r--r--kpackage/gentooInterface.cpp2
-rw-r--r--kpackage/kio.h2
-rw-r--r--kpackage/kissInterface.cpp2
-rw-r--r--kpackage/kpPty.h2
-rw-r--r--kpackage/kpTerm.cpp2
-rw-r--r--kpackage/kpTerm.h4
-rw-r--r--kpackage/kpackage.cpp16
-rw-r--r--kpackage/kpackage.h4
-rw-r--r--kpackage/kplview.h2
-rw-r--r--kpackage/managementWidget.cpp16
-rw-r--r--kpackage/managementWidget.h4
-rw-r--r--kpackage/options.cpp8
-rw-r--r--kpackage/packageDisplay.cpp6
-rw-r--r--kpackage/packageProperties.cpp2
-rw-r--r--kpackage/pkgInterface.cpp18
-rw-r--r--kpackage/pkgOptions.cpp34
-rw-r--r--kpackage/pkgOptions.h6
-rw-r--r--kpackage/procbuf.cpp6
-rw-r--r--kpackage/rpmInterface.cpp6
-rw-r--r--kpackage/search.cpp8
-rw-r--r--kpackage/slackInterface.cpp6
-rw-r--r--kpackage/updateLoc.cpp20
-rw-r--r--kpackage/updateLoc.h2
30 files changed, 115 insertions, 115 deletions
diff --git a/kpackage/cache.cpp b/kpackage/cache.cpp
index 69ef37b..d60be2f 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").arg(tmpd),TRUE);
+ KpMsgE(i18n("Cannot create folder %1").tqarg(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").arg(tmpd),TRUE);
+ KpMsgE(i18n("Cannot create folder %1").tqarg(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").arg(url),TRUE);
+ KpMsgE(i18n("Malformed URL: %1").tqarg(url),TRUE);
return -1;
}
diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index f7c6ee0..ce28d21 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").arg("apt-file"), TRUE);
+ KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("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").arg(hostName));
+ kpackage->settqStatus(i18n("Querying DEB APT remote package list: %1").tqarg(hostName));
kpackage->setPercent(0);
TQString cmd = "cat " STATUS;
TQStringList list = kpty->run(cmd);
- kpackage->setStatus(i18n("Processing DEB APT remote package list: %1").arg(hostName));
+ kpackage->settqStatus(i18n("Processing DEB APT remote package list: %1").tqarg(hostName));
// kdDebug() << "P=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -228,7 +228,7 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
}
list.clear();
- kpackage->setStatus(i18n("DEB APT"));
+ kpackage->settqStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
@@ -241,16 +241,16 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
// kdDebug() << "H=" << hostName << "\n";
if (hostName.isEmpty())
- kpackage->setStatus(i18n("Querying DEB APT available list"));
+ kpackage->settqStatus(i18n("Querying DEB APT available list"));
else
- kpackage->setStatus(i18n("Querying DEB APT available list: %1").arg(hostName));
+ kpackage->settqStatus(i18n("Querying DEB APT available list: %1").tqarg(hostName));
kpackage->setPercent(0);
TQStringList list = kpty->run("apt-cache dumpavail");
if (hostName.isEmpty())
- kpackage->setStatus(i18n("Processing DEB APT available list"));
+ kpackage->settqStatus(i18n("Processing DEB APT available list"));
else
- kpackage->setStatus(i18n("Processing DEB APT available list: %1").arg(hostName));
+ kpackage->settqStatus(i18n("Processing DEB APT available list: %1").tqarg(hostName));
// kdDebug() << "A=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -284,7 +284,7 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
}
list.clear();
- kpackage->setStatus(i18n("DEB APT"));
+ kpackage->settqStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
@@ -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").arg("apt-file"), TRUE);
+ KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
TQStringList nill;
return nill;
}
diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp
index 41146fe..d0bdd69 100644
--- a/kpackage/debInterface.cpp
+++ b/kpackage/debInterface.cpp
@@ -155,7 +155,7 @@ void DEB::listPackList(TQPtrList<packageInfo> *pki, const TQString &fname, cache
local = u.isLocalFile();
}
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
kpackage->setPercent(0);
TQFile file(STATUS);
diff --git a/kpackage/debInterface.h b/kpackage/debInterface.h
index 8b26b14..78bfe4c 100644
--- a/kpackage/debInterface.h
+++ b/kpackage/debInterface.h
@@ -34,7 +34,7 @@
#include <tqdir.h>
#include <tqfile.h>
#include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqstringlist.h>
#include <kprocess.h>
diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp
index 167ec1b..7831a5e 100644
--- a/kpackage/fbsdInterface.cpp
+++ b/kpackage/fbsdInterface.cpp
@@ -128,7 +128,7 @@ static void insertGroups(TQMap<TQString, TQString> *a, TQString cats)
packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, const TQString &version) {
TQString name( pname);
bool installed = false;
- kpackage->setStatus(i18n("Getting package info"));
+ kpackage->settqStatus(i18n("Getting package info"));
kdDebug() << "Looking at package " << pname << endl;
@@ -205,7 +205,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
}
a["description"] = desc;
} else {
- kpackage->setStatus(TQString());
+ kpackage->settqStatus(TQString());
return 0;
}
@@ -213,7 +213,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
ret->packageState = installed? packageInfo::INSTALLED : packageInfo::AVAILABLE;
ret->fixup();
if (!installed) ret->smerge(typeID);
- kpackage->setStatus(TQString());
+ kpackage->settqStatus(TQString());
return ret;
}
@@ -234,7 +234,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
// Run pkg_info on the package name to get the file list.
// The file list is returned on stdout, one per line.
- kpackage->setStatus(i18n("Getting file list"));
+ kpackage->settqStatus(i18n("Getting file list"));
TQStringList ret;
@@ -249,7 +249,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
} else {
if (!p->hasProperty("name")) {
ret.append(i18n("Can't find package name!"));
- kpackage->setStatus(TQString());
+ kpackage->settqStatus(TQString());
return ret;
}
@@ -270,7 +270,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
ret = list;
- kpackage->setStatus(TQString());
+ kpackage->settqStatus(TQString());
return ret;
}
@@ -498,7 +498,7 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
// Open a pipe to a pkg_info process in order to read the comment, name
// and description for the packages.
- kpackage->setStatus(i18n("Querying BSD packages database for installed packages"));
+ kpackage->settqStatus(i18n("Querying BSD packages database for installed packages"));
TQString cmd = PKG_INFO_BIN;
cmd += " -acdl ";
@@ -527,8 +527,8 @@ 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").arg(value), TRUE);
- kpackage->setStatus(TQString());
+ KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").tqarg(value), TRUE);
+ kpackage->settqStatus(TQString());
return;
} else {
if (pkg[pkg.length()-1] == ':') {
diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp
index 6a333f8..877f2f3 100644
--- a/kpackage/findf.cpp
+++ b/kpackage/findf.cpp
@@ -68,7 +68,7 @@ FindF::FindF(TQWidget *parent)
value->setFocus();
TQLabel *valueLabel = new TQLabel(value, i18n("Find:"), frame1);
- valueLabel->setAlignment( AlignRight );
+ valueLabel->tqsetAlignment( AlignRight );
tab = new KListView(frame1, "tab");
connect(tab, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
diff --git a/kpackage/findf.h b/kpackage/findf.h
index a4e3643..8abaea3 100644
--- a/kpackage/findf.h
+++ b/kpackage/findf.h
@@ -41,7 +41,7 @@
#include <tqfiledialog.h>
#include <tqgroupbox.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
// KDE headers
#include <kapplication.h>
diff --git a/kpackage/gentooInterface.cpp b/kpackage/gentooInterface.cpp
index 448b74c..964f21c 100644
--- a/kpackage/gentooInterface.cpp
+++ b/kpackage/gentooInterface.cpp
@@ -124,7 +124,7 @@ void Gentoo::listInstalledPackages(TQPtrList<packageInfo> *pki)
TQString sline = i18n("Looking for Gentoo packages: ");
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
kpackage->setPercent(0);
TQFile f(portageDir+"profiles/categories");
diff --git a/kpackage/kio.h b/kpackage/kio.h
index 3379cbc..94bb16b 100644
--- a/kpackage/kio.h
+++ b/kpackage/kio.h
@@ -33,7 +33,7 @@
#include <tqobject.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include "../config.h"
#include <kio/job.h>
diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp
index 29de45f..4ed7c74 100644
--- a/kpackage/kissInterface.cpp
+++ b/kpackage/kissInterface.cpp
@@ -143,7 +143,7 @@ void KISS::listInstalledPackages(TQPtrList<packageInfo> *pki)
if (!reader.start(0,FALSE))
return;
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
kpackage->setPercent(0);
vb = "" ;
diff --git a/kpackage/kpPty.h b/kpackage/kpPty.h
index a3afdba..327f3ec 100644
--- a/kpackage/kpPty.h
+++ b/kpackage/kpPty.h
@@ -30,7 +30,7 @@
#include <tqmultilineedit.h>
#include <tqstringlist.h>
#include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqmap.h>
#include <kprocio.h>
diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp
index c7e99b6..34d0a0a 100644
--- a/kpackage/kpTerm.cpp
+++ b/kpackage/kpTerm.cpp
@@ -44,7 +44,7 @@ kpTerm::kpTerm(kpPty *pt, TQWidget * parent, const char * name ) :
pty = pt;
setFont(KGlobalSettings::fixedFont());
// setMinimumWidth(fontMetrics().maxWidth()*80 +
- // minimumSizeHint().width());
+ // tqminimumSizeHint().width());
setWordWrap(NoWrap);
setReadOnly(TRUE);
}
diff --git a/kpackage/kpTerm.h b/kpackage/kpTerm.h
index e997d39..466d7c5 100644
--- a/kpackage/kpTerm.h
+++ b/kpackage/kpTerm.h
@@ -31,9 +31,9 @@
#include "../config.h"
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqstringlist.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <klocale.h>
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 2c90b9f..17697ce 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").arg(fname),TRUE);
+ KpMsgE(i18n("Unknown package type: %1").tqarg(fname),TRUE);
} else {
- KpMsgE(i18n("File not found: %1").arg(fname),TRUE);
+ KpMsgE(i18n("File not found: %1").tqarg(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").arg(url.url()),TRUE);
+ KpMsgE(i18n("Malformed URL: %1").tqarg(url.url()),TRUE);
} else {
// Just a usual file ?
@@ -643,12 +643,12 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
} else {
save_url = url;
- setStatus(i18n("Starting KIO"));
+ settqStatus(i18n("Starting KIO"));
Kio kio;
if (kio.download(url, cf)) {
- setStatus(i18n("KIO finished"));
+ settqStatus(i18n("KIO finished"));
TQFileInfo fi(cf);
if (!(fi.exists() && fi.size() > 0)) {
unlink(TQFile::encodeName(cf));
@@ -660,7 +660,7 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
return cf;
}
} else {
- setStatus(i18n("KIO failed"));
+ settqStatus(i18n("KIO failed"));
return "";
}
}
@@ -732,13 +732,13 @@ void KPACKAGE::dropEvent(TQDropEvent *de) // something has been dropped
openNetFiles(list.toStringList());
}
-void KPACKAGE::setStatus(const TQString &s) // set the text in the status bar
+void KPACKAGE::settqStatus(const TQString &s) // set the text in the status bar
{
status->setText(s);
kapp->processEvents(); // refresh the screen
}
-TQString KPACKAGE::getStatus() // get the text in the status bar
+TQString KPACKAGE::gettqStatus() // get the text in the status bar
{
if(status)
return status->text();
diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h
index c096a0c..2b72029 100644
--- a/kpackage/kpackage.h
+++ b/kpackage/kpackage.h
@@ -77,13 +77,13 @@ public:
OPEN_READONLY = 2,
OPEN_INSERT = 4 };
- void setStatus(const TQString &s);
+ void settqStatus(const TQString &s);
// this sets the status bar's string to s
void setPercent(int x);
// this set the status bar's progress to x
- TQString getStatus();
+ TQString gettqStatus();
// this gets the current status string on the status bar
// void setMode(int newmode, pkgInterface *type, int refresh);
diff --git a/kpackage/kplview.h b/kpackage/kplview.h
index 41b6f4f..7e31529 100644
--- a/kpackage/kplview.h
+++ b/kpackage/kplview.h
@@ -36,7 +36,7 @@
#include <tqpushbutton.h>
#include <tqptrlist.h>
#include <tqstring.h>
-#include <layout.h>
+#include <tqlayout.h>
// KDE headers
#include "klistview.h"
diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index cdd7f45..3ec4d07 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -170,9 +170,9 @@ void managementWidget::setupWidgets()
connect(linstButton,TQT_SIGNAL(clicked()),
TQT_SLOT(installMultClicked()));
- leftbox->addLayout(lbuttons,0); // top level layout as child
+ leftbox->addLayout(lbuttons,0); // top level tqlayout as child
- // Setup the `buttons' layout
+ // Setup the `buttons' tqlayout
lbuttons->addWidget(linstButton,1,AlignBottom);
lbuttons->addWidget(luinstButton,1,AlignBottom);
lbuttons->addStretch(1);
@@ -200,11 +200,11 @@ void managementWidget::setupWidgets()
TQT_SLOT(installSingleClicked()));
- // Setup the `right panel' layout
+ // Setup the `right panel' tqlayout
rightbox->addWidget(packageDisplay,10);
- rightbox->addLayout(rbuttons,0); // top level layout as child
+ rightbox->addLayout(rbuttons,0); // top level tqlayout as child
- // Setup the `buttons' layout
+ // Setup the `buttons' tqlayout
rbuttons->addWidget(instButton,1);
rbuttons->addWidget(uinstButton,1);
rbuttons->addStretch(1);
@@ -289,7 +289,7 @@ void managementWidget::setupInstButton()
void managementWidget::arrangeWidgets()
{
- // this is done automatically by the layout managers
+ // this is done automatically by the tqlayout managers
}
void managementWidget::tabChanged(int tab)
@@ -352,7 +352,7 @@ void managementWidget::rebuildListTree()
packageInfo *i;
int n = 0;
- kpackage->setStatus(i18n("Building package tree"));
+ kpackage->settqStatus(i18n("Building package tree"));
kpackage->setPercent(0);
treeList->setSorting(-1);
@@ -378,7 +378,7 @@ void managementWidget::rebuildListTree()
treeList->setSorting(0);
kpackage->setPercent(100); // set the progress
- kpackage->setStatus("");
+ kpackage->settqStatus("");
checkMarked();
}
diff --git a/kpackage/managementWidget.h b/kpackage/managementWidget.h
index b48e711..f4bd82a 100644
--- a/kpackage/managementWidget.h
+++ b/kpackage/managementWidget.h
@@ -47,7 +47,7 @@
#include <tqpushbutton.h>
#include <tqptrlist.h>
#include <tqstring.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtabwidget.h>
#include <tqlabel.h>
#include <tqhbox.h>
@@ -181,7 +181,7 @@ private:
// This widget displays the package info / file-list
TQBoxLayout *top, *leftbox, *rightbox, *lbuttons, *rbuttons;
- // These are the geometry managers
+ // These are the tqgeometry managers
TQFrame *leftpanel, *rightpanel;
// frame to put TQBox in
diff --git a/kpackage/options.cpp b/kpackage/options.cpp
index 6fa467f..7594d51 100644
--- a/kpackage/options.cpp
+++ b/kpackage/options.cpp
@@ -40,7 +40,7 @@
#include <tqframe.h>
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
@@ -96,8 +96,8 @@ Options::Options(TQWidget *parent)
} else {
msgStr = kpinterface[i]->name;
msgStr = i18n("%1: %2 not found")
- .arg(kpinterface[i]->name)
- .arg(kpinterface[i]->errExe);
+ .tqarg(kpinterface[i]->name)
+ .tqarg(kpinterface[i]->errExe);
}
packageBox[i] = new TQGroupBox(2,Qt::Horizontal,msgStr, framet, "box");
packageHandle[i] = new TQCheckBox(i18n("Enable"), packageBox[i]);
@@ -146,7 +146,7 @@ Options::Options(TQWidget *parent)
vp->addWidget(pcache[2]);
TQGroupBox* cd = new TQGroupBox (1, Qt::Horizontal, i18n("Cache Folder"), page) ;
- cd->setSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
+ cd->tqsetSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
cachedir = new KURLRequester("", cd, "cachedir");
}
diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp
index f81f769..5016439 100644
--- a/kpackage/packageDisplay.cpp
+++ b/kpackage/packageDisplay.cpp
@@ -35,7 +35,7 @@
#include <tqapplication.h>
#include <tqfileinfo.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <kdebug.h>
#include <kiconloader.h>
@@ -280,7 +280,7 @@ void packageDisplayWidget::updateFileList()
TQStringList errorfiles;
// set the status
- kpackage->setStatus(i18n("Updating File List"));
+ kpackage->settqStatus(i18n("Updating File List"));
// clear the file list
fileList->clear();
@@ -306,7 +306,7 @@ void packageDisplayWidget::updateFileList()
errorfiles = package->interface->verify(package, files);
}
- kpackage->setStatus(i18n("Updating File List"));
+ kpackage->settqStatus(i18n("Updating File List"));
uint c=0, p=0;
uint step = (files.count() / 100) + 1;
diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp
index 2e1aca7..05fd3ca 100644
--- a/kpackage/packageProperties.cpp
+++ b/kpackage/packageProperties.cpp
@@ -46,7 +46,7 @@ packagePropertiesWidget::packagePropertiesWidget
// hide();
package=NULL;
- TQColorGroup cg = colorGroup();
+ TQColorGroup cg = tqcolorGroup();
setBackgroundColor(cg.base());
initTranslate();
}
diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index 435e830..fba9263 100644
--- a/kpackage/pkgInterface.cpp
+++ b/kpackage/pkgInterface.cpp
@@ -142,7 +142,7 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
packageInfo *p;
TQString sline( queryMsg + fname );
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
kdDebug() << "listDir fn=" << fname << " dir=" << dir << endl;
@@ -163,8 +163,8 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
while ( (fi=it.current()) ) { // for each entry...
if ( fi->isDir() ) {
// entry is a subdir
- if ( fi->fileName() != TQString::fromLatin1(".") &&
- fi->fileName() != TQString::fromLatin1("..") )
+ if ( fi->fileName() != TQString::tqfromLatin1(".") &&
+ fi->fileName() != TQString::tqfromLatin1("..") )
{
// not current dir and not parent dir
// -> recursive call:
@@ -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").arg(d.absPath() ) << endl;
+ kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").tqarg(d.absPath() ) << endl;
}
} else {
TQFile f(fname);
@@ -257,12 +257,12 @@ TQString pkgInterface::getPackList(cacheObj *cp)
unlink(TQFile::encodeName(tmpf));
if (kpkg)
- kpackage->setStatus(i18n("Starting Kio"));
+ kpackage->settqStatus(i18n("Starting Kio"));
Kio kio;
if (kio.download(url, tmpf)) {
if (kpkg)
- kpackage->setStatus(i18n("Kio finished"));
+ kpackage->settqStatus(i18n("Kio finished"));
TQFileInfo f(tmpf);
if (!(f.exists() && f.size() > 0)) {
unlink(TQFile::encodeName(tmpf));
@@ -272,7 +272,7 @@ TQString pkgInterface::getPackList(cacheObj *cp)
}
} else {
if (kpkg)
- kpackage->setStatus(i18n("Kio failed"));
+ kpackage->settqStatus(i18n("Kio failed"));
return "";
}
} else {
@@ -297,7 +297,7 @@ TQString pkgInterface::getDir(cacheObj *cp) {
cl.write();
return tmpDir;
} else {
- KpMsgE(i18n("Cannot read folder %1").arg(url),FALSE);
+ KpMsgE(i18n("Cannot read folder %1").tqarg(url),FALSE);
unlink(tmpDir.ascii());
return TQString();
}
@@ -327,7 +327,7 @@ TQStringList pkgInterface::verify(packageInfo *, const TQStringList &files)
uint step = (files.count() / 100) + 1;
- kpackage->setStatus(i18n("Verifying"));
+ kpackage->settqStatus(i18n("Verifying"));
kpackage->setPercent(0);
for( TQStringList::ConstIterator it = files.begin();
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index 9d62f2f..4775fce 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -102,38 +102,38 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
connect(cancelButton,TQT_SIGNAL(clicked()),TQT_SLOT(cancelButtonClicked()));
connect(Keep, TQT_SIGNAL(toggled(bool)), TQT_SLOT(keepToggle(bool)));
- // Do the layout
- vlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
- vlayout->addWidget(title,0);
+ // Do the tqlayout
+ vtqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
+ vtqlayout->addWidget(title,0);
{
- hlayout = new TQBoxLayout(vlayout,TQBoxLayout::LeftToRight, spacingHint());
+ htqlayout = new TQBoxLayout(vtqlayout,TQBoxLayout::LeftToRight, spacingHint());
{
- layout = new TQBoxLayout(hlayout,TQBoxLayout::TopToBottom, spacingHint());
+ tqlayout = new TQBoxLayout(htqlayout,TQBoxLayout::TopToBottom, spacingHint());
packages = new KListView(this);
- layout->addWidget(packages,20);
+ tqlayout->addWidget(packages,20);
packages->addColumn(i18n("PACKAGES"),200);
connect(packages, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
this, TQT_SLOT(slotSearch( TQListViewItem * )));
- layout->addStretch(1);
+ tqlayout->addStretch(1);
for (i = 0; i < bnumber; i++) {
- layout->addWidget(Boxs[i],1);
+ tqlayout->addWidget(Boxs[i],1);
}
- layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+ tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
- TQBoxLayout *slayout = new TQBoxLayout(layout, TQBoxLayout::LeftToRight);
- slayout->addStretch(1);
- slayout->addWidget(Keep, 1);
- slayout->addStretch(1);
+ TQBoxLayout *stqlayout = new TQBoxLayout(tqlayout, TQBoxLayout::LeftToRight);
+ stqlayout->addStretch(1);
+ stqlayout->addWidget(Keep, 1);
+ stqlayout->addStretch(1);
- layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+ tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
TQBoxLayout *buttons = new TQBoxLayout(TQBoxLayout::LeftToRight);
- layout->addLayout(buttons);
+ tqlayout->addLayout(buttons);
buttons->addWidget(installButton,2);
buttons->addStretch(1);
@@ -141,7 +141,7 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
}
{
term = new kpTerm(kpty,this);
- hlayout->addWidget(term, 1000);
+ htqlayout->addWidget(term, 1000);
}
}
resize(800, 400);
@@ -202,7 +202,7 @@ bool pkgOptions::setup(TQPtrList<packageInfo> *pl, const TQString &)
}
}
- s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).arg(insType,pkgInt->name);
+ s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).tqarg(insType,pkgInt->name);
title->setText(s);
for (TQStringList::Iterator pit = plist.begin(); pit != plist.end(); ++pit ) {
diff --git a/kpackage/pkgOptions.h b/kpackage/pkgOptions.h
index b933542..becbc54 100644
--- a/kpackage/pkgOptions.h
+++ b/kpackage/pkgOptions.h
@@ -34,7 +34,7 @@
#include "../config.h"
// TQt headers
#include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
@@ -104,8 +104,8 @@ signals:
void finished(int refresh);
protected:
- // The layout managers
- TQBoxLayout *layout, *hlayout, *vlayout;
+ // The tqlayout managers
+ TQBoxLayout *tqlayout, *htqlayout, *vtqlayout;
// Sub widgets
TQPushButton *installButton;
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index 568e651..9017c8a 100644
--- a/kpackage/procbuf.cpp
+++ b/kpackage/procbuf.cpp
@@ -36,7 +36,7 @@ Modal::Modal(TQString msg, TQWidget *parent, const char * name )
: KDialog( parent, name, TRUE )
{
TQLabel *line1 = new TQLabel(msg,this);
- line1->setAlignment(AlignCenter);
+ line1->tqsetAlignment(AlignCenter);
line1->setAutoResize(true);
}
@@ -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").arg(timeMsg), TRUE);
+ KpMsg("Error",i18n("Timeout: %1").tqarg(timeMsg), TRUE);
delete proc; proc = 0;
return 0;
} else {
if (!proc->normalExit() || proc->exitStatus()) {
if (errorDlg) {
- KpMsg("Error",i18n("Kprocess error:%1").arg(buf), TRUE);
+ KpMsg("Error",i18n("Kprocess error:%1").tqarg(buf), TRUE);
}
delete proc; proc = 0;
return 0;
diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp
index 1cc4a85..9b0401f 100644
--- a/kpackage/rpmInterface.cpp
+++ b/kpackage/rpmInterface.cpp
@@ -160,11 +160,11 @@ void RPM::listInstalledPackages(TQPtrList<packageInfo> *pki)
TQString cmd = "rpm -q -a";
cmd += packageQuery();
- kpackage->setStatus(i18n("Querying RPM package list"));
+ kpackage->settqStatus(i18n("Querying RPM package list"));
kpackage->setPercent(0);
TQStringList list = kpty->run(cmd);
- kpackage->setStatus(i18n("Processing RPM package list"));
+ kpackage->settqStatus(i18n("Processing RPM package list"));
// kdDebug() << "P=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -197,7 +197,7 @@ void RPM::listInstalledPackages(TQPtrList<packageInfo> *pki)
}
list.clear();
- kpackage->setStatus(i18n("DEB APT"));
+ kpackage->settqStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
diff --git a/kpackage/search.cpp b/kpackage/search.cpp
index a2cf9ff..2a7bb25 100644
--- a/kpackage/search.cpp
+++ b/kpackage/search.cpp
@@ -54,7 +54,7 @@ Search::Search(TQWidget *parent, const char * name)
value = new TQLineEdit( frame1, "v");
vf->addWidget(value,0);
value->setFocus();
- value->setFixedHeight(value->sizeHint().height());
+ value->setFixedHeight(value->tqsizeHint().height());
value->setMinimumWidth(250);
connect(value, TQT_SIGNAL(textChanged(const TQString &)),this, TQT_SLOT(textChanged(const TQString &)));
@@ -64,13 +64,13 @@ Search::Search(TQWidget *parent, const char * name)
substr = new TQCheckBox(i18n("Sub string"), frame1, "substr");
substr->setChecked(TRUE);
hc->addWidget(substr,1,AlignLeft);
- substr->setFixedSize(substr->sizeHint());
+ substr->setFixedSize(substr->tqsizeHint());
hc->addStretch(1);
wrap = new TQCheckBox(i18n("Wrap search"), frame1, "wrap");
wrap->setChecked(TRUE);
hc->addWidget(wrap,1,AlignRight);
- wrap->setFixedSize(wrap->sizeHint());
+ wrap->setFixedSize(wrap->tqsizeHint());
enableButton( User1, false );
@@ -104,7 +104,7 @@ void Search::ok_slot()
}
if (pkg == 0)
KpMsg(i18n("Note"),
- i18n("%1 was not found.").arg(to_find),TRUE);
+ i18n("%1 was not found.").tqarg(to_find),TRUE);
}
void Search::done_slot()
diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp
index e4c97a6..ae51d7b 100644
--- a/kpackage/slackInterface.cpp
+++ b/kpackage/slackInterface.cpp
@@ -206,7 +206,7 @@ void SLACK::listInstalledPackages(TQPtrList<packageInfo> *pki)
TQDir d(DIR);
if (d.exists()) {
TQString sline = i18n("Querying SLACK package list: ");
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
const TQFileInfoList *list = d.entryInfoList();
int count = list->count();
@@ -260,7 +260,7 @@ void SLACK::listPackList(TQPtrList<packageInfo> *pki, const TQString &s, cacheO
TQString sline = i18n("Querying SLACK package list: ");
sline += cp->location;
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
kpackage->setPercent(0);
np = 0;
@@ -619,7 +619,7 @@ TQStringList SLACK::FindFile(const TQString &name, bool)
TQDir d(DIR);
if (d.exists()) {
TQString sline = i18n("Querying SLACK package list: ");
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
const TQFileInfoList *list = d.entryInfoList();
int count = list->count();
diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp
index c662da8..1a66446 100644
--- a/kpackage/updateLoc.cpp
+++ b/kpackage/updateLoc.cpp
@@ -140,7 +140,7 @@ dpanel::dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs,
if (bsubdirs) {
psubdirs = new TQCheckBox(i18n("Subfolders"),this);
- psubdirs->setFixedSize(psubdirs->sizeHint());
+ psubdirs->setFixedSize(psubdirs->tqsizeHint());
pack->addWidget(psubdirs,0);
}
@@ -272,9 +272,9 @@ void updateLoc::doBase(const TQString & bmsg)
if (haveBase) {
fbase = new TQGroupBox(bmsg, this);
fbase->setColumnLayout(0, Qt::Vertical );
- fbase->layout()->setSpacing( KDialog::spacingHint() );
- fbase->layout()->setMargin( KDialog::marginHint() );
- vbase = new TQVBoxLayout(fbase->layout());
+ fbase->tqlayout()->setSpacing( KDialog::spacingHint() );
+ fbase->tqlayout()->setMargin( KDialog::marginHint() );
+ vbase = new TQVBoxLayout(fbase->tqlayout());
vf->addWidget(fbase,1);
base = new dpanel(fbase);
vbase->addWidget(base,0);
@@ -410,10 +410,10 @@ pdUpdateLoc::pdUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, cons
TQGroupBox *floc = new TQGroupBox(lmsg, this);
floc->setColumnLayout(0, Qt::Vertical );
- floc->layout()->setSpacing( KDialog::spacingHint() );
- floc->layout()->setMargin( KDialog::marginHint() );
+ floc->tqlayout()->setSpacing( KDialog::spacingHint() );
+ floc->tqlayout()->setMargin( KDialog::marginHint() );
vf->addWidget(floc,1);
- TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
+ TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
for (int i = 0; i < numLines; i++) {
dp[i] = new dpanel(base, filter, subdirs, floc);
@@ -547,10 +547,10 @@ cUpdateLoc::cUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const
for (int i = 0; i < numLines; i++) {
TQGroupBox *floc = new TQGroupBox(*kcIt, this);
floc->setColumnLayout(0, Qt::Vertical );
- floc->layout()->setSpacing( KDialog::spacingHint() );
- floc->layout()->setMargin( KDialog::marginHint() );
+ floc->tqlayout()->setSpacing( KDialog::spacingHint() );
+ floc->tqlayout()->setMargin( KDialog::marginHint() );
vf->addWidget(floc,1);
- TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
+ TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
combo[i] = new KComboBox( true, floc);
KCompletion *comp = combo[i]->completionObject();
diff --git a/kpackage/updateLoc.h b/kpackage/updateLoc.h
index ebd5d53..2305cb2 100644
--- a/kpackage/updateLoc.h
+++ b/kpackage/updateLoc.h
@@ -42,7 +42,7 @@
#include <tqfiledialog.h>
#include <tqgroupbox.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
// KDE headers