summaryrefslogtreecommitdiffstats
path: root/kpackage
diff options
context:
space:
mode:
Diffstat (limited to 'kpackage')
-rw-r--r--kpackage/debAptInterface.cpp16
-rw-r--r--kpackage/debInterface.cpp2
-rw-r--r--kpackage/fbsdInterface.cpp16
-rw-r--r--kpackage/findf.cpp2
-rw-r--r--kpackage/gentooInterface.cpp2
-rw-r--r--kpackage/kissInterface.cpp2
-rw-r--r--kpackage/kpTerm.cpp2
-rw-r--r--kpackage/kpackage.cpp10
-rw-r--r--kpackage/kpackage.h4
-rw-r--r--kpackage/managementWidget.cpp4
-rw-r--r--kpackage/options.cpp2
-rw-r--r--kpackage/packageDisplay.cpp4
-rw-r--r--kpackage/packageProperties.cpp2
-rw-r--r--kpackage/pkgInterface.cpp14
-rw-r--r--kpackage/procbuf.cpp2
-rw-r--r--kpackage/rpmInterface.cpp6
-rw-r--r--kpackage/search.cpp6
-rw-r--r--kpackage/slackInterface.cpp6
-rw-r--r--kpackage/updateLoc.cpp2
19 files changed, 52 insertions, 52 deletions
diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index ce28d21..498f93c 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -185,13 +185,13 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
packageInfo *p;
TQStringList plist;
- kpackage->settqStatus(i18n("Querying DEB APT remote package list: %1").tqarg(hostName));
+ kpackage->setStatus(i18n("Querying DEB APT remote package list: %1").tqarg(hostName));
kpackage->setPercent(0);
TQString cmd = "cat " STATUS;
TQStringList list = kpty->run(cmd);
- kpackage->settqStatus(i18n("Processing DEB APT remote package list: %1").tqarg(hostName));
+ kpackage->setStatus(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->settqStatus(i18n("DEB APT"));
+ kpackage->setStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
@@ -241,16 +241,16 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
// kdDebug() << "H=" << hostName << "\n";
if (hostName.isEmpty())
- kpackage->settqStatus(i18n("Querying DEB APT available list"));
+ kpackage->setStatus(i18n("Querying DEB APT available list"));
else
- kpackage->settqStatus(i18n("Querying DEB APT available list: %1").tqarg(hostName));
+ kpackage->setStatus(i18n("Querying DEB APT available list: %1").tqarg(hostName));
kpackage->setPercent(0);
TQStringList list = kpty->run("apt-cache dumpavail");
if (hostName.isEmpty())
- kpackage->settqStatus(i18n("Processing DEB APT available list"));
+ kpackage->setStatus(i18n("Processing DEB APT available list"));
else
- kpackage->settqStatus(i18n("Processing DEB APT available list: %1").tqarg(hostName));
+ kpackage->setStatus(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->settqStatus(i18n("DEB APT"));
+ kpackage->setStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp
index d0bdd69..41146fe 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->settqStatus(sline);
+ kpackage->setStatus(sline);
kpackage->setPercent(0);
TQFile file(STATUS);
diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp
index 7831a5e..730e769 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->settqStatus(i18n("Getting package info"));
+ kpackage->setStatus(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->settqStatus(TQString());
+ kpackage->setStatus(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->settqStatus(TQString());
+ kpackage->setStatus(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->settqStatus(i18n("Getting file list"));
+ kpackage->setStatus(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->settqStatus(TQString());
+ kpackage->setStatus(TQString());
return ret;
}
@@ -270,7 +270,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
ret = list;
- kpackage->settqStatus(TQString());
+ kpackage->setStatus(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->settqStatus(i18n("Querying BSD packages database for installed packages"));
+ kpackage->setStatus(i18n("Querying BSD packages database for installed packages"));
TQString cmd = PKG_INFO_BIN;
cmd += " -acdl ";
@@ -528,7 +528,7 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
TQString pkg = name.section(' ',-1);
if (pkg.isEmpty()) {
KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").tqarg(value), TRUE);
- kpackage->settqStatus(TQString());
+ kpackage->setStatus(TQString());
return;
} else {
if (pkg[pkg.length()-1] == ':') {
diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp
index 877f2f3..6a333f8 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->tqsetAlignment( AlignRight );
+ valueLabel->setAlignment( AlignRight );
tab = new KListView(frame1, "tab");
connect(tab, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
diff --git a/kpackage/gentooInterface.cpp b/kpackage/gentooInterface.cpp
index 964f21c..448b74c 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->settqStatus(sline);
+ kpackage->setStatus(sline);
kpackage->setPercent(0);
TQFile f(portageDir+"profiles/categories");
diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp
index 4ed7c74..29de45f 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->settqStatus(sline);
+ kpackage->setStatus(sline);
kpackage->setPercent(0);
vb = "" ;
diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp
index 34d0a0a..c7e99b6 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 +
- // tqminimumSizeHint().width());
+ // minimumSizeHint().width());
setWordWrap(NoWrap);
setReadOnly(TRUE);
}
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 17697ce..041c793 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -643,12 +643,12 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
} else {
save_url = url;
- settqStatus(i18n("Starting KIO"));
+ setStatus(i18n("Starting KIO"));
Kio kio;
if (kio.download(url, cf)) {
- settqStatus(i18n("KIO finished"));
+ setStatus(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 {
- settqStatus(i18n("KIO failed"));
+ setStatus(i18n("KIO failed"));
return "";
}
}
@@ -732,13 +732,13 @@ void KPACKAGE::dropEvent(TQDropEvent *de) // something has been dropped
openNetFiles(list.toStringList());
}
-void KPACKAGE::settqStatus(const TQString &s) // set the text in the status bar
+void KPACKAGE::setStatus(const TQString &s) // set the text in the status bar
{
status->setText(s);
kapp->processEvents(); // refresh the screen
}
-TQString KPACKAGE::gettqStatus() // get the text in the status bar
+TQString KPACKAGE::getStatus() // get the text in the status bar
{
if(status)
return status->text();
diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h
index 2b72029..c096a0c 100644
--- a/kpackage/kpackage.h
+++ b/kpackage/kpackage.h
@@ -77,13 +77,13 @@ public:
OPEN_READONLY = 2,
OPEN_INSERT = 4 };
- void settqStatus(const TQString &s);
+ void setStatus(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 gettqStatus();
+ TQString getStatus();
// this gets the current status string on the status bar
// void setMode(int newmode, pkgInterface *type, int refresh);
diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index 3ec4d07..5298d56 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -352,7 +352,7 @@ void managementWidget::rebuildListTree()
packageInfo *i;
int n = 0;
- kpackage->settqStatus(i18n("Building package tree"));
+ kpackage->setStatus(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->settqStatus("");
+ kpackage->setStatus("");
checkMarked();
}
diff --git a/kpackage/options.cpp b/kpackage/options.cpp
index 7594d51..a65e17a 100644
--- a/kpackage/options.cpp
+++ b/kpackage/options.cpp
@@ -146,7 +146,7 @@ Options::Options(TQWidget *parent)
vp->addWidget(pcache[2]);
TQGroupBox* cd = new TQGroupBox (1, Qt::Horizontal, i18n("Cache Folder"), page) ;
- cd->tqsetSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
+ cd->setSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
cachedir = new KURLRequester("", cd, "cachedir");
}
diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp
index 5016439..8941327 100644
--- a/kpackage/packageDisplay.cpp
+++ b/kpackage/packageDisplay.cpp
@@ -280,7 +280,7 @@ void packageDisplayWidget::updateFileList()
TQStringList errorfiles;
// set the status
- kpackage->settqStatus(i18n("Updating File List"));
+ kpackage->setStatus(i18n("Updating File List"));
// clear the file list
fileList->clear();
@@ -306,7 +306,7 @@ void packageDisplayWidget::updateFileList()
errorfiles = package->interface->verify(package, files);
}
- kpackage->settqStatus(i18n("Updating File List"));
+ kpackage->setStatus(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 05fd3ca..2e1aca7 100644
--- a/kpackage/packageProperties.cpp
+++ b/kpackage/packageProperties.cpp
@@ -46,7 +46,7 @@ packagePropertiesWidget::packagePropertiesWidget
// hide();
package=NULL;
- TQColorGroup cg = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
setBackgroundColor(cg.base());
initTranslate();
}
diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index fba9263..93c7d28 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->settqStatus(sline);
+ kpackage->setStatus(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::tqfromLatin1(".") &&
- fi->fileName() != TQString::tqfromLatin1("..") )
+ if ( fi->fileName() != TQString::fromLatin1(".") &&
+ fi->fileName() != TQString::fromLatin1("..") )
{
// not current dir and not parent dir
// -> recursive call:
@@ -257,12 +257,12 @@ TQString pkgInterface::getPackList(cacheObj *cp)
unlink(TQFile::encodeName(tmpf));
if (kpkg)
- kpackage->settqStatus(i18n("Starting Kio"));
+ kpackage->setStatus(i18n("Starting Kio"));
Kio kio;
if (kio.download(url, tmpf)) {
if (kpkg)
- kpackage->settqStatus(i18n("Kio finished"));
+ kpackage->setStatus(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->settqStatus(i18n("Kio failed"));
+ kpackage->setStatus(i18n("Kio failed"));
return "";
}
} else {
@@ -327,7 +327,7 @@ TQStringList pkgInterface::verify(packageInfo *, const TQStringList &files)
uint step = (files.count() / 100) + 1;
- kpackage->settqStatus(i18n("Verifying"));
+ kpackage->setStatus(i18n("Verifying"));
kpackage->setPercent(0);
for( TQStringList::ConstIterator it = files.begin();
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index 9017c8a..a17e9cb 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->tqsetAlignment(AlignCenter);
+ line1->setAlignment(AlignCenter);
line1->setAutoResize(true);
}
diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp
index 9b0401f..1cc4a85 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->settqStatus(i18n("Querying RPM package list"));
+ kpackage->setStatus(i18n("Querying RPM package list"));
kpackage->setPercent(0);
TQStringList list = kpty->run(cmd);
- kpackage->settqStatus(i18n("Processing RPM package list"));
+ kpackage->setStatus(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->settqStatus(i18n("DEB APT"));
+ kpackage->setStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
diff --git a/kpackage/search.cpp b/kpackage/search.cpp
index 2a7bb25..8338ee8 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->tqsizeHint().height());
+ value->setFixedHeight(value->sizeHint().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->tqsizeHint());
+ substr->setFixedSize(substr->sizeHint());
hc->addStretch(1);
wrap = new TQCheckBox(i18n("Wrap search"), frame1, "wrap");
wrap->setChecked(TRUE);
hc->addWidget(wrap,1,AlignRight);
- wrap->setFixedSize(wrap->tqsizeHint());
+ wrap->setFixedSize(wrap->sizeHint());
enableButton( User1, false );
diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp
index ae51d7b..e4c97a6 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->settqStatus(sline);
+ kpackage->setStatus(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->settqStatus(sline);
+ kpackage->setStatus(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->settqStatus(sline);
+ kpackage->setStatus(sline);
const TQFileInfoList *list = d.entryInfoList();
int count = list->count();
diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp
index 1a66446..8192083 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->tqsizeHint());
+ psubdirs->setFixedSize(psubdirs->sizeHint());
pack->addWidget(psubdirs,0);
}