summaryrefslogtreecommitdiffstats
path: root/src/kvilib/tal
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
commit9ca32ef31a2566af48c06f258722738df92366af (patch)
treec847db3bf1bb88b7863fed0cc60eef6bf641306a /src/kvilib/tal
parent72aaee9802d447ee21340b011856b9b355a58f1a (diff)
downloadkvirc-9ca32ef31a2566af48c06f258722738df92366af.tar.gz
kvirc-9ca32ef31a2566af48c06f258722738df92366af.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/kvilib/tal')
-rw-r--r--src/kvilib/tal/kvi_tal_filedialog.cpp12
-rw-r--r--src/kvilib/tal/kvi_tal_filedialog_kde.h8
-rw-r--r--src/kvilib/tal/kvi_tal_filedialog_qt.h6
-rw-r--r--src/kvilib/tal/kvi_tal_filedialog_qt4.h6
-rw-r--r--src/kvilib/tal/kvi_tal_groupbox_qt3.h16
-rw-r--r--src/kvilib/tal/kvi_tal_groupbox_qt4.h16
-rw-r--r--src/kvilib/tal/kvi_tal_iconview_qt3.h24
-rw-r--r--src/kvilib/tal/kvi_tal_iconview_qt4.h24
-rw-r--r--src/kvilib/tal/kvi_tal_listview.cpp164
-rw-r--r--src/kvilib/tal/kvi_tal_listview_qt3.h18
-rw-r--r--src/kvilib/tal/kvi_tal_listview_qt4.h18
11 files changed, 156 insertions, 156 deletions
diff --git a/src/kvilib/tal/kvi_tal_filedialog.cpp b/src/kvilib/tal/kvi_tal_filedialog.cpp
index 5760a90c..f07df4c4 100644
--- a/src/kvilib/tal/kvi_tal_filedialog.cpp
+++ b/src/kvilib/tal/kvi_tal_filedialog.cpp
@@ -31,8 +31,8 @@
#include <tqdir.h>
- KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
- : TQFileDialog(tqparent,"",dirName,filter)
+ KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
+ : TQFileDialog(parent,"",dirName,filter)
{
setModal(modal);
}
@@ -78,8 +78,8 @@
#ifdef COMPILE_KDE_SUPPORT
- KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
- : KFileDialog(dirName,filter,tqparent,name,modal)
+ KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
+ : KFileDialog(dirName,filter,parent,name,modal)
{
clearWFlags(WDestructiveClose);
}
@@ -129,8 +129,8 @@
#include <tqdir.h>
- KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
- : TQFileDialog(dirName,filter,tqparent,name,modal)
+ KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
+ : TQFileDialog(dirName,filter,parent,name,modal)
{
clearWFlags(WDestructiveClose);
}
diff --git a/src/kvilib/tal/kvi_tal_filedialog_kde.h b/src/kvilib/tal/kvi_tal_filedialog_kde.h
index 5285aa16..3597f1a4 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_kde.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_kde.h
@@ -31,7 +31,7 @@ class KVILIB_API KviTalFileDialog : public KFileDialog
Q_OBJECT
TQ_OBJECT
public:
- KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
+ KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
~KviTalFileDialog();
public:
enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@@ -40,11 +40,11 @@ public:
void setDirectory(const TQString &szDirectory);
- static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
+ static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
{
// TQFileDialog allows making new directories...kfiledialog not :/
- return TQFileDialog::getExistingDirectory(dir,tqparent,0,caption);
- //return getExistingDirectory(dir,tqparent,caption);
+ return TQFileDialog::getExistingDirectory(dir,parent,0,caption);
+ //return getExistingDirectory(dir,parent,caption);
};
};
diff --git a/src/kvilib/tal/kvi_tal_filedialog_qt.h b/src/kvilib/tal/kvi_tal_filedialog_qt.h
index 0eebfc61..25dff95b 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_qt.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_qt.h
@@ -30,7 +30,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog
Q_OBJECT
TQ_OBJECT
public:
- KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
+ KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
~KviTalFileDialog();
public:
enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@@ -38,8 +38,8 @@ public:
void setFileMode(FileMode m);
void setDirectory(const TQString &szDirectory);
- static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
- { return getExistingDirectory(dir,tqparent,0 /* name */,caption); };
+ static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
+ { return getExistingDirectory(dir,parent,0 /* name */,caption); };
};
#endif // _KVI_TAL_FILEDIALOG_TQT_H_
diff --git a/src/kvilib/tal/kvi_tal_filedialog_qt4.h b/src/kvilib/tal/kvi_tal_filedialog_qt4.h
index 18bb420e..02586251 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_qt4.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_qt4.h
@@ -32,7 +32,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog
Q_OBJECT
TQ_OBJECT
public:
- KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
+ KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
~KviTalFileDialog();
public:
enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@@ -40,8 +40,8 @@ public:
void setFileMode(FileMode m);
void setDirectory(const TQString &szDirectory);
- static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
- { return getExistingDirectory(tqparent,caption,dir); };
+ static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
+ { return getExistingDirectory(parent,caption,dir); };
};
#endif // _KVI_TAL_FILEDIALOG_TQT_H_
diff --git a/src/kvilib/tal/kvi_tal_groupbox_qt3.h b/src/kvilib/tal/kvi_tal_groupbox_qt3.h
index 12369208..633d04ca 100644
--- a/src/kvilib/tal/kvi_tal_groupbox_qt3.h
+++ b/src/kvilib/tal/kvi_tal_groupbox_qt3.h
@@ -32,14 +32,14 @@ class KVILIB_API KviTalGroupBox : public TQGroupBox
Q_OBJECT
TQ_OBJECT
public:
- KviTalGroupBox(TQWidget * tqparent = 0)
- : TQGroupBox(tqparent) {};
- KviTalGroupBox(const TQString & title,TQWidget * tqparent = 0)
- : TQGroupBox(title,tqparent) {};
- KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * tqparent = 0)
- : TQGroupBox(strips,orientation,tqparent) {};
- KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * tqparent = 0)
- : TQGroupBox(strips,orientation,title,tqparent) {};
+ KviTalGroupBox(TQWidget * parent = 0)
+ : TQGroupBox(parent) {};
+ KviTalGroupBox(const TQString & title,TQWidget * parent = 0)
+ : TQGroupBox(title,parent) {};
+ KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * parent = 0)
+ : TQGroupBox(strips,orientation,parent) {};
+ KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * parent = 0)
+ : TQGroupBox(strips,orientation,title,parent) {};
~KviTalGroupBox() {};
};
diff --git a/src/kvilib/tal/kvi_tal_groupbox_qt4.h b/src/kvilib/tal/kvi_tal_groupbox_qt4.h
index 1b34de14..2e61356a 100644
--- a/src/kvilib/tal/kvi_tal_groupbox_qt4.h
+++ b/src/kvilib/tal/kvi_tal_groupbox_qt4.h
@@ -32,14 +32,14 @@ class KVILIB_API KviTalGroupBox : public Q3GroupBox
Q_OBJECT
TQ_OBJECT
public:
- KviTalGroupBox(TQWidget * tqparent = 0)
- : Q3GroupBox(tqparent) {};
- KviTalGroupBox(const TQString & title,TQWidget * tqparent = 0)
- : Q3GroupBox(title,tqparent) {};
- KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * tqparent = 0)
- : Q3GroupBox(strips,orientation,tqparent) {};
- KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * tqparent = 0)
- : Q3GroupBox(strips,orientation,title,tqparent) {};
+ KviTalGroupBox(TQWidget * parent = 0)
+ : Q3GroupBox(parent) {};
+ KviTalGroupBox(const TQString & title,TQWidget * parent = 0)
+ : Q3GroupBox(title,parent) {};
+ KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * parent = 0)
+ : Q3GroupBox(strips,orientation,parent) {};
+ KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * parent = 0)
+ : Q3GroupBox(strips,orientation,title,parent) {};
~KviTalGroupBox() {};
};
diff --git a/src/kvilib/tal/kvi_tal_iconview_qt3.h b/src/kvilib/tal/kvi_tal_iconview_qt3.h
index 73d367c6..5ad9c07b 100644
--- a/src/kvilib/tal/kvi_tal_iconview_qt3.h
+++ b/src/kvilib/tal/kvi_tal_iconview_qt3.h
@@ -79,18 +79,18 @@ public:
class KVILIB_API KviTalIconViewItem : public TQIconViewItem
{
public:
- KviTalIconViewItem(KviTalIconView * tqparent)
- : TQIconViewItem(tqparent) {};
- KviTalIconViewItem(KviTalIconView * tqparent,KviTalIconViewItem * after)
- : TQIconViewItem(tqparent,after) {};
- KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text)
- : TQIconViewItem(tqparent,text) {};
- KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text)
- : TQIconViewItem(tqparent,after,text) {};
- KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text, const TQPixmap & icon)
- : TQIconViewItem(tqparent,text,icon) {};
- KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
- : TQIconViewItem(tqparent,after,text,icon) {};
+ KviTalIconViewItem(KviTalIconView * parent)
+ : TQIconViewItem(parent) {};
+ KviTalIconViewItem(KviTalIconView * parent,KviTalIconViewItem * after)
+ : TQIconViewItem(parent,after) {};
+ KviTalIconViewItem(KviTalIconView * parent, const TQString & text)
+ : TQIconViewItem(parent,text) {};
+ KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text)
+ : TQIconViewItem(parent,after,text) {};
+ KviTalIconViewItem(KviTalIconView * parent, const TQString & text, const TQPixmap & icon)
+ : TQIconViewItem(parent,text,icon) {};
+ KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
+ : TQIconViewItem(parent,after,text,icon) {};
public:
KviTalIconView * iconView() const { return (KviTalIconView *)TQIconViewItem::iconView(); };
KviTalIconViewItem * prevItem() const { return (KviTalIconViewItem *)TQIconViewItem::prevItem(); };
diff --git a/src/kvilib/tal/kvi_tal_iconview_qt4.h b/src/kvilib/tal/kvi_tal_iconview_qt4.h
index 99554341..33a5bef4 100644
--- a/src/kvilib/tal/kvi_tal_iconview_qt4.h
+++ b/src/kvilib/tal/kvi_tal_iconview_qt4.h
@@ -78,18 +78,18 @@ public:
class KVILIB_API KviTalIconViewItem : public Q3IconViewItem
{
public:
- KviTalIconViewItem(KviTalIconView * tqparent)
- : Q3IconViewItem(tqparent) {};
- KviTalIconViewItem(KviTalIconView * tqparent,KviTalIconViewItem * after)
- : Q3IconViewItem(tqparent,after) {};
- KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text)
- : Q3IconViewItem(tqparent,text) {};
- KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text)
- : Q3IconViewItem(tqparent,after,text) {};
- KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text, const TQPixmap & icon)
- : Q3IconViewItem(tqparent,text,icon) {};
- KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
- : Q3IconViewItem(tqparent,after,text,icon) {};
+ KviTalIconViewItem(KviTalIconView * parent)
+ : Q3IconViewItem(parent) {};
+ KviTalIconViewItem(KviTalIconView * parent,KviTalIconViewItem * after)
+ : Q3IconViewItem(parent,after) {};
+ KviTalIconViewItem(KviTalIconView * parent, const TQString & text)
+ : Q3IconViewItem(parent,text) {};
+ KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text)
+ : Q3IconViewItem(parent,after,text) {};
+ KviTalIconViewItem(KviTalIconView * parent, const TQString & text, const TQPixmap & icon)
+ : Q3IconViewItem(parent,text,icon) {};
+ KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
+ : Q3IconViewItem(parent,after,text,icon) {};
public:
KviTalIconView * iconView() const { return (KviTalIconView *)Q3IconViewItem::iconView(); };
KviTalIconViewItem * prevItem() const { return (KviTalIconViewItem *)Q3IconViewItem::prevItem(); };
diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
index f7c31719..2d946a21 100644
--- a/src/kvilib/tal/kvi_tal_listview.cpp
+++ b/src/kvilib/tal/kvi_tal_listview.cpp
@@ -69,8 +69,8 @@
lvi.features |= TQStyleOptionQ3ListViewItem::MultiLine;
if (item->isVisible())
lvi.features |= TQStyleOptionQ3ListViewItem::Visible;
- if (item->tqparent() && item->tqparent()->rtti() == 1
- && static_cast<Q3CheckListItem *>(item->tqparent())->type() == Q3CheckListItem::Controller)
+ if (item->parent() && item->parent()->rtti() == 1
+ && static_cast<Q3CheckListItem *>(item->parent())->type() == Q3CheckListItem::Controller)
lvi.features |= TQStyleOptionQ3ListViewItem::ParentControl;
opt.items.append(lvi);
if (!firstItem) {
@@ -210,39 +210,39 @@
bool tristate;
};
- KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,
+ KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,
Type tt)
- : KviTalListViewItem(tqparent, text, TQString())
+ : KviTalListViewItem(parent, text, TQString())
{
myType = tt;
init();
if (myType == RadioButton) {
- if (tqparent->type() != RadioButtonController)
+ if (parent->type() != RadioButtonController)
qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller");
else
- d->exclusive = tqparent;
+ d->exclusive = parent;
}
}
- KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,
+ KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,
const TQString &text, Type tt)
- : KviTalListViewItem(tqparent, after, text)
+ : KviTalListViewItem(parent, after, text)
{
myType = tt;
init();
if (myType == RadioButton) {
- if (tqparent->type() != RadioButtonController)
+ if (parent->type() != RadioButtonController)
qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller");
else
- d->exclusive = tqparent;
+ d->exclusive = parent;
}
}
- KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+ KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
Type tt)
- : KviTalListViewItem(tqparent, text, TQString())
+ : KviTalListViewItem(parent, text, TQString())
{
myType = tt;
if (myType == RadioButton) {
@@ -252,9 +252,9 @@
init();
}
- KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, KviTalListViewItem *after,
+ KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, KviTalListViewItem *after,
const TQString &text, Type tt)
- : KviTalListViewItem(tqparent, after, text)
+ : KviTalListViewItem(parent, after, text)
{
myType = tt;
if (myType == RadioButton) {
@@ -264,9 +264,9 @@
init();
}
- KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+ KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, const TQString &text,
Type tt)
- : KviTalListViewItem(tqparent, text)
+ : KviTalListViewItem(parent, text)
{
myType = tt;
if (tt == RadioButton)
@@ -275,9 +275,9 @@
init();
}
- KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, KviTalListViewItem *after,
+ KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, KviTalListViewItem *after,
const TQString &text, Type tt)
- : KviTalListViewItem(tqparent, after, text)
+ : KviTalListViewItem(parent, after, text)
{
myType = tt;
if (tt == RadioButton)
@@ -291,18 +291,18 @@
return RTTI;
}
- KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+ KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, const TQString &text,
const TQPixmap & p)
- : KviTalListViewItem(tqparent, text)
+ : KviTalListViewItem(parent, text)
{
myType = RadioButtonController;
setPixmap(0, p);
init();
}
- KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+ KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
const TQPixmap & p)
- : KviTalListViewItem(tqparent, text)
+ : KviTalListViewItem(parent, text)
{
myType = RadioButtonController;
setPixmap(0, p);
@@ -373,9 +373,9 @@
if (myType == CheckBox) {
setCurrentState(s);
stateChange(state());
- if (update && tqparent() && tqparent()->rtti() == 1
- && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
- ((KviTalCheckListItem*)tqparent())->updateController(update, store);
+ if (update && parent() && parent()->rtti() == 1
+ && ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+ ((KviTalCheckListItem*)parent())->updateController(update, store);
} else if (myType == CheckBoxController) {
if (s == NoChange && childCount()) {
restoreState(this);
@@ -397,18 +397,18 @@
ToggleState oldState = internalState();
updateController(false, false);
if (oldState != internalState() &&
- tqparent() && tqparent()->rtti() == 1 &&
- ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
- ((KviTalCheckListItem*)tqparent())->updateController(update, store);
+ parent() && parent()->rtti() == 1 &&
+ ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+ ((KviTalCheckListItem*)parent())->updateController(update, store);
updateController(update, store);
} else {
- // if there are no tqchildren we simply set the CheckBoxController and update its tqparent
+ // if there are no tqchildren we simply set the CheckBoxController and update its parent
setCurrentState(s);
stateChange(state());
- if (tqparent() && tqparent()->rtti() == 1
- && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
- ((KviTalCheckListItem*)tqparent())->updateController(update, store);
+ if (parent() && parent()->rtti() == 1
+ && ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+ ((KviTalCheckListItem*)parent())->updateController(update, store);
}
} else {
setCurrentState(s);
@@ -482,8 +482,8 @@
int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
if (activatedPos(pos)) {
bool parentControl = false;
- if (tqparent() && tqparent()->rtti() == 1 &&
- ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
+ if (parent() && parent()->rtti() == 1 &&
+ ((KviTalCheckListItem*) parent())->type() == RadioButtonController)
parentControl = true;
int x = parentControl ? 0 : 3;
@@ -588,10 +588,10 @@
return;
KviTalCheckListItem *controller = 0;
- // checks if this CheckBoxController has another CheckBoxController as tqparent
- if (tqparent() && tqparent()->rtti() == 1
- && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
- controller = (KviTalCheckListItem*)tqparent();
+ // checks if this CheckBoxController has another CheckBoxController as parent
+ if (parent() && parent()->rtti() == 1
+ && ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+ controller = (KviTalCheckListItem*)parent();
ToggleState theState = Off;
bool first = true;
@@ -695,8 +695,8 @@
}
bool parentControl = false;
- if (tqparent() && tqparent()->rtti() == 1 &&
- ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
+ if (parent() && parent()->rtti() == 1 &&
+ ((KviTalCheckListItem*) parent())->type() == RadioButtonController)
parentControl = true;
TQFontMetrics fm(lv->fontMetrics());
@@ -775,8 +775,8 @@
intersect = r.intersects(TQRect(p, r.y(), xdepth - p + 1, r.height()));
}
bool parentControl = false;
- if (tqparent() && tqparent()->rtti() == 1 &&
- ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
+ if (parent() && parent()->rtti() == 1 &&
+ ((KviTalCheckListItem*) parent())->type() == RadioButtonController)
parentControl = true;
if (myType != RadioButtonController && intersect &&
(lv->rootIsDecorated() || myType == RadioButton ||
@@ -935,39 +935,39 @@
// ### obscenity is warranted.
- KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *tqparent, const TQString &text,
+ KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *parent, const TQString &text,
Type tt )
- : KviTalListViewItem( tqparent, text, TQString() )
+ : KviTalListViewItem( parent, text, TQString() )
{
myType = tt;
init();
if ( myType == RadioButton ) {
- if ( tqparent->type() != RadioButtonController )
+ if ( parent->type() != RadioButtonController )
qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller" );
else
- d->exclusive = tqparent;
+ d->exclusive = parent;
}
}
- KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *tqparent, KviTalListViewItem *after,
+ KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *parent, KviTalListViewItem *after,
const TQString &text, Type tt )
- : KviTalListViewItem( tqparent, after, text )
+ : KviTalListViewItem( parent, after, text )
{
myType = tt;
init();
if ( myType == RadioButton ) {
- if ( tqparent->type() != RadioButtonController )
+ if ( parent->type() != RadioButtonController )
qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller" );
else
- d->exclusive = tqparent;
+ d->exclusive = parent;
}
}
- KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,
+ KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,
Type tt )
- : KviTalListViewItem( tqparent, text, TQString() )
+ : KviTalListViewItem( parent, text, TQString() )
{
myType = tt;
if ( myType == RadioButton ) {
@@ -977,9 +977,9 @@
init();
}
- KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, KviTalListViewItem *after,
+ KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, KviTalListViewItem *after,
const TQString &text, Type tt )
- : KviTalListViewItem( tqparent, after, text )
+ : KviTalListViewItem( parent, after, text )
{
myType = tt;
if ( myType == RadioButton ) {
@@ -989,9 +989,9 @@
init();
}
- KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,
+ KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, const TQString &text,
Type tt )
- : KviTalListViewItem( tqparent, text )
+ : KviTalListViewItem( parent, text )
{
myType = tt;
if ( tt == RadioButton )
@@ -1000,9 +1000,9 @@
init();
}
- KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, KviTalListViewItem *after,
+ KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, KviTalListViewItem *after,
const TQString &text, Type tt )
- : KviTalListViewItem( tqparent, after, text )
+ : KviTalListViewItem( parent, after, text )
{
myType = tt;
if ( tt == RadioButton )
@@ -1019,18 +1019,18 @@
return RTTI;
}
- KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,
+ KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, const TQString &text,
const TQPixmap & p )
- : KviTalListViewItem( tqparent, text )
+ : KviTalListViewItem( parent, text )
{
myType = RadioButtonController;
setPixmap( 0, p );
init();
}
- KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,
+ KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,
const TQPixmap & p )
- : KviTalListViewItem( tqparent, text )
+ : KviTalListViewItem( parent, text )
{
myType = RadioButtonController;
setPixmap( 0, p );
@@ -1107,9 +1107,9 @@
if ( myType == CheckBox ) {
setCurrentState( s );
stateChange( state() );
- if ( update && tqparent() && tqparent()->rtti() == 1
- && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
- ((KviTalCheckListItem*)tqparent())->updateController( update, store );
+ if ( update && parent() && parent()->rtti() == 1
+ && ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+ ((KviTalCheckListItem*)parent())->updateController( update, store );
} else if ( myType == CheckBoxController ) {
if ( s == NoChange && childCount()) {
restoreState( (void*) this );
@@ -1131,18 +1131,18 @@
ToggleState oldState = internalState();
updateController( FALSE, FALSE );
if ( oldState != internalState() &&
- tqparent() && tqparent()->rtti() == 1 &&
- ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
- ((KviTalCheckListItem*)tqparent())->updateController( update, store );
+ parent() && parent()->rtti() == 1 &&
+ ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+ ((KviTalCheckListItem*)parent())->updateController( update, store );
updateController( update, store );
} else {
- // if there are no tqchildren we simply set the CheckBoxController and update its tqparent
+ // if there are no tqchildren we simply set the CheckBoxController and update its parent
setCurrentState( s );
stateChange( state() );
- if ( tqparent() && tqparent()->rtti() == 1
- && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
- ((KviTalCheckListItem*)tqparent())->updateController( update, store );
+ if ( parent() && parent()->rtti() == 1
+ && ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+ ((KviTalCheckListItem*)parent())->updateController( update, store );
}
} else {
setCurrentState( s );
@@ -1219,8 +1219,8 @@
int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
if ( activatedPos( pos ) ) {
bool parentControl = FALSE;
- if ( tqparent() && tqparent()->rtti() == 1 &&
- ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
+ if ( parent() && parent()->rtti() == 1 &&
+ ((KviTalCheckListItem*) parent())->type() == RadioButtonController )
parentControl = TRUE;
int x = parentControl ? 0 : 3;
@@ -1324,10 +1324,10 @@
return;
KviTalCheckListItem *controller = 0;
- // checks if this CheckBoxController has another CheckBoxController as tqparent
- if ( tqparent() && tqparent()->rtti() == 1
- && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
- controller = (KviTalCheckListItem*)tqparent();
+ // checks if this CheckBoxController has another CheckBoxController as parent
+ if ( parent() && parent()->rtti() == 1
+ && ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+ controller = (KviTalCheckListItem*)parent();
ToggleState theState = Off;
bool first = TRUE;
@@ -1432,8 +1432,8 @@
}
bool parentControl = FALSE;
- if ( tqparent() && tqparent()->rtti() == 1 &&
- ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
+ if ( parent() && parent()->rtti() == 1 &&
+ ((KviTalCheckListItem*) parent())->type() == RadioButtonController )
parentControl = TRUE;
TQFontMetrics fm( lv->fontMetrics() );
@@ -1512,8 +1512,8 @@
intersect = r.intersects( TQRect( p, r.y(), xdepth - p + 1, r.height() ) );
}
bool parentControl = FALSE;
- if ( tqparent() && tqparent()->rtti() == 1 &&
- ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
+ if ( parent() && parent()->rtti() == 1 &&
+ ((KviTalCheckListItem*) parent())->type() == RadioButtonController )
parentControl = TRUE;
if ( myType != RadioButtonController && intersect &&
(lv->rootIsDecorated() || myType == RadioButton ||
diff --git a/src/kvilib/tal/kvi_tal_listview_qt3.h b/src/kvilib/tal/kvi_tal_listview_qt3.h
index 75b062a4..cf72e9ff 100644
--- a/src/kvilib/tal/kvi_tal_listview_qt3.h
+++ b/src/kvilib/tal/kvi_tal_listview_qt3.h
@@ -113,7 +113,7 @@ public:
// Shadow the internal TQt methods
KviTalListViewItem * firstChild() const { return (KviTalListViewItem *)TQListViewItem::firstChild(); };
KviTalListViewItem * nextSibling() const { return (KviTalListViewItem *)TQListViewItem::nextSibling(); };
- KviTalListViewItem * tqparent() const { return (KviTalListViewItem *)TQListViewItem::tqparent(); };
+ KviTalListViewItem * parent() const { return (KviTalListViewItem *)TQListViewItem::parent(); };
KviTalListView * listView() const { return (KviTalListView *)TQListViewItem::listView(); };
KviTalListViewItem * itemAbove() { return (KviTalListViewItem *)TQListViewItem::itemAbove(); };
KviTalListViewItem * itemBelow() { return (KviTalListViewItem *)TQListViewItem::itemBelow(); };
@@ -133,14 +133,14 @@ public:
};
enum ToggleState { Off, NoChange, On };
- KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,Type = RadioButtonController);
- KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController);
- KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,Type = RadioButtonController );
- KviTalCheckListItem( KviTalListViewItem *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
- KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,Type = RadioButtonController );
- KviTalCheckListItem( KviTalListView *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
- KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,const TQPixmap & );
- KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,const TQPixmap & );
+ KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,Type = RadioButtonController);
+ KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController);
+ KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,Type = RadioButtonController );
+ KviTalCheckListItem( KviTalListViewItem *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
+ KviTalCheckListItem( KviTalListView *parent, const TQString &text,Type = RadioButtonController );
+ KviTalCheckListItem( KviTalListView *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
+ KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,const TQPixmap & );
+ KviTalCheckListItem( KviTalListView *parent, const TQString &text,const TQPixmap & );
~KviTalCheckListItem();
void paintCell( TQPainter *,const TQColorGroup & cg,int column, int width, int tqalignment );
diff --git a/src/kvilib/tal/kvi_tal_listview_qt4.h b/src/kvilib/tal/kvi_tal_listview_qt4.h
index d6f2bba6..83e46869 100644
--- a/src/kvilib/tal/kvi_tal_listview_qt4.h
+++ b/src/kvilib/tal/kvi_tal_listview_qt4.h
@@ -114,7 +114,7 @@ public:
// Shadow the internal TQt methods
KviTalListViewItem * firstChild() const { return (KviTalListViewItem *)Q3ListViewItem::firstChild(); };
KviTalListViewItem * nextSibling() const { return (KviTalListViewItem *)Q3ListViewItem::nextSibling(); };
- KviTalListViewItem * tqparent() const { return (KviTalListViewItem *)Q3ListViewItem::tqparent(); };
+ KviTalListViewItem * parent() const { return (KviTalListViewItem *)Q3ListViewItem::parent(); };
KviTalListView * listView() const { return (KviTalListView *)Q3ListViewItem::listView(); };
KviTalListViewItem * itemAbove() { return (KviTalListViewItem *)Q3ListViewItem::itemAbove(); };
KviTalListViewItem * itemBelow() { return (KviTalListViewItem *)Q3ListViewItem::itemBelow(); };
@@ -133,21 +133,21 @@ public:
enum ToggleState { Off, NoChange, On };
- KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,
+ KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,
Type = RadioButtonController);
- KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,
+ KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,
const TQString &text, Type = RadioButtonController);
- KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+ KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
Type = RadioButtonController);
- KviTalCheckListItem(KviTalListViewItem *tqparent, KviTalListViewItem *after,
+ KviTalCheckListItem(KviTalListViewItem *parent, KviTalListViewItem *after,
const TQString &text, Type = RadioButtonController);
- KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+ KviTalCheckListItem(KviTalListView *parent, const TQString &text,
Type = RadioButtonController);
- KviTalCheckListItem(KviTalListView *tqparent, KviTalListViewItem *after,
+ KviTalCheckListItem(KviTalListView *parent, KviTalListViewItem *after,
const TQString &text, Type = RadioButtonController);
- KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+ KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
const TQPixmap &);
- KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+ KviTalCheckListItem(KviTalListView *parent, const TQString &text,
const TQPixmap &);
~KviTalCheckListItem();