summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
Diffstat (limited to 'kexi')
-rw-r--r--kexi/core/kexisharedactionhost.cpp2
-rw-r--r--kexi/formeditor/container.cpp2
-rw-r--r--kexi/formeditor/factories/containerfactory.cpp2
-rw-r--r--kexi/formeditor/utils.h2
-rw-r--r--kexi/kexiutils/utils.h6
-rw-r--r--kexi/main/startup/KexiNewProjectWizard.cpp4
-rw-r--r--kexi/plugins/forms/widgets/kexidbautofield.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexidbcombobox.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexidbform.cpp4
-rw-r--r--kexi/plugins/forms/widgets/kexidbimagebox.cpp4
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportdialog.cpp2
-rw-r--r--kexi/plugins/queries/kexiquerydesignersql.cpp4
-rw-r--r--kexi/widget/kexibrowser.cpp8
-rw-r--r--kexi/widget/kexisectionheader.cpp2
-rw-r--r--kexi/widget/relations/kexirelationwidget.cpp8
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexicomboboxpopup.cpp4
-rw-r--r--kexi/widget/tableview/kexicomboboxtableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexitableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexitableview.cpp8
-rw-r--r--kexi/widget/utils/kexigradientwidget.cpp6
-rw-r--r--kexi/widget/utils/kexirecordnavigator.cpp2
22 files changed, 40 insertions, 40 deletions
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index 550cfe7c..20eae6c4 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -112,7 +112,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a
if (!d)
return; //sanity
TQWidget *fw = d->mainWin->focusWidget();
- while (fw && TQT_BASE_OBJECT(obj)!=TQT_BASE_OBJECT(fw))
+ while (fw && obj!=fw)
fw = fw->parentWidget();
if (!fw)
return;
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index 4ea7f97e..89269b14 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -267,7 +267,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
if(!tree || !tree->widget())
return true;
- if(m_form->formWidget() && (TQT_BASE_OBJECT(tree->widget()) != TQT_BASE_OBJECT(s)))
+ if(m_form->formWidget() && (tree->widget() != s))
m_form->formWidget()->highlightWidgets(tree->widget(), TQT_TQWIDGET(s));
}
else if(m_insertBegin!=TQPoint(-1,-1) && s == m_container && !m_toplevel && (mev->state() != ControlButton) && !FormManager::self()->isCreatingConnection()) // draw the selection rect
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index b0005dd9..54372991 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -868,7 +868,7 @@ void ContainerFactory::renameTabPage()
void ContainerFactory::reorderTabs(int oldpos, int newpos)
{
KFormDesigner::ObjectTreeItem *tab
- = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
+ = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(sender()->name());
if(!tab)
return;
diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h
index a8312f79..d42a891f 100644
--- a/kexi/formeditor/utils.h
+++ b/kexi/formeditor/utils.h
@@ -37,7 +37,7 @@ class Form;
If the parent is found, \a prevPrev is set to a child of child of the parent,
what for TabWidget means the page widget. */
template<class type>
-type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className, TQObject* &prevPrev)
+type* findParent(TQObject* o, const char* className, TQObject* &prevPrev)
{
if (!o || !className || className[0]=='\0')
return 0;
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index acb3cf07..e244f02e 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -42,7 +42,7 @@ namespace KexiUtils
//! \return parent object of \a o that inherits \a className or NULL if no such parent
template<class type>
- inline type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className)
+ inline type* findParent(TQObject* o, const char* className)
{
if (!o || !className || className[0]=='\0')
return 0;
@@ -67,12 +67,12 @@ namespace KexiUtils
If objName is 0 (the default), all object names match.
Returned pointer type is casted. */
template<class type>
- type* findFirstChild(TQT_BASE_OBJECT_NAME *o, const char* className, const char* objName = 0)
+ type* findFirstChild(TQObject *o, const char* className, const char* objName = 0)
{
if (!o || !className || className[0]=='\0')
return 0;
TQObjectList *l = TQT_TQOBJECT(o)->queryList( className, objName );
- TQT_BASE_OBJECT_NAME *result = l->first();
+ TQObject *result = l->first();
delete l;
return static_cast<type*>(result);
}
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 38b5fd1e..a30f2695 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -313,9 +313,9 @@ void KexiNewProjectWizard::accept()
{
if (m_prjtype_sel->lv_types->currentItem()==d->lvi_file) {//FILE:
//check if new db file name is ok
- kdDebug() << "********** TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) " << TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->className() << endl;
+ kdDebug() << "********** sender() " << sender()->className() << endl;
if (sender()==finishButton()) { /*(only if signal does not come from filedialog)*/
- kdDebug() << "********** TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))==finishButton() ********" << endl;
+ kdDebug() << "********** sender()==finishButton() ********" << endl;
// if (!m_conn_sel->m_fileDlg->checkURL()) {
if (!m_conn_sel->m_fileDlg->checkFileName()) {
return;
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index f4056728..52272fc7 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -800,7 +800,7 @@ bool KexiDBAutoField::setProperty( const char * name, const TQVariant & value )
bool KexiDBAutoField::eventFilter( TQObject *o, TQEvent *e )
{
- if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(d->label) && d->label->buddy() && e->type()==TQEvent::MouseButtonRelease) {
+ if (o==d->label && d->label->buddy() && e->type()==TQEvent::MouseButtonRelease) {
//focus label's buddy when user clicked the label
d->label->buddy()->setFocus();
}
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index c7a378df..e315e752 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -331,7 +331,7 @@ void KexiDBComboBox::mouseDoubleClickEvent( TQMouseEvent *e )
bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e )
{
- if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(this)) {
+ if (o==this) {
if (e->type()==TQEvent::Resize) {
d->paintedCombo->resize(size());
if (m_subwidget)
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 980e384d..4669fa40 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -390,7 +390,7 @@ void KexiDBForm::updateReadOnlyFlags()
bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
{
//kexipluginsdbg << e->type() << endl;
- if (e->type()==TQEvent::Resize && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(this))
+ if (e->type()==TQEvent::Resize && watched == this)
kexipluginsdbg << "RESIZE" << endl;
if (e->type()==TQEvent::KeyPress) {
if (preview()) {
@@ -537,7 +537,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
KFormDesigner::TabWidget *tabWidgetFor_widgetToFocus
= KFormDesigner::findParent<KFormDesigner::TabWidget>(
widgetToFocus, "KFormDesigner::TabWidget", pageFor_widgetToFocus);
- if (tabWidgetFor_widgetToFocus && TQT_BASE_OBJECT(tabWidgetFor_widgetToFocus->currentPage())!=TQT_BASE_OBJECT(pageFor_widgetToFocus)) {
+ if (tabWidgetFor_widgetToFocus && tabWidgetFor_widgetToFocus->currentPage()!=pageFor_widgetToFocus) {
realWidget = widgetToFocus;
continue; //the new widget to focus is placed on invisible tab page: move to next widget
}
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index fb963600..e8b7aa93 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -837,13 +837,13 @@ bool KexiDBImageBox::subwidgetStretchRequired(KexiDBAutoField* autoField) const
bool KexiDBImageBox::eventFilter( TQObject * watched, TQEvent * e )
{
- if (TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(m_chooser)) { //we're watching chooser as well because it's a focus proxy even if invisible
+ if (watched==this || watched==m_chooser) { //we're watching chooser as well because it's a focus proxy even if invisible
if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut || e->type()==TQEvent::MouseButtonPress) {
update(); //to repaint focus rect
}
}
// hide popup menu as soon as it loses focus
- if (TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(m_popupMenu) && e->type()==TQEvent::FocusOut) {
+ if (watched==m_popupMenu && e->type()==TQEvent::FocusOut) {
m_popupMenu->hide();
}
return KexiFrame::eventFilter(watched, e);
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index cf660477..29e404b6 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -1630,7 +1630,7 @@ bool KexiCSVImportDialog::eventFilter ( TQObject * watched, TQEvent * e )
|| t==TQEvent::Paint ))
return true;
- if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_startAtLineSpinBox) && t==TQEvent::KeyPress) {
+ if (watched == m_startAtLineSpinBox && t==TQEvent::KeyPress) {
TQKeyEvent *ke = TQT_TQKEYEVENT(e);
if (ke->key()==TQt::Key_Enter || ke->key()==TQt::Key_Return) {
m_table->setFocus();
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index c9f9e1c5..5e076cb4 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -410,10 +410,10 @@ void KexiQueryDesignerSQLView::slotTextChanged()
bool KexiQueryDesignerSQLView::eventFilter( TQObject *o, TQEvent *e )
{
if (d->eventFilterForSplitterEnabled) {
- if (e->type()==TQEvent::Resize && o && TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(d->historyHead) && d->historyHead->isVisible()) {
+ if (e->type()==TQEvent::Resize && o && o==d->historyHead && d->historyHead->isVisible()) {
d->heightForHistoryMode = d->historyHead->height();
}
- else if (e->type()==TQEvent::Resize && o && TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(d->status_hbox) && d->status_hbox->isVisible()) {
+ else if (e->type()==TQEvent::Resize && o && o==d->status_hbox && d->status_hbox->isVisible()) {
d->heightForStatusMode = d->status_hbox->height();
}
}
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 3e16cddc..99deccf6 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -553,16 +553,16 @@ void KexiBrowser::installEventFilter ( const TQObject * filterObj )
{
if (!filterObj)
return;
- m_list->installEventFilter ( const_cast<TQObject*>(filterObj) );
- TQWidget::installEventFilter ( const_cast<TQObject*>(filterObj) );
+ m_list->installEventFilter ( filterObj );
+ TQWidget::installEventFilter ( filterObj );
}
bool KexiBrowser::eventFilter ( TQObject *o, TQEvent * e )
{
- if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_list) && e->type()==TQEvent::Resize) {
+ if (o==m_list && e->type()==TQEvent::Resize) {
kdDebug() << "resize!" << endl;
}
- if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_list->renameLineEdit())) {
+ if (o==m_list->renameLineEdit()) {
if (e->type()==TQEvent::Hide)
itemRenameDone();
}
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index f36dfe47..2a3003ab 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -101,7 +101,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip,
bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e )
{
- if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->lbl) && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) {
+ if (o == d->lbl && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) {
if (d->lyr->view)
d->lyr->view->setFocus();
// if (KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) {
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index b1ad05fc..94d81348 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -221,13 +221,13 @@ KexiRelationWidget::addTable(const TQString& t)
void KexiRelationWidget::tableViewGotFocus()
{
-// if (m_relationView->focusedTableView == TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())))
+// if (m_relationView->focusedTableView == sender())
// return;
// kdDebug() << "GOT FOCUS!" <<endl;
// clearSelection();
// if (m_focusedTableView)
// m_focusedTableView->unsetFocus();
-// m_focusedTableView = (KexiRelationViewTableContainer*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
+// m_focusedTableView = (KexiRelationViewTableContainer*)sender();
invalidateActions();
}
@@ -339,9 +339,9 @@ void KexiRelationWidget::aboutToShowPopupMenu()
void
KexiRelationWidget::slotTableFieldDoubleClicked(TQListViewItem *i,const TQPoint&,int)
{
- if (!TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->isA("KexiRelationViewTable"))
+ if (!sender()->isA("KexiRelationViewTable"))
return;
- const KexiRelationViewTable* t = static_cast<const KexiRelationViewTable*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
+ const KexiRelationViewTable* t = static_cast<const KexiRelationViewTable*>(sender());
const TQStringList selectedFieldNames( t->selectedFieldNames() );
if (selectedFieldNames.count()==1)
emit tableFieldDoubleClicked( t->schema()->table(), selectedFieldNames.first() );
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index df2816fe..0c153c75 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -455,7 +455,7 @@ void KexiBlobTableEdit::handleAction(const TQString& actionName)
bool KexiBlobTableEdit::eventFilter( TQObject *o, TQEvent *e )
{
- if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->popup) && e->type()==TQEvent::KeyPress) {
+ if (o == d->popup && e->type()==TQEvent::KeyPress) {
TQKeyEvent* ke = TQT_TQKEYEVENT(e);
const int state = ke->state();
const int k = ke->key();
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 9ecae92f..8a0e678a 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -343,13 +343,13 @@ void KexiComboBoxPopup::slotTVItemAccepted(KexiTableItem *item, int row, int)
bool KexiComboBoxPopup::eventFilter( TQObject *o, TQEvent *e )
{
- if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(this) && e->type()==TQEvent::Hide) {
+ if (o==this && e->type()==TQEvent::Hide) {
emit hidden();
}
else if (e->type()==TQEvent::MouseButtonPress) {
kdDebug() << "TQEvent::MousePress" << endl;
}
- else if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(d->tv)) {
+ else if (o==d->tv) {
if (e->type()==TQEvent::KeyPress) {
TQKeyEvent *ke = TQT_TQKEYEVENT(e);
const int k = ke->key();
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 308e565e..3c08b265 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -352,7 +352,7 @@ bool KexiComboBoxTableEdit::eventFilter( TQObject *o, TQEvent *e )
+ TQPoint(m_scrollView->childX(d->button), m_scrollView->childY(d->button));
TQRect r(d->button->mapToGlobal(d->button->geometry().topLeft()),
d->button->mapToGlobal(d->button->geometry().bottomRight()));
- if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) {
+ if (o==popup() && popup()->isVisible() && r.contains( gp )) {
m_mouseBtnPressedWhenPopupVisible = true;
}
}
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index 3305fff1..943ec1e8 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -120,7 +120,7 @@ KexiTableEdit::eventFilter(TQObject* watched, TQEvent* e)
}
}*/
- if(TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(this))
+ if(watched == this)
{
if(e->type() == TQEvent::KeyPress)
{
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index c1405c1d..ab76fa95 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -1264,7 +1264,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
TQWidget *w = focusWidget();
// if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view() && w!=m_editor)) {
// if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view())) {
- if (!w || TQT_BASE_OBJECT(w)!=TQT_BASE_OBJECT(viewport()) && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast<TQT_BASE_OBJECT_NAME*>(m_editor)), TQT_TQOBJECT(w)))) {
+ if (!w || w!=viewport() && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast<TQObject*>(m_editor)), TQT_TQOBJECT(w)))) {
//don't process stranger's events
e->ignore();
return;
@@ -2422,7 +2422,7 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e )
ke->accept();
return true;
}
- else if (m_editor && (o==dynamic_cast<TQT_BASE_OBJECT_NAME*>(m_editor) || TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_editor->widget()))) {
+ else if (m_editor && (o==dynamic_cast<TQObject*>(m_editor) || o==m_editor->widget())) {
if ( (k==TQt::Key_Tab && (s==Qt::NoButton || s==TQt::ShiftButton))
|| (overrideEditorShortcutNeeded(ke))
|| (k==TQt::Key_Enter || k==TQt::Key_Return || k==TQt::Key_Up || k==TQt::Key_Down)
@@ -2450,14 +2450,14 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e )
}*/
}
}
- else if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(horizontalScrollBar())) {
+ else if (o==horizontalScrollBar()) {
if ((e->type()==TQEvent::Show && !horizontalScrollBar()->isVisible())
|| (e->type()==TQEvent::Hide && horizontalScrollBar()->isVisible())) {
updateWidgetContentsSize();
}
}
else if (e->type()==TQEvent::Leave) {
- if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(viewport()) && d->appearance.rowMouseOverHighlightingEnabled
+ if (o==viewport() && d->appearance.rowMouseOverHighlightingEnabled
&& d->appearance.persistentSelections)
{
if (d->highlightedRow!=-1) {
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index 92f53c60..f009bd43 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -179,7 +179,7 @@ void KexiGradientWidget::rebuildCache( void ) {
Get the part of the tempPixmap that is
under the current child-widget.
*/
- if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
+ if ( childWidget->parent() == this ) {
area = childWidget->geometry();
} else {
area.setTopLeft( childWidget->mapTo( this,
@@ -222,7 +222,7 @@ bool KexiGradientWidget::eventFilter( TQObject* object, TQEvent* event ) {
/**
Manage list of child-widgets.
*/
- if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(this) ) {
+ if ( object == this ) {
if ( event->type() == TQEvent::ChildInserted ) {
child = dynamic_cast<TQWidget*>( dynamic_cast<TQChildEvent*>( event )->child() );
if ( isValidChildWidget( TQT_TQOBJECT(child) ) == false ) {
@@ -329,7 +329,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
Get the part of the tempPixmap that is
under the current child-widget.
*/
- if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
+ if ( childWidget->parent() == this ) {
area = childWidget->geometry();
} else {
area.setTopLeft( childWidget->mapTo( this,
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 6579fc42..2c4ef8cf 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -192,7 +192,7 @@ void KexiRecordNavigator::setEnabled( bool set )
bool KexiRecordNavigator::eventFilter( TQObject *o, TQEvent *e )
{
- if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_navRecordNumber)) {
+ if (o==m_navRecordNumber) {
bool recordEntered = false;
bool ret;
if (e->type()==TQEvent::KeyPress) {