Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent e1fedebd35
commit dbb67f90e8

@ -62,7 +62,7 @@ KTView::KTView(TQWidget *tqparent, const char* name) :
clipboardCTTask(0), clipboardCTTask(0),
clipboardCTVariable(0) clipboardCTVariable(0)
{ {
ktapp = (KTApp*)tqparentWidget(); ktapp = (KTApp*)parentWidget();
setBackgroundMode(PaletteBase); setBackgroundMode(PaletteBase);
refresh(); refresh();
listView->setSelected(listView->firstChild(), true); listView->setSelected(listView->firstChild(), true);

@ -380,6 +380,6 @@ You must still specify the block size.</string>
<slot access="protected">slotBrowseTapeDevice()</slot> <slot access="protected">slotBrowseTapeDevice()</slot>
<slot access="protected">slotBrowseTarCommand()</slot> <slot access="protected">slotBrowseTarCommand()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="11" margin="6"/> <layoutdefaults spacing="11" margin="6"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -314,20 +314,20 @@ void KTreeViewItem::paint(TQPainter* p, int indent, const TQColorGroup& cg,
void KTreeViewItem::paintExpandButton(TQPainter* p, int indent, int cellHeight) const void KTreeViewItem::paintExpandButton(TQPainter* p, int indent, int cellHeight) const
{ {
int tqparentLeaderX = indent - (22 / 2); int parentLeaderX = indent - (22 / 2);
int cellCenterY = cellHeight / 2; int cellCenterY = cellHeight / 2;
expandButton.setRect(tqparentLeaderX - 4, cellCenterY - 4, 9, 9); expandButton.setRect(parentLeaderX - 4, cellCenterY - 4, 9, 9);
p->setBrush(TQt::white); p->setBrush(TQt::white);
p->drawRect(expandButton); p->drawRect(expandButton);
if (expanded) { if (expanded) {
p->drawLine(tqparentLeaderX - 2, cellCenterY, p->drawLine(parentLeaderX - 2, cellCenterY,
tqparentLeaderX + 2, cellCenterY); parentLeaderX + 2, cellCenterY);
} else { } else {
p->drawLine(tqparentLeaderX - 2, cellCenterY, p->drawLine(parentLeaderX - 2, cellCenterY,
tqparentLeaderX + 2, cellCenterY); parentLeaderX + 2, cellCenterY);
p->drawLine(tqparentLeaderX, cellCenterY - 2, p->drawLine(parentLeaderX, cellCenterY - 2,
tqparentLeaderX, cellCenterY + 2); parentLeaderX, cellCenterY + 2);
} }
p->setBrush(TQt::NoBrush); p->setBrush(TQt::NoBrush);
} }
@ -386,7 +386,7 @@ void KTreeViewItem::paintText(TQPainter* p, int indent, int cellHeight,
// paint the tree structure // paint the tree structure
void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
{ {
int tqparentLeaderX = indent - (22 / 2); int parentLeaderX = indent - (22 / 2);
int cellCenterY = cellHeight / 2; int cellCenterY = cellHeight / 2;
int cellBottomY = cellHeight - 1; int cellBottomY = cellHeight - 1;
int itemLeaderX = indent - 3; int itemLeaderX = indent - 3;
@ -396,11 +396,11 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
* towards tqparent or sibling. * towards tqparent or sibling.
*/ */
if (tqparent->tqparent != 0 || tqparent->getChild() != this) if (tqparent->tqparent != 0 || tqparent->getChild() != this)
p->drawLine(tqparentLeaderX, 0, tqparentLeaderX, cellCenterY); p->drawLine(parentLeaderX, 0, parentLeaderX, cellCenterY);
// draw the line down towards sibling // draw the line down towards sibling
if (sibling) if (sibling)
p->drawLine(tqparentLeaderX, cellCenterY, tqparentLeaderX, cellBottomY); 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 tqchildren or siblings in the tree or is a child of
@ -415,7 +415,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
*/ */
tqparent->getChild() != this) tqparent->getChild() != this)
{ {
p->drawLine(tqparentLeaderX, cellCenterY, itemLeaderX, cellCenterY); p->drawLine(parentLeaderX, cellCenterY, itemLeaderX, cellCenterY);
} }
/* /*
@ -650,10 +650,10 @@ void KTreeView::appendChildItem(const TQString & theText, const TQPixmap& thePix
void KTreeView::appendChildItem(KTreeViewItem* newItem, int index) void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
{ {
/* find tqparent item and append new item to tqparent's sub tree */ /* find tqparent item and append new item to tqparent's sub tree */
KTreeViewItem* tqparentItem = itemAt(index); KTreeViewItem* parentItem = itemAt(index);
if (!tqparentItem) if (!parentItem)
return; return;
appendChildItem(tqparentItem, newItem); appendChildItem(parentItem, newItem);
} }
// appends the given item to the tqchildren of the item at the end of the // appends the given item to the tqchildren of the item at the end of the
@ -661,10 +661,10 @@ void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
void KTreeView::appendChildItem(KTreeViewItem* newItem, const KPath& thePath) void KTreeView::appendChildItem(KTreeViewItem* newItem, const KPath& thePath)
{ {
/* find tqparent item and append new item to tqparent's sub tree */ /* find tqparent item and append new item to tqparent's sub tree */
KTreeViewItem* tqparentItem = itemAt(thePath); KTreeViewItem* parentItem = itemAt(thePath);
if (!tqparentItem) if (!parentItem)
return; return;
appendChildItem(tqparentItem, newItem); appendChildItem(parentItem, newItem);
} }
// indicates whether horizontal scrollbar appears only when needed // indicates whether horizontal scrollbar appears only when needed
@ -1321,14 +1321,14 @@ void KTreeView::expandOrCollapse(KTreeViewItem* tqparent)
{ {
bool autoU = autoUpdate(); bool autoU = autoUpdate();
setAutoUpdate(false); setAutoUpdate(false);
int tqparentIndex = itemRow(tqparent); int parentIndex = itemRow(tqparent);
if (tqparent->isExpanded()) { if (tqparent->isExpanded()) {
collapseSubTree(tqparent); collapseSubTree(tqparent);
emit collapsed(tqparentIndex); emit collapsed(parentIndex);
} }
else { else {
expandSubTree(tqparent); expandSubTree(tqparent);
emit expanded(tqparentIndex); emit expanded(parentIndex);
} }
if (autoU && isVisible()) if (autoU && isVisible())
tqrepaint(); tqrepaint();
@ -1368,21 +1368,21 @@ void KTreeView::expandSubTree(KTreeViewItem* subRoot)
} }
// fix up branch levels out of whack from split/join operations on the tree // fix up branch levels out of whack from split/join operations on the tree
void KTreeView::fixChildren(KTreeViewItem *tqparentItem) void KTreeView::fixChildren(KTreeViewItem *parentItem)
{ {
KTreeViewItem* childItem = 0; KTreeViewItem* childItem = 0;
KTreeViewItem* siblingItem = 0; KTreeViewItem* siblingItem = 0;
// int childBranch = tqparentItem->getBranch() + 1; // int childBranch = parentItem->getBranch() + 1;
if(tqparentItem->hasChild()) { if(parentItem->hasChild()) {
childItem = tqparentItem->getChild(); childItem = parentItem->getChild();
// childItem->setBranch(childBranch); // childItem->setBranch(childBranch);
childItem->owner = tqparentItem->owner; childItem->owner = parentItem->owner;
fixChildren(childItem); fixChildren(childItem);
} }
while(childItem && childItem->hasSibling()) { while(childItem && childItem->hasSibling()) {
siblingItem = childItem->getSibling(); siblingItem = childItem->getSibling();
// siblingItem->setBranch(childBranch); // siblingItem->setBranch(childBranch);
siblingItem->owner = tqparentItem->owner; siblingItem->owner = parentItem->owner;
fixChildren(siblingItem); fixChildren(siblingItem);
childItem = siblingItem; childItem = siblingItem;
} }
@ -1483,19 +1483,19 @@ bool KTreeView::insertItem(KTreeViewItem* referenceItem,
{ {
setCellHeight(newItem->height(fontMetrics())); setCellHeight(newItem->height(fontMetrics()));
} }
KTreeViewItem* tqparentItem; KTreeViewItem* parentItem;
if (referenceItem) { if (referenceItem) {
tqparentItem = referenceItem->getParent(); parentItem = referenceItem->getParent();
int insertIndex = tqparentItem->childIndex(referenceItem); int insertIndex = parentItem->childIndex(referenceItem);
if (!prefix) if (!prefix)
insertIndex++; insertIndex++;
tqparentItem->insertChild(insertIndex, newItem); parentItem->insertChild(insertIndex, newItem);
} }
else { else {
// no reference item, append at end of visible tree // no reference item, append at end of visible tree
// need to tqrepaint // need to tqrepaint
tqparentItem = treeRoot; parentItem = treeRoot;
tqparentItem->appendChild(newItem); parentItem->appendChild(newItem);
} }
// set item expansion // set item expansion
@ -1508,7 +1508,7 @@ bool KTreeView::insertItem(KTreeViewItem* referenceItem,
// if tqrepaint necessary, do it if visible and auto update // if tqrepaint necessary, do it if visible and auto update
// enabled // enabled
if (newItem->isVisible() || tqparentItem->childCount() == 1) { if (newItem->isVisible() || parentItem->childCount() == 1) {
bool autoU = autoUpdate(); bool autoU = autoUpdate();
setAutoUpdate(FALSE); setAutoUpdate(FALSE);
updateVisibleItems(); updateVisibleItems();
@ -1994,10 +1994,10 @@ void KTreeView::takeItem(KTreeViewItem* item)
cur = 0; cur = 0;
} }
} }
KTreeViewItem* tqparentItem = item->getParent(); KTreeViewItem* parentItem = item->getParent();
tqparentItem->removeChild(item); parentItem->removeChild(item);
item->sibling = 0; item->sibling = 0;
if (wasVisible || tqparentItem->childCount() == 0) { if (wasVisible || parentItem->childCount() == 0) {
bool autoU = autoUpdate(); bool autoU = autoUpdate();
setAutoUpdate(FALSE); setAutoUpdate(FALSE);
updateVisibleItems(); updateVisibleItems();

@ -756,7 +756,7 @@ public:
/** /**
* This function is deprecated. Use numRows() instead. * This function is deprecated. Use numRows() instead.
* Returns the number of items that are visible (their tqparents are * Returns the number of items that are visible (their parents are
* expanded). * expanded).
*/ */
int visibleCount() const { return numRows(); } int visibleCount() const { return numRows(); }
@ -801,13 +801,13 @@ protected:
/** Internal function used for counting items */ /** Internal function used for counting items */
bool countItem(KTreeViewItem* item, void* total); bool countItem(KTreeViewItem* item, void* total);
void expandOrCollapse(KTreeViewItem *tqparentItem); void expandOrCollapse(KTreeViewItem *parentItem);
/** /**
* Expands the specified subtree and updates the display. subRoot need * Expands the specified subtree and updates the display. subRoot need
* not be visible. * not be visible.
*/ */
void expandSubTree(KTreeViewItem* subRoot); void expandSubTree(KTreeViewItem* subRoot);
void fixChildren(KTreeViewItem *tqparentItem); void fixChildren(KTreeViewItem *parentItem);
virtual void focusInEvent(TQFocusEvent *e); virtual void focusInEvent(TQFocusEvent *e);
void forEveryItem(KForEveryM func, void forEveryItem(KForEveryM func,
void *user); void *user);
@ -828,7 +828,7 @@ protected:
* topmost level. If referenceItem is not 0, it must be an item that is * topmost level. If referenceItem is not 0, it must be an item that is
* already in the KTreeView. Internal data is updated and the display * already in the KTreeView. Internal data is updated and the display
* is refreshed as necessary. The inserted item may still be invisible * is refreshed as necessary. The inserted item may still be invisible
* if any of the tqparents is collapsed. newItem must not be 0. * if any of the parents is collapsed. newItem must not be 0.
*/ */
bool insertItem(KTreeViewItem* referenceItem, KTreeViewItem* newItem, bool insertItem(KTreeViewItem* referenceItem, KTreeViewItem* newItem,
bool prefix); bool prefix);

@ -433,12 +433,12 @@ sub gst_network_ipv4_vec2str
sub gst_network_ipv4_calc_subnet_vec sub gst_network_ipv4_calc_subnet_vec
{ {
my ($addr, $tqmask) = @_; my ($addr, $tqmask) = @_;
my ($addrvec, $tqmaskvec); my ($addrvec, $maskvec);
$addrvec = &gst_network_ipv4_str2vec ($addr); $addrvec = &gst_network_ipv4_str2vec ($addr);
$tqmaskvec = &gst_network_ipv4_str2vec ($tqmask); $maskvec = &gst_network_ipv4_str2vec ($tqmask);
return $addrvec & $tqmaskvec; return $addrvec & $maskvec;
} }
# What you're looking for. # What you're looking for.
@ -455,9 +455,9 @@ sub gst_network_ipv4_calc_bcast_vec
my ($addr, $tqmask) = @_; my ($addr, $tqmask) = @_;
$addrvec = &gst_network_ipv4_str2vec ($addr); $addrvec = &gst_network_ipv4_str2vec ($addr);
$tqmaskvec = &gst_network_ipv4_str2vec ($tqmask); $maskvec = &gst_network_ipv4_str2vec ($tqmask);
return $addrvec | ~$tqmaskvec; return $addrvec | ~$maskvec;
} }
# And this returning the quad-dot notation. # And this returning the quad-dot notation.
@ -3531,7 +3531,7 @@ sub gst_network_pld10_get_ipaddr
{ {
my ($file, $key, $what) = @_; my ($file, $key, $what) = @_;
my ($ipaddr, $nettqmask, $ret, $i); my ($ipaddr, $nettqmask, $ret, $i);
my @nettqmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255); my @netmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255);
$ipaddr = &gst_parse_sh($file, $key); $ipaddr = &gst_parse_sh($file, $key);
return undef if $ipaddr eq ""; return undef if $ipaddr eq "";
@ -3551,7 +3551,7 @@ sub gst_network_pld10_get_ipaddr
$ret .= "255."; $ret .= "255.";
} }
$ret .= "$nettqmask_prefixes[$b%8]." if $nettqmask < 32; $ret .= "$netmask_prefixes[$b%8]." if $nettqmask < 32;
for($i = int($nettqmask/8) + 1; $i < 4; $i++) for($i = int($nettqmask/8) + 1; $i < 4; $i++)
{ {

@ -477,7 +477,7 @@ sub gst_replace_join_hash
return $res; return $res;
} }
# Find $re matching send string and replace tqparenthesyzed # Find $re matching send string and replace parenthesyzed
# part of $re with $value. FIXME: apply meeks' more general impl. # part of $re with $value. FIXME: apply meeks' more general impl.
sub gst_replace_chat sub gst_replace_chat
{ {

@ -891,7 +891,7 @@ sub gst_xml_model_ensure
next if ($elem eq ""); next if ($elem eq "");
my @tqchildren = @$branch; my @tqchildren = @$branch;
my $tqparent_branch = $branch; my $parent_branch = $branch;
shift @tqchildren; # Attributes shift @tqchildren; # Attributes
$branch = undef; $branch = undef;
@ -918,8 +918,8 @@ sub gst_xml_model_ensure
push @list, \%hash; push @list, \%hash;
push @$tqparent_branch, $elem; push @$parent_branch, $elem;
push @$tqparent_branch, $branch; push @$parent_branch, $branch;
} }
} }

