summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commitf7ceb2957839027e8027a9a4c0dfff730cb9b704 (patch)
treed1d583f11612d149bc0718c80779df4653699dbb /src/common
parentd98fea1f859d23e1b1220a65d7a8eda3b757fd08 (diff)
downloadpiklab-f7ceb2957839027e8027a9a4c0dfff730cb9b704.tar.gz
piklab-f7ceb2957839027e8027a9a4c0dfff730cb9b704.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/common')
-rw-r--r--src/common/common/bitvalue.cpp10
-rw-r--r--src/common/common/bitvalue.h6
-rw-r--r--src/common/common/qflags.h8
-rw-r--r--src/common/common/storage.h2
-rw-r--r--src/common/global/log.cpp10
-rw-r--r--src/common/global/log.h4
-rw-r--r--src/common/global/process.cpp4
-rw-r--r--src/common/global/process.h10
-rw-r--r--src/common/global/progress_monitor.cpp4
-rw-r--r--src/common/global/progress_monitor.h2
-rw-r--r--src/common/global/xml_data_file.cpp16
-rw-r--r--src/common/gui/config_widget.h2
-rw-r--r--src/common/gui/container.cpp10
-rw-r--r--src/common/gui/container.h4
-rw-r--r--src/common/gui/dialog.cpp22
-rw-r--r--src/common/gui/dialog.h8
-rw-r--r--src/common/gui/editlistbox.cpp8
-rw-r--r--src/common/gui/editlistbox.h4
-rw-r--r--src/common/gui/hexword_gui.cpp8
-rw-r--r--src/common/gui/hexword_gui.h12
-rw-r--r--src/common/gui/key_gui.h8
-rw-r--r--src/common/gui/list_container.cpp14
-rw-r--r--src/common/gui/list_container.h6
-rw-r--r--src/common/gui/list_view.cpp4
-rw-r--r--src/common/gui/list_view.h6
-rw-r--r--src/common/gui/misc_gui.cpp28
-rw-r--r--src/common/gui/misc_gui.h14
-rw-r--r--src/common/gui/number_gui.cpp8
-rw-r--r--src/common/gui/number_gui.h4
-rw-r--r--src/common/gui/purl_gui.cpp20
-rw-r--r--src/common/gui/purl_gui.h22
-rw-r--r--src/common/nokde/nokde_kprocess.cpp4
-rw-r--r--src/common/nokde/nokde_kprocess.h2
-rw-r--r--src/common/port/parallel.cpp6
-rw-r--r--src/common/port/parallel.h2
-rw-r--r--src/common/port/serial.cpp12
36 files changed, 157 insertions, 157 deletions
diff --git a/src/common/common/bitvalue.cpp b/src/common/common/bitvalue.cpp
index f4ae5ed..16d5ef0 100644
--- a/src/common/common/bitvalue.cpp
+++ b/src/common/common/bitvalue.cpp
@@ -13,11 +13,11 @@ const uint GenericValue::INVALID = 0xFFFFFFFFU;
BitValue BitValue::XORn(uint n) const
{
uint nb = nbBits(_value);
- uint tqmask = maxValue(NumberBase::Bin, n);
+ uint mask = maxValue(NumberBase::Bin, n);
uint res = 0x0;
for (uint i=0; i<nb; i +=n) {
- res ^= (_value >> i) & tqmask;
- //qDebug("%i %s %s", i, toHexLabel((value>>i) & tqmask, 4).latin1(), toHexLabel(res, 4).latin1());
+ res ^= (_value >> i) & mask;
+ //qDebug("%i %s %s", i, toHexLabel((value>>i) & mask, 4).latin1(), toHexLabel(res, 4).latin1());
}
return res;
}
@@ -25,6 +25,6 @@ BitValue BitValue::XORn(uint n) const
BitValue BitValue::XNORn(uint n) const
{
BitValue res = XORn(n);
- BitValue tqmask = maxValue(NumberBase::Bin, n);
- return res.complementInMask(tqmask);
+ BitValue mask = maxValue(NumberBase::Bin, n);
+ return res.complementInMask(mask);
}
diff --git a/src/common/common/bitvalue.h b/src/common/common/bitvalue.h
index 8bf61d2..172c6d8 100644
--- a/src/common/common/bitvalue.h
+++ b/src/common/common/bitvalue.h
@@ -96,11 +96,11 @@ public:
BitValue XORn(uint n) const; // XOR between groups of n bits inside value
BitValue XNORn(uint n) const; // XORn then NOT on n bits
- BitValue maskWith(BitValue tqmask) const { return _value & tqmask._value; }
+ BitValue maskWith(BitValue mask) const { return _value & mask._value; }
bool isInside(BitValue v) const { return ( (_value & v._value)==_value ); }
- BitValue complementInMask(BitValue tqmask) const { return tqmask._value & ~_value; }
+ BitValue complementInMask(BitValue mask) const { return mask._value & ~_value; }
BitValue twoComplement() const { return -_value; }
- BitValue clearMaskBits(BitValue tqmask) const { return _value & ~tqmask._value; }
+ BitValue clearMaskBits(BitValue mask) const { return _value & ~mask._value; }
bool isOverlapping(BitValue v) const { return ( _value & v._value ); }
class const_iterator {
diff --git a/src/common/common/qflags.h b/src/common/common/qflags.h
index c7abfc2..6d7c2ff 100644
--- a/src/common/common/qflags.h
+++ b/src/common/common/qflags.h
@@ -48,8 +48,8 @@ public:
inline TQFlags(TQFlag f) : i(f) {}
inline TQFlags &operator=(const TQFlags &f) { i = f.i; return *this; }
- inline TQFlags &operator&=(int tqmask) { i &= tqmask; return *this; }
- inline TQFlags &operator&=(uint tqmask) { i &= tqmask; return *this; }
+ inline TQFlags &operator&=(int mask) { i &= mask; return *this; }
+ inline TQFlags &operator&=(uint mask) { i &= mask; return *this; }
inline TQFlags &operator|=(TQFlags f) { i |= f.i; return *this; }
inline TQFlags &operator|=(Enum f) { i |= f; return *this; }
inline TQFlags &operator^=(TQFlags f) { i ^= f.i; return *this; }
@@ -62,8 +62,8 @@ public:
inline TQFlags operator|(Enum f) const { TQFlags g; g.i = i | f; return g; }
inline TQFlags operator^(TQFlags f) const { TQFlags g; g.i = i ^ f.i; return g; }
inline TQFlags operator^(Enum f) const { TQFlags g; g.i = i ^ f; return g; }
- inline TQFlags operator&(int tqmask) const { TQFlags g; g.i = i & tqmask; return g; }
- inline TQFlags operator&(uint tqmask) const { TQFlags g; g.i = i & tqmask; return g; }
+ inline TQFlags operator&(int mask) const { TQFlags g; g.i = i & mask; return g; }
+ inline TQFlags operator&(uint mask) const { TQFlags g; g.i = i & mask; return g; }
inline TQFlags operator&(Enum f) const { TQFlags g; g.i = i & f; return g; }
inline TQFlags operator~() const { TQFlags g; g.i = ~i; return g; }
diff --git a/src/common/common/storage.h b/src/common/common/storage.h
index f1c947d..b324ab5 100644
--- a/src/common/common/storage.h
+++ b/src/common/common/storage.h
@@ -37,7 +37,7 @@ class GenericStorage : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- GenericStorage(TQObject *tqparent = 0, const char *name = 0) : TQObject(tqparent, name), _dirty(false) {}
+ GenericStorage(TQObject *parent = 0, const char *name = 0) : TQObject(parent, name), _dirty(false) {}
signals:
void changed();
diff --git a/src/common/global/log.cpp b/src/common/global/log.cpp
index 1ab42d0..62955da 100644
--- a/src/common/global/log.cpp
+++ b/src/common/global/log.cpp
@@ -72,17 +72,17 @@ bool Log::StringView::askContinue(const TQString &message)
}
//-----------------------------------------------------------------------------
-Log::Base::Base(Base *tqparent)
+Log::Base::Base(Base *parent)
: _parent(0), _data(0)
{
- setParent(tqparent);
+ setParent(parent);
}
-void Log::Base::setParent(Base *tqparent)
+void Log::Base::setParent(Base *parent)
{
delete _data;
- _parent = tqparent;
- _data = (tqparent ? 0 : new LogData);
+ _parent = parent;
+ _data = (parent ? 0 : new LogData);
}
Log::Base::~Base()
diff --git a/src/common/global/log.h b/src/common/global/log.h
index eff0b88..f38543d 100644
--- a/src/common/global/log.h
+++ b/src/common/global/log.h
@@ -85,9 +85,9 @@ private:
class Base : public Generic
{
public:
- Base(Base *tqparent = 0);
+ Base(Base *parent = 0);
virtual ~Base();
- void setParent(Base *tqparent);
+ void setParent(Base *parent);
void setView(View *view);
View *view() { return logData()->view; }
diff --git a/src/common/global/process.cpp b/src/common/global/process.cpp
index 1efe715..ed63f86 100644
--- a/src/common/global/process.cpp
+++ b/src/common/global/process.cpp
@@ -31,8 +31,8 @@ Process::State Process::runSynchronously(Base &process, RunActions actions, uint
}
//----------------------------------------------------------------------------
-Process::Base::Base(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name), _state(Stopped)
+Process::Base::Base(TQObject *parent, const char *name)
+ : TQObject(parent, name), _state(Stopped)
{
_process = new KProcess(this);
connect(_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(exited()));
diff --git a/src/common/global/process.h b/src/common/global/process.h
index d4e7db0..daa8513 100644
--- a/src/common/global/process.h
+++ b/src/common/global/process.h
@@ -33,7 +33,7 @@ class Base : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- Base(TQObject *tqparent, const char *name);
+ Base(TQObject *parent, const char *name);
virtual ~Base();
void setup(const TQString &executable, const TQStringList &options, bool withWine);
TQStringList arguments() const;
@@ -77,7 +77,7 @@ class StringOutput : public Base
Q_OBJECT
TQ_OBJECT
public:
- StringOutput(TQObject *tqparent = 0, const char *name = 0) : Base(tqparent, name) {}
+ StringOutput(TQObject *parent = 0, const char *name = 0) : Base(parent, name) {}
TQString sout() const { return _stdout; }
TQString serr() const { return _stderr; }
@@ -92,7 +92,7 @@ class LineBase : public Base
Q_OBJECT
TQ_OBJECT
public:
- LineBase(TQObject *tqparent = 0, const char *name = 0) : Base(tqparent, name) {}
+ LineBase(TQObject *parent = 0, const char *name = 0) : Base(parent, name) {}
private slots:
virtual void receivedStdout(KProcess *, char *buffer, int len);
@@ -109,7 +109,7 @@ class LineOutput : public LineBase
Q_OBJECT
TQ_OBJECT
public:
- LineOutput(TQObject *tqparent = 0, const char *name = 0) : LineBase(tqparent, name) {}
+ LineOutput(TQObject *parent = 0, const char *name = 0) : LineBase(parent, name) {}
virtual bool start(uint timeout);
TQStringList sout() const { return _stdoutLines; }
TQStringList serr() const { return _stderrLines; }
@@ -127,7 +127,7 @@ class LineSignal : public LineBase
Q_OBJECT
TQ_OBJECT
public:
- LineSignal(TQObject *tqparent = 0, const char *name = 0) : LineBase(tqparent, name) {}
+ LineSignal(TQObject *parent = 0, const char *name = 0) : LineBase(parent, name) {}
signals:
void logStdoutLine(const TQString &line);
diff --git a/src/common/global/progress_monitor.cpp b/src/common/global/progress_monitor.cpp
index f86d236..0b3044d 100644
--- a/src/common/global/progress_monitor.cpp
+++ b/src/common/global/progress_monitor.cpp
@@ -8,8 +8,8 @@
***************************************************************************/
#include "progress_monitor.h"
-ProgressMonitor::ProgressMonitor(TQObject* tqparent)
- : TQObject(tqparent, "progress_monitor")
+ProgressMonitor::ProgressMonitor(TQObject* parent)
+ : TQObject(parent, "progress_monitor")
{
_current = _tasks.end();
}
diff --git a/src/common/global/progress_monitor.h b/src/common/global/progress_monitor.h
index 1cff202..03628f7 100644
--- a/src/common/global/progress_monitor.h
+++ b/src/common/global/progress_monitor.h
@@ -16,7 +16,7 @@ class ProgressMonitor : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- ProgressMonitor(TQObject *tqparent = 0);
+ ProgressMonitor(TQObject *parent = 0);
void clear();
void appendTask(const TQString &label, uint nbSteps);
void insertTask(const TQString &label, uint nbSteps);
diff --git a/src/common/global/xml_data_file.cpp b/src/common/global/xml_data_file.cpp
index 30d42cd..528f8e7 100644
--- a/src/common/global/xml_data_file.cpp
+++ b/src/common/global/xml_data_file.cpp
@@ -52,28 +52,28 @@ bool XmlDataFile::save(TQString &error) const
return ok;
}
-TQDomElement XmlDataFile::findChildElement(TQDomElement tqparent, const TQString &name) const
+TQDomElement XmlDataFile::findChildElement(TQDomElement parent, const TQString &name) const
{
- TQDomNodeList list = tqparent.elementsByTagName(name);
+ TQDomNodeList list = parent.elementsByTagName(name);
return list.item(0).toElement();
}
-TQDomElement XmlDataFile::createChildElement(TQDomElement tqparent, const TQString &name)
+TQDomElement XmlDataFile::createChildElement(TQDomElement parent, const TQString &name)
{
- TQDomNodeList list = tqparent.elementsByTagName(name);
+ TQDomNodeList list = parent.elementsByTagName(name);
if ( list.count()==0 ) {
TQDomElement element = _document.createElement(name);
- tqparent.appendChild(element);
+ parent.appendChild(element);
return element;
}
return list.item(0).toElement();
}
-void XmlDataFile::removeChilds(TQDomNode tqparent) const
+void XmlDataFile::removeChilds(TQDomNode parent) const
{
- TQDomNodeList list = tqparent.childNodes();
+ TQDomNodeList list = parent.childNodes();
for (uint i=0; i<list.count(); i++)
- tqparent.removeChild(list.item(i));
+ parent.removeChild(list.item(i));
}
TQString XmlDataFile::value(const TQString &group, const TQString &key, const TQString &defValue) const
diff --git a/src/common/gui/config_widget.h b/src/common/gui/config_widget.h
index 787780b..6d87705 100644
--- a/src/common/gui/config_widget.h
+++ b/src/common/gui/config_widget.h
@@ -23,7 +23,7 @@ class ConfigWidget : public Container
Q_OBJECT
TQ_OBJECT
public:
- ConfigWidget(TQWidget *tqparent = 0) : Container(tqparent) {}
+ ConfigWidget(TQWidget *parent = 0) : Container(parent) {}
virtual TQString title() const { return TQString(); }
virtual TQString header() const { return TQString(); }
virtual TQPixmap pixmap() const { return TQPixmap(); }
diff --git a/src/common/gui/container.cpp b/src/common/gui/container.cpp
index 960acca..8a747d3 100644
--- a/src/common/gui/container.cpp
+++ b/src/common/gui/container.cpp
@@ -11,8 +11,8 @@
#include "misc_gui.h"
//----------------------------------------------------------------------------
-Container::Container(TQWidget *tqparent, Type type)
- : TQFrame(tqparent), _type(type)
+Container::Container(TQWidget *parent, Type type)
+ : TQFrame(parent), _type(type)
{
initLayout();
}
@@ -36,7 +36,7 @@ void Container::setFrame(Type type)
_type = type;
switch (type) {
case Flat:
- setMargin(tqparent() && tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ? 10 : 0);
+ setMargin(parent() && parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ? 10 : 0);
setFrameStyle(TQFrame::NoFrame);
break;
case Sunken:
@@ -71,8 +71,8 @@ void Container::addLayout(TQLayout *l, uint startRow, uint endRow, uint startCol
}
//----------------------------------------------------------------------------
-ButtonContainer::ButtonContainer(const TQString &title, TQWidget *tqparent)
- : Container(tqparent, Sunken)
+ButtonContainer::ButtonContainer(const TQString &title, TQWidget *parent)
+ : Container(parent, Sunken)
{
_button = new PopupButton(title, this);
addWidget(_button, 0,0, 0,1);
diff --git a/src/common/gui/container.h b/src/common/gui/container.h
index e64d143..af3e5a6 100644
--- a/src/common/gui/container.h
+++ b/src/common/gui/container.h
@@ -23,7 +23,7 @@ Q_OBJECT
TQ_OBJECT
public:
enum Type { Flat, Sunken };
- Container(TQWidget *tqparent = 0, Type type = Flat);
+ Container(TQWidget *parent = 0, Type type = Flat);
Container(TQWidgetStack *stack, uint index, Type type = Flat);
Container(TQTabWidget *tabw, const TQString &title, Type type = Flat);
void addWidget(TQWidget *widget, uint startRow, uint endRow, uint startCol, uint endCol, int tqalignment = 0);
@@ -50,7 +50,7 @@ class ButtonContainer : public Container
Q_OBJECT
TQ_OBJECT
public:
- ButtonContainer(const TQString &title, TQWidget *tqparent);
+ ButtonContainer(const TQString &title, TQWidget *parent);
PopupButton &button() { return *_button; }
private:
diff --git a/src/common/gui/dialog.cpp b/src/common/gui/dialog.cpp
index f8ee222..58b12ba 100644
--- a/src/common/gui/dialog.cpp
+++ b/src/common/gui/dialog.cpp
@@ -17,10 +17,10 @@
#include "misc_gui.h"
//-----------------------------------------------------------------------------
-Dialog::Dialog(TQWidget *tqparent, const char *name, bool modal,
+Dialog::Dialog(TQWidget *parent, const char *name, bool modal,
const TQString &caption, int buttonMask, ButtonCode defaultButton,
bool separator, const TQSize &defaultSize)
- : KDialogBase(tqparent, name, modal, caption, buttonMask, defaultButton, separator),
+ : KDialogBase(parent, name, modal, caption, buttonMask, defaultButton, separator),
_defaultSize(defaultSize)
{
PBusyCursor::start();
@@ -32,8 +32,8 @@ Dialog::Dialog(TQWidget *tqparent, const char *name, bool modal,
}
Dialog::Dialog(DialogType type, const TQString &caption, int buttonMask, ButtonCode defaultButton,
- TQWidget *tqparent, const char *name, bool modal, bool separator, const TQSize &defaultSize)
- : KDialogBase(type, caption, buttonMask, defaultButton, tqparent, name, modal, separator),
+ TQWidget *parent, const char *name, bool modal, bool separator, const TQSize &defaultSize)
+ : KDialogBase(type, caption, buttonMask, defaultButton, parent, name, modal, separator),
_defaultSize(defaultSize)
{
PBusyCursor::start();
@@ -62,10 +62,10 @@ TreeListDialog::Item::Item(const TQString &label, TQWidget *page, const TQString
: KListViewItem(item, label), _page(page), _title(title)
{}
-TreeListDialog::TreeListDialog(TQWidget *tqparent, const char *name, bool modal,
+TreeListDialog::TreeListDialog(TQWidget *parent, const char *name, bool modal,
const TQString &caption, int buttonMask, ButtonCode defaultButton,
bool separator)
- : Dialog(tqparent, name, modal, caption, buttonMask, defaultButton, separator)
+ : Dialog(parent, name, modal, caption, buttonMask, defaultButton, separator)
{
TQVBoxLayout *top = new TQVBoxLayout(mainWidget(), 0, 10);
@@ -119,9 +119,9 @@ TQWidget *TreeListDialog::addPage(const TQStringList &labels)
item->setSelectable(last);
}
for (uint i=1; i<labels.count(); i++) {
- TQListViewItem *tqparent = item;
+ TQListViewItem *parent = item;
item = 0;
- TQListViewItemIterator iti(tqparent);
+ TQListViewItemIterator iti(parent);
for (; it.current(); ++it) {
if ( it.current()->text(0)==labels[i] ) {
item = it.current();
@@ -132,7 +132,7 @@ TQWidget *TreeListDialog::addPage(const TQStringList &labels)
page = new TQWidget(_stack);
connect(page, TQT_SIGNAL(destroyed(TQObject *)), TQT_SLOT(pageDestroyed(TQObject *)));
_stack->addWidget(page);
- item = new Item(labels[i], page, labels[i], tqparent);
+ item = new Item(labels[i], page, labels[i], parent);
item->setOpen(true);
bool last = ( labels.count()==i+1 );
item->setSelectable(last);
@@ -189,8 +189,8 @@ void TreeListDialog::pageDestroyed(TQObject *object)
//-----------------------------------------------------------------------------
TextEditorDialog::TextEditorDialog(const TQString &text, const TQString &caption,
- bool wrapAtWidgetWidth, TQWidget *tqparent)
- : Dialog(tqparent, "text_editor_dialog", true, caption, Close, Close, false, TQSize(200, 100))
+ bool wrapAtWidgetWidth, TQWidget *parent)
+ : Dialog(parent, "text_editor_dialog", true, caption, Close, Close, false, TQSize(200, 100))
{
KTextEdit *w = new KTextEdit(text, TQString(), this);
w->setReadOnly(true);
diff --git a/src/common/gui/dialog.h b/src/common/gui/dialog.h
index bc95d81..f506411 100644
--- a/src/common/gui/dialog.h
+++ b/src/common/gui/dialog.h
@@ -19,11 +19,11 @@ class Dialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- Dialog(TQWidget *tqparent, const char *name, bool modal,
+ Dialog(TQWidget *parent, const char *name, bool modal,
const TQString &caption, int buttonMask, ButtonCode defaultButton, bool separator,
const TQSize &defaultSize = TQSize());
Dialog(DialogType type, const TQString &caption,
- int buttonMask, ButtonCode defaultButton, TQWidget *tqparent, const char *name,
+ int buttonMask, ButtonCode defaultButton, TQWidget *parent, const char *name,
bool modal, bool separator, const TQSize &defaultSize = TQSize());
virtual ~Dialog();
@@ -40,7 +40,7 @@ class TreeListDialog : public Dialog
Q_OBJECT
TQ_OBJECT
public:
- TreeListDialog(TQWidget *tqparent, const char *name, bool modal,
+ TreeListDialog(TQWidget *parent, const char *name, bool modal,
const TQString &caption, int buttonMask, ButtonCode defaultButton, bool separator);
TQWidget *addPage(const TQStringList &labels);
void showPage(TQWidget *page);
@@ -74,7 +74,7 @@ Q_OBJECT
TQ_OBJECT
public:
TextEditorDialog(const TQString &text, const TQString &caption,
- bool wrapAtWidgetWidth, TQWidget *tqparent);
+ bool wrapAtWidgetWidth, TQWidget *parent);
};
#endif
diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp
index 62a1d98..1bf54cd 100644
--- a/src/common/gui/editlistbox.cpp
+++ b/src/common/gui/editlistbox.cpp
@@ -30,16 +30,16 @@
#include <kiconloader.h>
#include <kstdguiitem.h>
-EditListBox::EditListBox(uint nbColumns, TQWidget *tqparent, const char *name, Mode mode, Buttons buttons)
- : TQFrame(tqparent, name), _mode(mode), _buttons(buttons)
+EditListBox::EditListBox(uint nbColumns, TQWidget *parent, const char *name, Mode mode, Buttons buttons)
+ : TQFrame(parent, name), _mode(mode), _buttons(buttons)
{
m_lineEdit = new KLineEdit;
init(nbColumns, m_lineEdit);
}
-EditListBox::EditListBox(uint nbColumns, TQWidget *view, KLineEdit *lineEdit, TQWidget *tqparent, const char *name,
+EditListBox::EditListBox(uint nbColumns, TQWidget *view, KLineEdit *lineEdit, TQWidget *parent, const char *name,
Mode mode, Buttons buttons)
- : TQFrame(tqparent, name), _mode(mode), _buttons(buttons)
+ : TQFrame(parent, name), _mode(mode), _buttons(buttons)
{
m_lineEdit = lineEdit;
init(nbColumns, view);
diff --git a/src/common/gui/editlistbox.h b/src/common/gui/editlistbox.h
index 3e7a26d..53b4294 100644
--- a/src/common/gui/editlistbox.h
+++ b/src/common/gui/editlistbox.h
@@ -41,9 +41,9 @@ Q_OBJECT
enum Button { Add = 1, Remove = 2, UpDown = 4, RemoveAll = 8, Reset = 16 };
TQ_DECLARE_FLAGS(Buttons, Button)
- EditListBox(uint nbColumns, TQWidget *tqparent = 0, const char *name = 0, Mode mode = DuplicatesDisallowed,
+ EditListBox(uint nbColumns, TQWidget *parent = 0, const char *name = 0, Mode mode = DuplicatesDisallowed,
Buttons buttons = Buttons(Add|Remove|RemoveAll|UpDown) );
- EditListBox(uint nbColumns, TQWidget *view, KLineEdit *lineEdit, TQWidget *tqparent = 0, const char *name = 0,
+ EditListBox(uint nbColumns, TQWidget *view, KLineEdit *lineEdit, TQWidget *parent = 0, const char *name = 0,
Mode mode = DuplicatesDisallowed, Buttons buttons = Buttons(Add|Remove|RemoveAll|UpDown) );
void setTexts(const TQStringList& items);
TQStringList texts() const;
diff --git a/src/common/gui/hexword_gui.cpp b/src/common/gui/hexword_gui.cpp
index b85e829..bf1430c 100644
--- a/src/common/gui/hexword_gui.cpp
+++ b/src/common/gui/hexword_gui.cpp
@@ -15,8 +15,8 @@
#include "common/common/misc.h"
//-----------------------------------------------------------------------------
-HexValueValidator::HexValueValidator(uint nbChars, TQObject *tqparent)
- : TQValidator(tqparent, "hex_value_validator"), _nbChars(nbChars) {}
+HexValueValidator::HexValueValidator(uint nbChars, TQObject *parent)
+ : TQValidator(parent, "hex_value_validator"), _nbChars(nbChars) {}
TQValidator::State HexValueValidator::validate(TQString &input, int &) const
{
@@ -28,8 +28,8 @@ TQValidator::State HexValueValidator::validate(TQString &input, int &) const
}
//-----------------------------------------------------------------------------
-GenericHexWordEditor::GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *tqparent)
- : KLineEdit(tqparent, "hex_word_editor"), _nbChars(nbChars), _hasBlankValue(hasBlankValue)
+GenericHexWordEditor::GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *parent)
+ : KLineEdit(parent, "hex_word_editor"), _nbChars(nbChars), _hasBlankValue(hasBlankValue)
{
setFocusPolicy(TQ_ClickFocus);
setValidator(new HexValueValidator(nbChars, TQT_TQOBJECT(this)));
diff --git a/src/common/gui/hexword_gui.h b/src/common/gui/hexword_gui.h
index 19b8404..a973291 100644
--- a/src/common/gui/hexword_gui.h
+++ b/src/common/gui/hexword_gui.h
@@ -21,7 +21,7 @@ class HexValueValidator : public TQValidator
Q_OBJECT
TQ_OBJECT
public:
- HexValueValidator(uint nbChars, TQObject *tqparent);
+ HexValueValidator(uint nbChars, TQObject *parent);
virtual State validate(TQString &input, int &pos) const;
private:
@@ -34,7 +34,7 @@ class GenericHexWordEditor : public KLineEdit
Q_OBJECT
TQ_OBJECT
public:
- GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *tqparent);
+ GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *parent);
virtual TQSize tqsizeHint() const;
virtual TQSize tqminimumSizeHint() const;
@@ -58,7 +58,7 @@ protected:
bool _hasBlankValue;
virtual bool isValid() const = 0;
- virtual BitValue tqmask() const = 0;
+ virtual BitValue mask() const = 0;
virtual BitValue normalizeWord(BitValue value) const = 0;
virtual bool event(TQEvent *e);
virtual void set();
@@ -73,7 +73,7 @@ class HexWordEditor : public GenericHexWordEditor
Q_OBJECT
TQ_OBJECT
public:
- HexWordEditor(uint nbChars, TQWidget *tqparent) : GenericHexWordEditor(nbChars, false, tqparent) {}
+ HexWordEditor(uint nbChars, TQWidget *parent) : GenericHexWordEditor(nbChars, false, parent) {}
void setValue(BitValue word) { _word = word; set(); }
BitValue value() const { return _word; }
@@ -81,8 +81,8 @@ protected:
BitValue _word;
virtual bool isValid() const { return true; }
- virtual BitValue tqmask() const { return maxValue(NumberBase::Hex, _nbChars); }
- virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(tqmask()); }
+ virtual BitValue mask() const { return maxValue(NumberBase::Hex, _nbChars); }
+ virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(mask()); }
virtual BitValue word() const { return _word; }
virtual void setWord(BitValue value) { _word = value; }
virtual BitValue blankValue() const { return 0; }
diff --git a/src/common/gui/key_gui.h b/src/common/gui/key_gui.h
index 054a513..5afce35 100644
--- a/src/common/gui/key_gui.h
+++ b/src/common/gui/key_gui.h
@@ -24,7 +24,7 @@ public:
typedef TQMapConstIterator<KeyType, int> ConstIterator;
public:
- KeyWidget(TQWidget *tqparent) { _widget = new WidgetType(tqparent); }
+ KeyWidget(TQWidget *parent) { _widget = new WidgetType(parent); }
virtual ~KeyWidget() { delete _widget; }
virtual WidgetType *widget() { return _widget; }
virtual void clear() { _ids.clear(); }
@@ -71,7 +71,7 @@ class KeyComboBox : public KeyWidget<KeyType, TQString, TQComboBox>
{
public:
typedef KeyWidget<KeyType, TQString, TQComboBox> ParentType;
- KeyComboBox(TQWidget *tqparent = 0) : ParentType(tqparent) {}
+ KeyComboBox(TQWidget *parent = 0) : ParentType(parent) {}
virtual void clear() {
ParentType::clear();
ParentType::_widget->clear();
@@ -93,7 +93,7 @@ class KeyWidgetStack : public KeyWidget<KeyType, TQWidget *, TQWidgetStack>
{
public:
typedef KeyWidget<KeyType, TQWidget *, TQWidgetStack> ParentType;
- KeyWidgetStack(TQWidget *tqparent = 0) : ParentType(tqparent) {}
+ KeyWidgetStack(TQWidget *parent = 0) : ParentType(parent) {}
protected:
virtual int append(TQWidget *widget) { return ParentType::_widget->addWidget(widget); }
@@ -108,7 +108,7 @@ class KeyPopupButton : public KeyWidget<KeyType, TQString, PopupButton>
{
public:
typedef KeyWidget<KeyType, TQString, PopupButton> ParentType;
- KeyPopupButton(TQWidget *tqparent = 0) : ParentType(tqparent) {}
+ KeyPopupButton(TQWidget *parent = 0) : ParentType(parent) {}
protected:
virtual int append(TQString label) { return ParentType::_widget->appendItem(label, TQPixmap()); }
diff --git a/src/common/gui/list_container.cpp b/src/common/gui/list_container.cpp
index cbdec17..234cdf2 100644
--- a/src/common/gui/list_container.cpp
+++ b/src/common/gui/list_container.cpp
@@ -9,8 +9,8 @@
#include "list_container.h"
//----------------------------------------------------------------------------
-PopupContainer::PopupContainer(const TQString &title, TQWidget *tqparent, const char *name)
- : KPopupMenu(tqparent, name)
+PopupContainer::PopupContainer(const TQString &title, TQWidget *parent, const char *name)
+ : KPopupMenu(parent, name)
{
if ( !title.isEmpty() ) insertTitle(title);
}
@@ -41,16 +41,16 @@ void PopupContainer::appendItem(const TQPixmap &icon, const TQString &label, uin
}
//----------------------------------------------------------------------------
-ListViewItemContainer::ListViewItemContainer(const TQString &title, KListView *tqparent)
- : KListViewItem(tqparent, title), _parent(0), _column(0)
+ListViewItemContainer::ListViewItemContainer(const TQString &title, KListView *parent)
+ : KListViewItem(parent, title), _parent(0), _column(0)
{
_ids = new TQMap<const TQListViewItem *, uint>;
}
-ListViewItemContainer::ListViewItemContainer(const TQString &title, ListViewItemContainer *tqparent)
- : KListViewItem(tqparent, title), _parent(tqparent), _column(0)
+ListViewItemContainer::ListViewItemContainer(const TQString &title, ListViewItemContainer *parent)
+ : KListViewItem(parent, title), _parent(parent), _column(0)
{
- _ids = tqparent->_ids;
+ _ids = parent->_ids;
}
ListViewItemContainer::~ListViewItemContainer()
diff --git a/src/common/gui/list_container.h b/src/common/gui/list_container.h
index 138b9ea..75abeb0 100644
--- a/src/common/gui/list_container.h
+++ b/src/common/gui/list_container.h
@@ -29,7 +29,7 @@ class PopupContainer : public KPopupMenu, public ListContainer
Q_OBJECT
TQ_OBJECT
public:
- PopupContainer(const TQString &title, TQWidget *tqparent = 0, const char *name = 0);
+ PopupContainer(const TQString &title, TQWidget *parent = 0, const char *name = 0);
virtual ListContainer *appendBranch(const TQString &title);
virtual ListContainer *appendBranch(const TQPixmap &icon, const TQString &title);
virtual void appendItem(const TQPixmap &icon, const TQString &label, uint id, ItemState state);
@@ -39,8 +39,8 @@ public:
class ListViewItemContainer : public KListViewItem, public ListContainer
{
public:
- ListViewItemContainer(const TQString &title, KListView *tqparent);
- ListViewItemContainer(const TQString &title, ListViewItemContainer *tqparent);
+ ListViewItemContainer(const TQString &title, KListView *parent);
+ ListViewItemContainer(const TQString &title, ListViewItemContainer *parent);
virtual ~ListViewItemContainer();
void setColumn(uint column) { _column = column; }
virtual ListContainer *appendBranch(const TQString &title);
diff --git a/src/common/gui/list_view.cpp b/src/common/gui/list_view.cpp
index 218241d..52bd32b 100644
--- a/src/common/gui/list_view.cpp
+++ b/src/common/gui/list_view.cpp
@@ -17,8 +17,8 @@
#include <tqvariant.h>
//----------------------------------------------------------------------------
-ListView::ListView(TQWidget *tqparent, const char *name)
- : KListView(tqparent, name)
+ListView::ListView(TQWidget *parent, const char *name)
+ : KListView(parent, name)
{
TQToolTip::remove(this);
_tooltip = new ListViewToolTip(this);
diff --git a/src/common/gui/list_view.h b/src/common/gui/list_view.h
index c76ef46..54c7a05 100644
--- a/src/common/gui/list_view.h
+++ b/src/common/gui/list_view.h
@@ -26,7 +26,7 @@ class ListView : public KListView
Q_OBJECT
TQ_OBJECT
public:
- ListView(TQWidget *tqparent = 0, const char *name = 0);
+ ListView(TQWidget *parent = 0, const char *name = 0);
virtual ~ListView();
virtual void clear();
void stopRenaming(bool force);
@@ -50,8 +50,8 @@ private:
class ListViewToolTip : public TQToolTip
{
public:
- ListViewToolTip(ListView *tqparent)
- : TQToolTip(tqparent->viewport()), _listView(tqparent) {}
+ ListViewToolTip(ListView *parent)
+ : TQToolTip(parent->viewport()), _listView(parent) {}
protected:
virtual void maybeTip(const TQPoint &p);
diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp
index fadf7a9..2c4eb3b 100644
--- a/src/common/gui/misc_gui.cpp
+++ b/src/common/gui/misc_gui.cpp
@@ -109,14 +109,14 @@ void MessageBox::text(const TQString &text, Log::ShowMode show)
}
//----------------------------------------------------------------------------
-PopupButton::PopupButton(TQWidget *tqparent, const char *name)
- : KPushButton(tqparent, name)
+PopupButton::PopupButton(TQWidget *parent, const char *name)
+ : KPushButton(parent, name)
{
init();
}
-PopupButton::PopupButton(const TQString &text, TQWidget *tqparent, const char *name)
- : KPushButton(text, tqparent, name)
+PopupButton::PopupButton(const TQString &text, TQWidget *parent, const char *name)
+ : KPushButton(text, parent, name)
{
init();
}
@@ -158,8 +158,8 @@ int PopupButton::appendItem(const TQString &label, const TQPixmap &icon, int id)
}
//-----------------------------------------------------------------------------
-Splitter::Splitter(const TQValueList<int> &defaultSizes, Qt::Orientation o, TQWidget *tqparent, const char *name)
- : TQSplitter(o, tqparent, name), _defaultSizes(defaultSizes)
+Splitter::Splitter(const TQValueList<int> &defaultSizes, Qt::Orientation o, TQWidget *parent, const char *name)
+ : TQSplitter(o, parent, name), _defaultSizes(defaultSizes)
{
Q_ASSERT(name);
setOpaqueResize(true);
@@ -181,18 +181,18 @@ void Splitter::updateSizes()
}
//-----------------------------------------------------------------------------
-TabBar::TabBar(TQWidget *tqparent, const char *name)
- : KTabBar(tqparent, name), _ignoreWheelEvent(false)
+TabBar::TabBar(TQWidget *parent, const char *name)
+ : KTabBar(parent, name), _ignoreWheelEvent(false)
{}
void TabBar::wheelEvent(TQWheelEvent *e)
{
- if (_ignoreWheelEvent) TQApplication::sendEvent(tqparent(), e); // #### not sure why ignoring is not enough...
+ if (_ignoreWheelEvent) TQApplication::sendEvent(parent(), e); // #### not sure why ignoring is not enough...
else KTabBar::wheelEvent(e);
}
-TabWidget::TabWidget(TQWidget *tqparent, const char *name)
- : KTabWidget(tqparent, name)
+TabWidget::TabWidget(TQWidget *parent, const char *name)
+ : KTabWidget(parent, name)
{
setTabBar(new TabBar(this));
}
@@ -223,12 +223,12 @@ void TabWidget::setTabBar(TabBar *tabbar)
}
//-----------------------------------------------------------------------------
-ComboBox::ComboBox(TQWidget *tqparent, const char *name)
- : TQComboBox(tqparent, name), _ignoreWheelEvent(false)
+ComboBox::ComboBox(TQWidget *parent, const char *name)
+ : TQComboBox(parent, name), _ignoreWheelEvent(false)
{}
void ComboBox::wheelEvent(TQWheelEvent *e)
{
- if (_ignoreWheelEvent) TQApplication::sendEvent(tqparent(), e); // #### not sure why ignoring is not enough...
+ if (_ignoreWheelEvent) TQApplication::sendEvent(parent(), e); // #### not sure why ignoring is not enough...
else TQComboBox::wheelEvent(e);
}
diff --git a/src/common/gui/misc_gui.h b/src/common/gui/misc_gui.h
index 7003f91..8c6a2ee 100644
--- a/src/common/gui/misc_gui.h
+++ b/src/common/gui/misc_gui.h
@@ -65,8 +65,8 @@ class PopupButton : public KPushButton
Q_OBJECT
TQ_OBJECT
public:
- PopupButton(TQWidget *tqparent = 0, const char *name = 0);
- PopupButton(const TQString &text, TQWidget *tqparent = 0, const char *name = 0);
+ PopupButton(TQWidget *parent = 0, const char *name = 0);
+ PopupButton(const TQString &text, TQWidget *parent = 0, const char *name = 0);
void appendAction(KAction *action);
void appendAction(const TQString &label, const TQString &icon = TQString(),
TQObject *receiver = 0, const char *slot = 0);
@@ -91,7 +91,7 @@ Q_OBJECT
TQ_OBJECT
public:
Splitter(const TQValueList<int> &defaultSizes, Qt::Orientation orientation,
- TQWidget *tqparent, const char *name);
+ TQWidget *parent, const char *name);
virtual ~Splitter();
private slots:
@@ -114,7 +114,7 @@ class SeparatorWidget : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- SeparatorWidget(TQWidget *tqparent) : TQFrame(tqparent, "separator") {
+ SeparatorWidget(TQWidget *parent) : TQFrame(parent, "separator") {
setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
setMargin(2);
setFixedHeight(2*2);
@@ -127,7 +127,7 @@ class TabBar : public KTabBar
Q_OBJECT
TQ_OBJECT
public:
- TabBar(TQWidget *tqparent = 0, const char *name = 0);
+ TabBar(TQWidget *parent = 0, const char *name = 0);
protected:
virtual void wheelEvent(TQWheelEvent *e);
@@ -143,7 +143,7 @@ class TabWidget : public KTabWidget
Q_OBJECT
TQ_OBJECT
public:
- TabWidget(TQWidget *tqparent = 0, const char *name = 0);
+ TabWidget(TQWidget *parent = 0, const char *name = 0);
void setIgnoreWheelEvent(bool ignore);
protected:
@@ -157,7 +157,7 @@ class ComboBox : public TQComboBox
Q_OBJECT
TQ_OBJECT
public:
- ComboBox(TQWidget *tqparent = 0, const char *name = 0);
+ ComboBox(TQWidget *parent = 0, const char *name = 0);
void setIgnoreWheelEvent(bool ignore) { _ignoreWheelEvent = ignore; }
protected:
diff --git a/src/common/gui/number_gui.cpp b/src/common/gui/number_gui.cpp
index 1a84a36..cb58d4c 100644
--- a/src/common/gui/number_gui.cpp
+++ b/src/common/gui/number_gui.cpp
@@ -36,14 +36,14 @@ uint maxLabelWidth(NumberBase base, uint nbChars, const TQFont &font)
}
//-----------------------------------------------------------------------------
-NumberLineEdit::NumberLineEdit(TQWidget *tqparent, const char *name)
- : KLineEdit(tqparent, name)
+NumberLineEdit::NumberLineEdit(TQWidget *parent, const char *name)
+ : KLineEdit(parent, name)
{
connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChangedSlot()));
}
-NumberLineEdit::NumberLineEdit(const TQString &text, TQWidget *tqparent, const char *name)
- : KLineEdit(text, tqparent, name)
+NumberLineEdit::NumberLineEdit(const TQString &text, TQWidget *parent, const char *name)
+ : KLineEdit(text, parent, name)
{
connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChangedSlot()));
}
diff --git a/src/common/gui/number_gui.h b/src/common/gui/number_gui.h
index 2b23d2b..659e443 100644
--- a/src/common/gui/number_gui.h
+++ b/src/common/gui/number_gui.h
@@ -28,8 +28,8 @@ class NumberLineEdit : public KLineEdit
Q_OBJECT
TQ_OBJECT
public:
- NumberLineEdit(TQWidget *tqparent = 0, const char *name = 0);
- NumberLineEdit(const TQString &text, TQWidget *tqparent = 0, const char *name = 0);
+ NumberLineEdit(TQWidget *parent = 0, const char *name = 0);
+ NumberLineEdit(const TQString &text, TQWidget *parent = 0, const char *name = 0);
uint value(bool *ok = 0) const { return fromAnyLabel(text(), ok); }
void setColor(const TQColor &color) { setPaletteForegroundColor(color); }
void unsetColor() { unsetPalette(); }
diff --git a/src/common/gui/purl_gui.cpp b/src/common/gui/purl_gui.cpp
index f93e11c..0284682 100644
--- a/src/common/gui/purl_gui.cpp
+++ b/src/common/gui/purl_gui.cpp
@@ -74,8 +74,8 @@ bool PURL::hasMimetype(FileType type)
//-----------------------------------------------------------------------------
PURL::Label::Label(const TQString &url, const TQString &text,
- TQWidget *tqparent, const char *name)
- : KURLLabel(url, text, tqparent, name)
+ TQWidget *parent, const char *name)
+ : KURLLabel(url, text, parent, name)
{
connect(this, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(urlClickedSlot()));
}
@@ -86,14 +86,14 @@ void PURL::Label::urlClickedSlot()
}
//-----------------------------------------------------------------------------
-PURL::BaseWidget::BaseWidget(TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+PURL::BaseWidget::BaseWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
init();
}
-PURL::BaseWidget::BaseWidget(const TQString &defaultDir, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name), _defaultDir(defaultDir)
+PURL::BaseWidget::BaseWidget(const TQString &defaultDir, TQWidget *parent, const char *name)
+ : TQWidget(parent, name), _defaultDir(defaultDir)
{
init();
}
@@ -122,14 +122,14 @@ void PURL::DirectoryWidget::buttonClicked()
}
//----------------------------------------------------------------------------
-PURL::DirectoriesWidget::DirectoriesWidget(const TQString &title, TQWidget *tqparent, const char *name)
- : TQVGroupBox(title, tqparent, name)
+PURL::DirectoriesWidget::DirectoriesWidget(const TQString &title, TQWidget *parent, const char *name)
+ : TQVGroupBox(title, parent, name)
{
init(TQString());
}
-PURL::DirectoriesWidget::DirectoriesWidget(const TQString &title, const TQString &defaultDir, TQWidget *tqparent, const char *name)
- : TQVGroupBox(title, tqparent, name)
+PURL::DirectoriesWidget::DirectoriesWidget(const TQString &title, const TQString &defaultDir, TQWidget *parent, const char *name)
+ : TQVGroupBox(title, parent, name)
{
init(defaultDir);
}
diff --git a/src/common/gui/purl_gui.h b/src/common/gui/purl_gui.h
index d554636..3d29319 100644
--- a/src/common/gui/purl_gui.h
+++ b/src/common/gui/purl_gui.h
@@ -37,7 +37,7 @@ class Label : public KURLLabel
Q_OBJECT
TQ_OBJECT
public:
- Label(const TQString &url, const TQString &text, TQWidget *tqparent = 0, const char *name = 0);
+ Label(const TQString &url, const TQString &text, TQWidget *parent = 0, const char *name = 0);
private slots:
void urlClickedSlot();
@@ -49,8 +49,8 @@ class BaseWidget : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- BaseWidget(TQWidget *tqparent = 0, const char *name = 0);
- BaseWidget(const TQString &defaultDir, TQWidget *tqparent = 0, const char *name = 0);
+ BaseWidget(TQWidget *parent = 0, const char *name = 0);
+ BaseWidget(const TQString &defaultDir, TQWidget *parent = 0, const char *name = 0);
KLineEdit *lineEdit() { return _edit; }
signals:
@@ -72,8 +72,8 @@ class DirectoryWidget : public BaseWidget
Q_OBJECT
TQ_OBJECT
public:
- DirectoryWidget(TQWidget *tqparent = 0, const char *name = 0) : BaseWidget(tqparent, name) {}
- DirectoryWidget(const TQString &defaultDir, TQWidget *tqparent = 0, const char *name = 0) : BaseWidget(defaultDir, tqparent, name) {}
+ DirectoryWidget(TQWidget *parent = 0, const char *name = 0) : BaseWidget(parent, name) {}
+ DirectoryWidget(const TQString &defaultDir, TQWidget *parent = 0, const char *name = 0) : BaseWidget(defaultDir, parent, name) {}
void setDirectory(const Directory &dir) { _edit->setText(dir.path()); }
Directory directory() const { return _edit->text(); }
@@ -87,8 +87,8 @@ class DirectoriesWidget : public TQVGroupBox
Q_OBJECT
TQ_OBJECT
public:
- DirectoriesWidget(const TQString &title, TQWidget *tqparent = 0, const char *name = 0);
- DirectoriesWidget(const TQString &title, const TQString &defaultDir, TQWidget *tqparent = 0, const char *name = 0);
+ DirectoriesWidget(const TQString &title, TQWidget *parent = 0, const char *name = 0);
+ DirectoriesWidget(const TQString &title, const TQString &defaultDir, TQWidget *parent = 0, const char *name = 0);
void setDirectories(const TQStringList &dirs) { _editListBox->setTexts(dirs); }
TQStringList directories() const { return _editListBox->texts(); }
@@ -106,10 +106,10 @@ class UrlWidget : public BaseWidget
Q_OBJECT
TQ_OBJECT
public:
- UrlWidget(const TQString &filter, TQWidget *tqparent = 0, const char *name = 0)
- : BaseWidget(tqparent, name), _filter(filter) {}
- UrlWidget(const TQString &defaultDir, const TQString &filter, TQWidget *tqparent = 0, const char *name = 0)
- : BaseWidget(defaultDir, tqparent, name), _filter(filter) {}
+ UrlWidget(const TQString &filter, TQWidget *parent = 0, const char *name = 0)
+ : BaseWidget(parent, name), _filter(filter) {}
+ UrlWidget(const TQString &defaultDir, const TQString &filter, TQWidget *parent = 0, const char *name = 0)
+ : BaseWidget(defaultDir, parent, name), _filter(filter) {}
Url url() const { return PURL::Url::fromPathOrUrl(_edit->text()); }
void setUrl(const Url &url) { _edit->setText(url.filepath()); }
diff --git a/src/common/nokde/nokde_kprocess.cpp b/src/common/nokde/nokde_kprocess.cpp
index 2886f20..8bbb711 100644
--- a/src/common/nokde/nokde_kprocess.cpp
+++ b/src/common/nokde/nokde_kprocess.cpp
@@ -11,8 +11,8 @@
# include <signal.h>
#endif
-KProcess::KProcess(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+KProcess::KProcess(TQObject *parent, const char *name)
+ : TQObject(parent, name)
{
_process = new Q3Process(this);
connect(_process, TQT_SIGNAL(processExited()), TQT_SLOT(processExitedSlot()));
diff --git a/src/common/nokde/nokde_kprocess.h b/src/common/nokde/nokde_kprocess.h
index 5c7effd..a18d5c5 100644
--- a/src/common/nokde/nokde_kprocess.h
+++ b/src/common/nokde/nokde_kprocess.h
@@ -15,7 +15,7 @@ class KProcess : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- KProcess(TQObject *tqparent = 0, const char *name = 0);
+ KProcess(TQObject *parent = 0, const char *name = 0);
void clearArguments() { _arguments.clear(); }
KProcess &operator<< (const TQString &arg) { _arguments += arg; return *this; }
KProcess &operator<< (const TQStringList &args) { _arguments += args; return *this; }
diff --git a/src/common/port/parallel.cpp b/src/common/port/parallel.cpp
index d92bc82..daa0c6a 100644
--- a/src/common/port/parallel.cpp
+++ b/src/common/port/parallel.cpp
@@ -203,8 +203,8 @@ bool Port::Parallel::setPinOn(uint pin, bool on, LogicType type)
Q_ASSERT( PIN_DATA[pin].dir==Out );
RequestType rtype = PIN_DATA[pin].rType;
Q_ASSERT( rtype!=Nb_RequestTypes );
- uchar tqmask = PIN_DATA[pin].tqmask;
- uchar c = (XOR(type==NegativeLogic, on) ? _images[rtype] | tqmask : _images[rtype] & ~tqmask);
+ uchar mask = PIN_DATA[pin].mask;
+ uchar c = (XOR(type==NegativeLogic, on) ? _images[rtype] | mask : _images[rtype] & ~mask);
int request = REQUEST_DATA[rtype].write;
Q_ASSERT( request!=0 );
if ( ioctl(_fd, request, &c)<0 ) {
@@ -232,7 +232,7 @@ bool Port::Parallel::readPin(uint pin, LogicType type, bool &value)
return false;
}
_images[rtype] = c;
- value = (type==NegativeLogic ? ~c : c ) & PIN_DATA[pin].tqmask;
+ value = (type==NegativeLogic ? ~c : c ) & PIN_DATA[pin].mask;
#endif
return true;
}
diff --git a/src/common/port/parallel.h b/src/common/port/parallel.h
index 2dbfc71..08741e1 100644
--- a/src/common/port/parallel.h
+++ b/src/common/port/parallel.h
@@ -36,7 +36,7 @@ public:
enum RequestType { Control = 0, tqStatus, Data, Nb_RequestTypes };
struct PPinData {
RequestType rType;
- uchar tqmask;
+ uchar mask;
IODir dir;
const char *label;
};
diff --git a/src/common/port/serial.cpp b/src/common/port/serial.cpp
index 5942561..2db84b9 100644
--- a/src/common/port/serial.cpp
+++ b/src/common/port/serial.cpp
@@ -375,15 +375,15 @@ bool Port::Serial::internalReadPin(Pin pin, LogicType type, bool &value)
#if defined(Q_OS_UNIX)
int bits;
if ( ioctl(_fd, TIOCMGET, &bits)<0 ) return false;
- int tqmask = 0;
+ int mask = 0;
switch (pin) {
- case DCD: tqmask = TIOCM_CD; break;
- case RX : tqmask = TIOCM_SR; break;
- case DSR: tqmask = TIOCM_DSR; break;
- case CTS: tqmask = TIOCM_CTS; break;
+ case DCD: mask = TIOCM_CD; break;
+ case RX : mask = TIOCM_SR; break;
+ case DSR: mask = TIOCM_DSR; break;
+ case CTS: mask = TIOCM_CTS; break;
default: Q_ASSERT(false); return false;
}
- value = ((type==NegativeLogic ? ~bits : bits) & tqmask);
+ value = ((type==NegativeLogic ? ~bits : bits) & mask);
return true;
#elif defined(Q_OS_WIN)
DWORD status;