@ -128,7 +128,7 @@ void KAddDeviceContainer::verifyDeviceInfoSlot()
{ {
KMessageBox::error(this,i18n("The format of the specified IP address is not valid."),i18n("Invalid IP Address")); KMessageBox::error(this,i18n("The format of the specified IP address is not valid."),i18n("Invalid IP Address"));
} }
else if (_advanced && !KAddressValidator::isNettqmaskValid(nettqmask)) else if (_advanced && !KAddressValidator::isNetmaskValid(nettqmask))
KMessageBox::error(this,i18n("The format of the specified nettqmask is not valid."),i18n("Invalid IP Address")); KMessageBox::error(this,i18n("The format of the specified nettqmask is not valid."),i18n("Invalid IP Address"));
else if (!broadcast.isEmpty() && _advanced && !KAddressValidator::isBroadcastValid(broadcast)) else if (!broadcast.isEmpty() && _advanced && !KAddressValidator::isBroadcastValid(broadcast))

@ -402,7 +402,7 @@
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>

@ -147,7 +147,7 @@
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -88,7 +88,7 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kpassdlg.h</includehint> <includehint>kpassdlg.h</includehint>

@ -156,7 +156,7 @@
<function returnType="bool">modified()</function> <function returnType="bool">modified()</function>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kdialog.h</includehint> <includehint>kdialog.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -289,7 +289,7 @@
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
<function specifier="non virtual" returnType="bool">modified()</function> <function specifier="non virtual" returnType="bool">modified()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kdialog.h</includehint> <includehint>kdialog.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -18,7 +18,7 @@
#include "kaddressvalidator.h" #include "kaddressvalidator.h"
/* /*
Class for validating IP address and nettqmasks, and to calculate network and broadcast values. Class for validating IP address and netmasks, and to calculate network and broadcast values.
The functions to do the last two things where taken from the code of ipcalc.c, made by The functions to do the last two things where taken from the code of ipcalc.c, made by
Erik Troan <ewt@redhat.com> and Preston Brown <pbrown@redhat.com> from Red Hat Inc. . Erik Troan <ewt@redhat.com> and Preston Brown <pbrown@redhat.com> from Red Hat Inc. .
*/ */
@ -53,7 +53,7 @@ bool KAddressValidator::isValidIPAddress(TQString addr){
else else
return false; return false;
} }
bool KAddressValidator::isNettqmaskValid(TQString addr){ bool KAddressValidator::isNetmaskValid(TQString addr){
TQString s = ""; TQString s = "";
int i; int i;
int number; int number;
@ -140,7 +140,7 @@ unsigned long int KAddressValidator::prefix2tqmask(int prefix){
return htonl(~((2 << (31 - prefix)) - 1)); return htonl(~((2 << (31 - prefix)) - 1));
} }
/** \fn int tqmask2prefix(unsigned long int tqmask) /** \fn int tqmask2prefix(unsigned long int tqmask)
\brief calculates the number of bits tqmasked off by a nettqmask. \brief calculates the number of bits masked off by a nettqmask.
This function calculates the significant bits in an IP address as specified by This function calculates the significant bits in an IP address as specified by
a nettqmask. See also \ref prefix2tqmask. a nettqmask. See also \ref prefix2tqmask.

@ -19,7 +19,7 @@
#define KADDRESSVALIDATOR_H #define KADDRESSVALIDATOR_H
/* /*
Class for validating IP address and nettqmasks, and to calculate network and broadcast values. Class for validating IP address and netmasks, and to calculate network and broadcast values.
The functions to do the last two things where taken from the code of ipcalc.c, made by The functions to do the last two things where taken from the code of ipcalc.c, made by
Erik Troan <ewt@redhat.com> and Preston Brown <pbrown@redhat.com> from Red Hat Inc. Erik Troan <ewt@redhat.com> and Preston Brown <pbrown@redhat.com> from Red Hat Inc.
*/ */
@ -43,7 +43,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <tqstring.h> #include <tqstring.h>
/**Class that has simple methods for validating IP addresses, nettqmasks, calculating /**Class that has simple methods for validating IP addresses, netmasks, calculating
broadcast and network addresses. broadcast and network addresses.
*@author Juan Luis Baptiste *@author Juan Luis Baptiste
@ -56,7 +56,7 @@ public:
/** Validates if the address written by the user is a valid one. Return true if it is and false if not. */ /** Validates if the address written by the user is a valid one. Return true if it is and false if not. */
static bool isValidIPAddress(TQString addr); static bool isValidIPAddress(TQString addr);
/** Validates if the Nettqmask written by the user is a valid one. Return true if it is and false if not. */ /** Validates if the Nettqmask written by the user is a valid one. Return true if it is and false if not. */
static bool isNettqmaskValid(TQString addr); static bool isNetmaskValid(TQString addr);
/** Validates if the Network written by the user is a valid one. Return true if it is and false if not. */ /** Validates if the Network written by the user is a valid one. Return true if it is and false if not. */
static bool isNetworkValid(const TQString &addr); static bool isNetworkValid(const TQString &addr);
/** Validates if the Broadcast written by the user is a valid one. Return true if it is and false if not. */ /** Validates if the Broadcast written by the user is a valid one. Return true if it is and false if not. */
@ -103,7 +103,7 @@ private: // Private methods
*/ */
static unsigned long int prefix2tqmask(int prefix); static unsigned long int prefix2tqmask(int prefix);
/** \fn int tqmask2prefix(unsigned long int tqmask) /** \fn int tqmask2prefix(unsigned long int tqmask)
\brief calculates the number of bits tqmasked off by a nettqmask. \brief calculates the number of bits masked off by a nettqmask.
This function calculates the significant bits in an IP address as specified by This function calculates the significant bits in an IP address as specified by
a nettqmask. See also \ref prefix2tqmask. a nettqmask. See also \ref prefix2tqmask.

@ -69,5 +69,5 @@
<data format="PNG" length="983">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000039e4944415418959595cd6b1d5518c67f934e9a776452cf40948e74915b2af6aa2897a6602a2e6e6a5d74e3dafe03d28f8d0b71292eba312808052964e34297154442119b2e44234aaca8ed151332c586ccd85cef1cc9e8bcd6938e8b9b7b136b6e4b5e18e683f33ef39ce77738c7abaa8a9dcaf33c2ebc7761e2e48993171179aaf75d7c50b7fd2e80822f557a3399bff4f1a557cf4f9f5ff47754dd2c33660e8931b50fafa6233a1c1019417c41a42baa4e290b8bae433caa4c3d1d3f89cf38707f6141867078577fb6941210858a31029b5d5a802d20cf721ae3c2e4213c600ff4870ca8615094b2005be44084aaed3bc6416e736ca1d876371175ca8385bbaeb13627d5a0eb3214284000ab8a1690decaa99b685be60f10ee0d1209d0a224b742a08a88609d82425e28b89e5301d7edf507d15ffd7515750c810ecfbc5627d8a42fbe30f753c247f342aa10f942eec088e9c6b369d587ddd39f3c1c33fb6302614ceee75da7b209747bc6bba53f7518ce4e8219035cb4a1ae048767dbd99f38fedaca7897f44b85bcc89150aa74256d6769f6a53a4d739bb7922469010cfd8f7e66b1ed9cbc2849db25a52d49db39d676e9ab2aea203631511879c7268e3ddc6834464a5b7e3077756ee6ec99b3edad28764bdf29eaba20adda3daa1a59b57beb8fd7ef1c7fe978b515850ff88288101b4142c184d29f8b55bd977e952c267fb4165bd7b4d0ebc952f2496bb1f5c3ece5d9fec6d35bc71e289111ac0fb18990b03b13754aa0c1bdf437d276ba9265f67d33666e34269aa5d95f9366f364f1fa1be7b61cdb759b0baccf9caeed5347d5fd1143aadd455faa828baa3e7d9beda9d7eb4fc4fbf55d09644dc2e0ae647c7eedfbefde02cabe70b2947c3b373cf7b6f85257a7e3b503b51722138d0294ae449d56c9cde4efec56f67be94ac17157550b2d744d9d2e4b68ee264baddfec9afdef1ebcf0d58277ea9553233317679acb3796bfe8dceedce9ac76aaceed4ed559ed54cbbf2c579dd54eb9f0cdc2a7d3e7a78f365f6c8e5cf9ec8a075055d58ed710c0916347aac644e31f09855cf31155f5d429aa8a557b5ffa83cadbfe72e6f499d1da78edb9c8442f9bd03c1bc5d133a52d35cbb3ebdbe87f3d7b7976bdd733f004ea3d4cbf333314c0a366bf79c86676b474fafcd489e6b9f9f9f9b56429b960c6cc8dda817a99acdc5c179f768ffe20e1feb669db69101c88df8c1f898f9ad16838f0794cc04c361a074d680e0ea23fa8fac2c94ab291173649b3741fb0577c10118b036b6de7bef477a87f018b9f681dd4db618a0000000049454e44ae426082</data> <data format="PNG" length="983">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000039e4944415418959595cd6b1d5518c67f934e9a776452cf40948e74915b2af6aa2897a6602a2e6e6a5d74e3dafe03d28f8d0b71292eba312808052964e34297154442119b2e44234aaca8ed151332c586ccd85cef1cc9e8bcd6938e8b9b7b136b6e4b5e18e683f33ef39ce77738c7abaa8a9dcaf33c2ebc7761e2e48993171179aaf75d7c50b7fd2e80822f557a3399bff4f1a557cf4f9f5ff47754dd2c33660e8931b50fafa6233a1c1019417c41a42baa4e290b8bae433caa4c3d1d3f89cf38707f6141867078577fb6941210858a31029b5d5a802d20cf721ae3c2e4213c600ff4870ca8615094b2005be44084aaed3bc6416e736ca1d876371175ca8385bbaeb13627d5a0eb3214284000ab8a1690decaa99b685be60f10ee0d1209d0a224b742a08a88609d82425e28b89e5301d7edf507d15ffd7515750c810ecfbc5627d8a42fbe30f753c247f342aa10f942eec088e9c6b369d587ddd39f3c1c33fb6302614ceee75da7b209747bc6bba53f7518ce4e8219035cb4a1ae048767dbd99f38fedaca7897f44b85bcc89150aa74256d6769f6a53a4d739bb7922469010cfd8f7e66b1ed9cbc2849db25a52d49db39d676e9ab2aea203631511879c7268e3ddc6834464a5b7e3077756ee6ec99b3edad28764bdf29eaba20adda3daa1a59b57beb8fd7ef1c7fe978b515850ff88288101b4142c184d29f8b55bd977e952c267fb4165bd7b4d0ebc952f2496bb1f5c3ece5d9fec6d35bc71e289111ac0fb18990b03b13754aa0c1bdf437d276ba9265f67d33666e34269aa5d95f9366f364f1fa1be7b61cdb759b0baccf9caeed5347d5fd1143aadd455faa828baa3e7d9beda9d7eb4fc4fbf55d09644dc2e0ae647c7eedfbefde02cabe70b2947c3b373cf7b6f85257a7e3b503b51722138d0294ae449d56c9cde4efec56f67be94ac17157550b2d744d9d2e4b68ee264baddfec9afdef1ebcf0d58277ea9553233317679acb3796bfe8dceedce9ac76aaceed4ed559ed54cbbf2c579dd54eb9f0cdc2a7d3e7a78f365f6c8e5cf9ec8a075055d58ed710c0916347aac644e31f09855cf31155f5d429aa8a557b5ffa83cadbfe72e6f499d1da78edb9c8442f9bd03c1bc5d133a52d35cbb3ebdbe87f3d7b7976bdd733f004ea3d4cbf333314c0a366bf79c86676b474fafcd489e6b9f9f9f9b56429b960c6cc8dda817a99acdc5c179f768ffe20e1feb669db69101c88df8c1f898f9ad16838f0794cc04c361a074d680e0ea23fa8fac2c94ab291173649b3741fb0577c10118b036b6de7bef477a87f018b9f681dd4db618a0000000049454e44ae426082</data>
</image> </image>
</images> </images>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -97,7 +97,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot>close()</slot> <slot>close()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kdialog.h</includehint> <includehint>kdialog.h</includehint>
</includehints> </includehints>

@ -1072,7 +1072,7 @@
<slot access="private">removeProfileSlot()</slot> <slot access="private">removeProfileSlot()</slot>
<slot access="private">updateProfileSlot()</slot> <slot access="private">updateProfileSlot()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -129,7 +129,7 @@ the changes can take effect.</string>
<slot>close()</slot> <slot>close()</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kdialog.h</includehint> <includehint>kdialog.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -132,7 +132,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot>exitSlot()</slot> <slot>exitSlot()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kdialog.h</includehint> <includehint>kdialog.h</includehint>
<includehint>klistbox.h</includehint> <includehint>klistbox.h</includehint>

@ -39,7 +39,7 @@
Should we care about the world-file? Should we care about the world-file?
Read tqmasked packages from /usr/portage/profiles/package.tqmask Read masked packages from /usr/portage/profiles/package.tqmask
Use flags and CFLAGS? Use flags and CFLAGS?
@ -181,14 +181,14 @@ void Gentoo::listInstalledPackages(TQPtrList<packageInfo> *pki)
continue; continue;
} }
for (TQStringList::Iterator tqmaskIt = packageMask.begin(); tqmaskIt != packageMask.end(); ++tqmaskIt) for (TQStringList::Iterator maskIt = packageMask.begin(); maskIt != packageMask.end(); ++maskIt)
{ {
// FIXME Should all be handled, just not implemented yet // FIXME Should all be handled, just not implemented yet
if ((*tqmaskIt).startsWith("<") || (*tqmaskIt).startsWith("=") || (*tqmaskIt).startsWith("~") || (*tqmaskIt).startsWith(">")) if ((*maskIt).startsWith("<") || (*maskIt).startsWith("=") || (*maskIt).startsWith("~") || (*maskIt).startsWith(">"))
continue; continue;
if (*category+"/"+name == *tqmaskIt) if (*category+"/"+name == *maskIt)
{ {
kdDebug() << "Package: " << name << "-" << version << " is tqmasked" << endl; kdDebug() << "Package: " << name << "-" << version << " is masked" << endl;
isMasked = true; isMasked = true;
break; break;
} }

@ -23,10 +23,10 @@
<string>Configuration Wizard</string> <string>Configuration Wizard</string>
</property> </property>
<property> <property>
<name>tqlayoutMargin</name> <name>layoutMargin</name>
</property> </property>
<property> <property>
<name>tqlayoutSpacing</name> <name>layoutSpacing</name>
</property> </property>
<widget> <widget>
<class>TQWidget</class> <class>TQWidget</class>
@ -316,10 +316,10 @@
<cstring>mServicesLayout</cstring> <cstring>mServicesLayout</cstring>
</property> </property>
<property> <property>
<name>tqlayoutMargin</name> <name>layoutMargin</name>
</property> </property>
<property> <property>
<name>tqlayoutSpacing</name> <name>layoutSpacing</name>
</property> </property>
<vbox> <vbox>
<property stdset="1"> <property stdset="1">

@ -17,9 +17,9 @@
<property name="caption"> <property name="caption">
<string>Look &amp; Feel</string> <string>Look &amp; Feel</string>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -496,5 +496,5 @@
<slot access="protected">slotChanged()</slot> <slot access="protected">slotChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<pixmapfunction>DesktopIcon</pixmapfunction> <pixmapfunction>DesktopIcon</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -16,9 +16,9 @@
<property name="caption"> <property name="caption">
<string>Miscellaneous</string> <string>Miscellaneous</string>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -37,7 +37,7 @@
<property name="title"> <property name="title">
<string>Informational Messages</string> <string>Informational Messages</string>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -53,7 +53,7 @@
<property name="name"> <property name="name">
<cstring>Layout12</cstring> <cstring>Layout12</cstring>
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -182,5 +182,5 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="protected">slotChanged()</slot> <slot access="protected">slotChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -25,9 +25,9 @@
<property name="caption"> <property name="caption">
<string>Path Configuration</string> <string>Path Configuration</string>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -43,9 +43,9 @@
<property name="name"> <property name="name">
<cstring>mServicesLayout</cstring> <cstring>mServicesLayout</cstring>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -286,7 +286,7 @@
<slot access="protected">browseRunlevels()</slot> <slot access="protected">browseRunlevels()</slot>
<slot access="protected">slotChanged()</slot> <slot access="protected">slotChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -221,5 +221,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -236,5 +236,5 @@
<Q_SLOTS> <Q_SLOTS>
<slot>kcfg_createHomeDir_toggled( bool )</slot> <slot>kcfg_createHomeDir_toggled( bool )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -203,7 +203,7 @@ bool KU::KUser::getDisabled() const
return isDisabled; return isDisabled;
} }
// FreeBSD aptqparently uses the GECOS fields differently than other Unices. // FreeBSD apparently uses the GECOS fields differently than other Unices.
// Create some better named functions to make the FreeBSD code clear // Create some better named functions to make the FreeBSD code clear
const TQString &KU::KUser::getOffice() const const TQString &KU::KUser::getOffice() const
{ {
@ -381,7 +381,7 @@ void KU::KUser::setDisabled(bool data)
isDisabled = data; isDisabled = data;
} }
// FreeBSD aptqparently uses the GECOS fields differently than other Unices. // FreeBSD apparently uses the GECOS fields differently than other Unices.
// Create some better named functions to make the FreeBSD code clear // Create some better named functions to make the FreeBSD code clear
void KU::KUser::setOffice(const TQString &data) void KU::KUser::setOffice(const TQString &data)
{ {

@ -358,7 +358,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot>kcfg_ldapsam_toggled( bool )</slot> <slot>kcfg_ldapsam_toggled( bool )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

@ -274,5 +274,5 @@
<tabstop>kcfg_ldapshadow</tabstop> <tabstop>kcfg_ldapshadow</tabstop>
<tabstop>kcfg_ldapcnfullname</tabstop> <tabstop>kcfg_ldapcnfullname</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -235,7 +235,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot>kcfg_sneverexpire_toggled( bool )</slot> <slot>kcfg_sneverexpire_toggled( bool )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kdatetimewidget.h</includehint> <includehint>kdatetimewidget.h</includehint>
<includehint>kdatewidget.h</includehint> <includehint>kdatewidget.h</includehint>

Loading…
Cancel
Save