diff options
Diffstat (limited to 'kexi/widget')
| -rw-r--r-- | kexi/widget/kexibrowser.cpp | 40 | ||||
| -rw-r--r-- | kexi/widget/kexicustompropertyfactory_p.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/kexidataawareview.cpp | 56 | ||||
| -rw-r--r-- | kexi/widget/kexieditor.cpp | 4 | ||||
| -rw-r--r-- | kexi/widget/kexifieldcombobox.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/kexisectionheader.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/relations/kexirelationwidget.cpp | 30 | ||||
| -rw-r--r-- | kexi/widget/tableview/kexitableview.cpp | 10 | ||||
| -rw-r--r-- | kexi/widget/utils/kexicontextmenuutils.cpp | 12 | ||||
| -rw-r--r-- | kexi/widget/utils/kexigradientwidget.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/utils/kexirecordnavigator.cpp | 2 |
11 files changed, 81 insertions, 81 deletions
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index dd0b16a15..6a17bc94b 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -101,10 +101,10 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_list->sort(); m_list->setAllColumnsShowFocus(true); m_list->setTooltipColumn(0); - m_list->renameLineEdit()->setValidator( new KexiUtils::IdentifierValidator(TQT_TQOBJECT(this)) ); + m_list->renameLineEdit()->setValidator( new KexiUtils::IdentifierValidator(this) ); m_list->setResizeMode(TQListView::LastColumn); connect(m_list, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); @@ -123,8 +123,8 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } // actions - m_openAction = new TDEAction(i18n("&Open"), "document-open", 0/*TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), - TQT_SLOT(slotOpenObject()), TQT_TQOBJECT(this), "open_object"); + m_openAction = new TDEAction(i18n("&Open"), "document-open", 0/*TQt::Key_Enter conflict!*/, this, + TQT_SLOT(slotOpenObject()), this, "open_object"); m_openAction->setToolTip(i18n("Open object")); m_openAction->setWhatsThis(i18n("Opens object selected in the list")); @@ -146,20 +146,20 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } else { m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", 0/*TQt::Key_Delete*/, - TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), m_actions, "edit_delete"); + this, TQT_SLOT(slotRemove()), m_actions, "edit_delete"); //! @todo 1.1: just add "Delete" tooltip and what's this m_deleteAction->setToolTip(i18n("&Delete").replace("&","")); m_renameAction = new TDEAction(i18n("&Rename"), "", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRename()), m_actions, "edit_rename"); + this, TQT_SLOT(slotRename()), m_actions, "edit_rename"); #ifdef KEXI_SHOW_UNIMPLEMENTED //todo plugSharedAction("edit_cut",TQT_SLOT(slotCut())); //todo plugSharedAction("edit_copy",TQT_SLOT(slotCopy())); //todo plugSharedAction("edit_paste",TQT_SLOT(slotPaste())); #endif - m_designAction = new TDEAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), - TQT_SLOT(slotDesignObject()), TQT_TQOBJECT(this), "design_object"); + m_designAction = new TDEAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, this, + TQT_SLOT(slotDesignObject()), this, "design_object"); m_designAction->setToolTip(i18n("Design object")); m_designAction->setWhatsThis(i18n("Starts designing of the object selected in the list")); if (m_features & Toolbar) { @@ -167,21 +167,21 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features buttons_flyr->add(btn); } - m_editTextAction = new TDEAction(i18n("Open in &Text View"), "", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEditTextObject()), TQT_TQOBJECT(this), "editText_object"); + m_editTextAction = new TDEAction(i18n("Open in &Text View"), "", 0, this, + TQT_SLOT(slotEditTextObject()), this, "editText_object"); m_editTextAction->setToolTip(i18n("Open object in text view")); m_editTextAction->setWhatsThis(i18n("Opens selected object in the list in text view")); - m_newObjectAction = new TDEAction("", "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewObject()), TQT_TQOBJECT(this), "new_object"); + m_newObjectAction = new TDEAction("", "document-new", 0, this, TQT_SLOT(slotNewObject()), this, "new_object"); if (m_features & Toolbar) { m_newObjectToolButton = new KexiSmallToolButton(this, "", TQIconSet(), "new_object"); m_newObjectPopup = new TDEPopupMenu(this, "newObjectPopup"); - connect(m_newObjectPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotNewObjectPopupAboutToShow())); + connect(m_newObjectPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotNewObjectPopupAboutToShow())); // KexiPart::Part* part = Kexi::partManager().part("kexi/table"); // m_newObjectPopup->insertItem( SmallIconSet(part->info()->createItemIcon()), part->instanceName() ); m_newObjectToolButton->setPopup(m_newObjectPopup); m_newObjectToolButton->setPopupDelay(TQApplication::startDragTime()); - connect(m_newObjectToolButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotNewObject())); + connect(m_newObjectToolButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewObject())); buttons_flyr->add(m_newObjectToolButton); m_deleteObjectToolButton = new KexiSmallToolButton(this, m_deleteAction); @@ -190,22 +190,22 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } } - m_executeAction = new TDEAction(i18n("Execute"), "media-playback-start", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotExecuteObject()), TQT_TQOBJECT(this), "data_execute"); + m_executeAction = new TDEAction(i18n("Execute"), "media-playback-start", 0, this, + TQT_SLOT(slotExecuteObject()), this, "data_execute"); m_exportActionMenu = new TDEActionMenu(i18n("Export")); m_dataExportAction = new TDEAction(i18n("Export->To File as Data &Table... ", "To &File as Data Table..."), - "table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportAsDataTable()), TQT_TQOBJECT(this), "exportAsDataTable"); + "table", 0, this, TQT_SLOT(slotExportAsDataTable()), this, "exportAsDataTable"); m_dataExportAction->setWhatsThis( i18n("Exports data from the currently selected table or query data to a file.")); m_exportActionMenu->insert( m_dataExportAction ); - m_printAction = new TDEAction(i18n("&Print..."), "document-print", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotPrintItem()), TQT_TQOBJECT(this), "printItem"); + m_printAction = new TDEAction(i18n("&Print..."), "document-print", 0, this, + TQT_SLOT(slotPrintItem()), this, "printItem"); m_printAction->setWhatsThis( i18n("Prints data from the currently selected table or query.")); - m_pageSetupAction = new TDEAction(i18n("Page Setup..."), "", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotPageSetupForItem()), TQT_TQOBJECT(this), "pageSetupForItem"); + m_pageSetupAction = new TDEAction(i18n("Page Setup..."), "", 0, this, + TQT_SLOT(slotPageSetupForItem()), this, "pageSetupForItem"); m_pageSetupAction->setWhatsThis( i18n("Shows page setup for printing the active table or query.")); diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp index 2cdd0bfc0..5e5494618 100644 --- a/kexi/widget/kexicustompropertyfactory_p.cpp +++ b/kexi/widget/kexicustompropertyfactory_p.cpp @@ -83,7 +83,7 @@ KexiIdentifierPropertyEdit::KexiIdentifierPropertyEdit( : StringEdit(property, parent, name) { m_edit->setValidator( - new KexiUtils::IdentifierValidator(TQT_TQOBJECT(m_edit), "KexiIdentifierPropertyEdit Validator") ); + new KexiUtils::IdentifierValidator(m_edit, "KexiIdentifierPropertyEdit Validator") ); } KexiIdentifierPropertyEdit::~KexiIdentifierPropertyEdit() diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index 034b3f70f..6c61009bf 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -45,15 +45,15 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti setViewWidget(m_internalView, true); if (!noDataAware) { - m_dataAwareObject->connectCellSelectedSignal(TQT_TQOBJECT(this), TQT_SLOT(slotCellSelected(int,int))); + m_dataAwareObject->connectCellSelectedSignal(this, TQT_SLOT(slotCellSelected(int,int))); //! before closing - we'are accepting editing - connect(TQT_TQOBJECT(this), TQT_SIGNAL(closing(bool&)), TQT_TQOBJECT(this), TQT_SLOT(slotClosing(bool&))); + connect(this, TQT_SIGNAL(closing(bool&)), this, TQT_SLOT(slotClosing(bool&))); //! updating actions on start/stop editing - m_dataAwareObject->connectRowEditStartedSignal(TQT_TQOBJECT(this), TQT_SLOT(slotUpdateRowActions(int))); - m_dataAwareObject->connectRowEditTerminatedSignal(TQT_TQOBJECT(this), TQT_SLOT(slotUpdateRowActions(int))); - m_dataAwareObject->connectReloadActionsSignal(TQT_TQOBJECT(this), TQT_SLOT(reloadActions())); + m_dataAwareObject->connectRowEditStartedSignal(this, TQT_SLOT(slotUpdateRowActions(int))); + m_dataAwareObject->connectRowEditTerminatedSignal(this, TQT_SLOT(slotUpdateRowActions(int))); + m_dataAwareObject->connectReloadActionsSignal(this, TQT_SLOT(reloadActions())); } TQVBoxLayout *box = new TQVBoxLayout(this); @@ -72,37 +72,37 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti void KexiDataAwareView::initActions() { - plugSharedAction("edit_delete_row", TQT_TQOBJECT(this), TQT_SLOT(deleteCurrentRow())); + plugSharedAction("edit_delete_row", this, TQT_SLOT(deleteCurrentRow())); m_actionClient->plugSharedAction(sharedAction("edit_delete_row")); //for proper shortcut - plugSharedAction("edit_delete", TQT_TQOBJECT(this), TQT_SLOT(deleteAndStartEditCurrentCell())); + plugSharedAction("edit_delete", this, TQT_SLOT(deleteAndStartEditCurrentCell())); m_actionClient->plugSharedAction(sharedAction("edit_delete")); //for proper shortcut - plugSharedAction("edit_edititem", TQT_TQOBJECT(this), TQT_SLOT(startEditOrToggleValue())); + plugSharedAction("edit_edititem", this, TQT_SLOT(startEditOrToggleValue())); m_actionClient->plugSharedAction(sharedAction("edit_edititem")); //for proper shortcut - plugSharedAction("data_save_row", TQT_TQOBJECT(this), TQT_SLOT(acceptRowEdit())); + plugSharedAction("data_save_row", this, TQT_SLOT(acceptRowEdit())); m_actionClient->plugSharedAction(sharedAction("data_save_row")); //for proper shortcut - plugSharedAction("data_cancel_row_changes", TQT_TQOBJECT(this), TQT_SLOT(cancelRowEdit())); + plugSharedAction("data_cancel_row_changes", this, TQT_SLOT(cancelRowEdit())); m_actionClient->plugSharedAction(sharedAction("data_cancel_row_changes")); //for proper shortcut if (m_dataAwareObject->isSortingEnabled()) { - plugSharedAction("data_sort_az", TQT_TQOBJECT(this), TQT_SLOT(sortAscending())); - plugSharedAction("data_sort_za", TQT_TQOBJECT(this), TQT_SLOT(sortDescending())); + plugSharedAction("data_sort_az", this, TQT_SLOT(sortAscending())); + plugSharedAction("data_sort_za", this, TQT_SLOT(sortDescending())); } m_actionClient->plugSharedAction(sharedAction("edit_insert_empty_row")); //for proper shortcut setAvailable("data_sort_az", m_dataAwareObject->isSortingEnabled()); setAvailable("data_sort_za", m_dataAwareObject->isSortingEnabled()); -//! \todo plugSharedAction("data_filter", TQT_TQOBJECT(this), TQT_SLOT(???())); +//! \todo plugSharedAction("data_filter", this, TQT_SLOT(???())); - plugSharedAction("data_go_to_first_record", TQT_TQOBJECT(this), TQT_SLOT(slotGoToFirstRow())); - plugSharedAction("data_go_to_previous_record", TQT_TQOBJECT(this), TQT_SLOT(slotGoToPreviusRow())); - plugSharedAction("data_go_to_next_record", TQT_TQOBJECT(this), TQT_SLOT(slotGoToNextRow())); - plugSharedAction("data_go_to_last_record", TQT_TQOBJECT(this), TQT_SLOT(slotGoToLastRow())); - plugSharedAction("data_go_to_new_record", TQT_TQOBJECT(this), TQT_SLOT(slotGoToNewRow())); + plugSharedAction("data_go_to_first_record", this, TQT_SLOT(slotGoToFirstRow())); + plugSharedAction("data_go_to_previous_record", this, TQT_SLOT(slotGoToPreviusRow())); + plugSharedAction("data_go_to_next_record", this, TQT_SLOT(slotGoToNextRow())); + plugSharedAction("data_go_to_last_record", this, TQT_SLOT(slotGoToLastRow())); + plugSharedAction("data_go_to_new_record", this, TQT_SLOT(slotGoToNewRow())); //! \todo update availability setAvailable("data_go_to_first_record", true); @@ -111,25 +111,25 @@ void KexiDataAwareView::initActions() setAvailable("data_go_to_last_record", true); setAvailable("data_go_to_new_record", true); - plugSharedAction("edit_copy", TQT_TQOBJECT(this), TQT_SLOT(copySelection())); + plugSharedAction("edit_copy", this, TQT_SLOT(copySelection())); m_actionClient->plugSharedAction(sharedAction("edit_copy")); //for proper shortcut - plugSharedAction("edit_cut", TQT_TQOBJECT(this), TQT_SLOT(cutSelection())); + plugSharedAction("edit_cut", this, TQT_SLOT(cutSelection())); m_actionClient->plugSharedAction(sharedAction("edit_cut")); //for proper shortcut - plugSharedAction("edit_paste", TQT_TQOBJECT(this), TQT_SLOT(paste())); + plugSharedAction("edit_paste", this, TQT_SLOT(paste())); m_actionClient->plugSharedAction(sharedAction("edit_paste")); //for proper shortcut -// plugSharedAction("edit_find", TQT_TQOBJECT(this), TQT_SLOT(editFind())); +// plugSharedAction("edit_find", this, TQT_SLOT(editFind())); // m_actionClient->plugSharedAction(sharedAction("edit_find")); //for proper shortcut -// plugSharedAction("edit_findnext", TQT_TQOBJECT(this), TQT_SLOT(editFindNext())); +// plugSharedAction("edit_findnext", this, TQT_SLOT(editFindNext())); // m_actionClient->plugSharedAction(sharedAction("edit_findnext")); //for proper shortcut -// plugSharedAction("edit_findprevious", TQT_TQOBJECT(this), TQT_SLOT(editFindPrevious())); +// plugSharedAction("edit_findprevious", this, TQT_SLOT(editFindPrevious())); // m_actionClient->plugSharedAction(sharedAction("edit_findprev")); //for proper shortcut -//! @todo plugSharedAction("edit_replace", TQT_TQOBJECT(this), TQT_SLOT(editReplace())); +//! @todo plugSharedAction("edit_replace", this, TQT_SLOT(editReplace())); //! @todo m_actionClient->plugSharedAction(sharedAction("edit_replace")); //for proper shortcut // setAvailable("edit_find", true); @@ -188,7 +188,7 @@ void KexiDataAwareView::reloadActions() //warning FIXME Move this to the table part /* kdDebug()<<"INIT ACTIONS***********************************************************************"<<endl; - new TDEAction(i18n("Filter"), "filter", 0, TQT_TQOBJECT(this), TQT_SLOT(filter()), actionCollection(), "tablepart_filter"); + new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), actionCollection(), "tablepart_filter"); setXMLFile("kexidatatableui.rc"); */ m_dataAwareObject->contextMenu()->clear(); @@ -200,11 +200,11 @@ void KexiDataAwareView::reloadActions() bool separatorNeeded = true; unplugSharedAction("edit_clear_table"); - plugSharedAction("edit_clear_table", TQT_TQOBJECT(this), TQT_SLOT(deleteAllRows())); + plugSharedAction("edit_clear_table", this, TQT_SLOT(deleteAllRows())); if (m_dataAwareObject->isEmptyRowInsertingEnabled()) { unplugSharedAction("edit_insert_empty_row"); - plugSharedAction("edit_insert_empty_row", TQT_TQOBJECT(m_internalView), TQT_SLOT(insertEmptyRow())); + plugSharedAction("edit_insert_empty_row", m_internalView, TQT_SLOT(insertEmptyRow())); if (separatorNeeded) m_dataAwareObject->contextMenu()->insertSeparator(); plugSharedAction("edit_insert_empty_row", m_dataAwareObject->contextMenu()); diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 5df84c96c..010008824 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -102,7 +102,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na layout = new TQVBoxLayout(fr); layout->setMargin( 2 ); - d->doc = KTextEditor::EditorChooser::createDocument(TQT_TQOBJECT(fr)); + d->doc = KTextEditor::EditorChooser::createDocument(fr); if (!d->doc) return; d->view = d->doc->createView(fr, 0L); @@ -118,7 +118,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na connect(d->doc, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(textChanged())); #endif - KexiEditorSharedActionConnector c(this, TQT_TQOBJECT(d->view)); + KexiEditorSharedActionConnector c(this, d->view); d->view->installEventFilter(this); layout->addWidget(d->view); diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index ceb2aa41b..875425de1 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -243,7 +243,7 @@ void KexiFieldComboBox::focusOutEvent( TQFocusEvent *e ) { KComboBox::focusOutEvent( e ); // accept changes if the focus is moved - if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) //(a check needed because drop-down listbox also causes a focusout) + if (!KexiUtils::hasParent(this, focusWidget())) //(a check needed because drop-down listbox also causes a focusout) slotReturnPressed(currentText()); } diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 1176b793b..7ff39106b 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -104,7 +104,7 @@ bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e ) 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))) { +// if (KexiUtils::hasParent( this, o)) { // d->lbl->setPaletteBackgroundColor( e->type()==TQEvent::FocusIn ? red : blue); // } } diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index 94d813480..e3a2e8b2d 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -65,7 +65,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, m_btnAdd = new KPushButton(i18n("&Add"), this); hlyr->addWidget(m_btnAdd); hlyr->addStretch(1); - connect(m_btnAdd, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotAddTable())); + connect(m_btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddTable())); m_relationView = new KexiRelationView(this, "relation_view"); setViewWidget(m_relationView); @@ -75,19 +75,19 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, //actions m_tableQueryPopup = new TDEPopupMenu(this, "m_popup"); m_tableQueryPopupTitleID = m_tableQueryPopup->insertTitle(SmallIcon("table"), ""); - connect(m_tableQueryPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu())); + connect(m_tableQueryPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu())); m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup"); m_connectionPopupTitleID = m_connectionPopup->insertTitle(""); - connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu())); + connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu())); m_areaPopup = new TDEPopupMenu(this, "m_areaPopup"); m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("document-open"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(openSelectedTable()), TQT_TQOBJECT(this), "relationsview_openTable"); + this, TQT_SLOT(openSelectedTable()), this, "relationsview_openTable"); m_openSelectedTableAction->plug( m_tableQueryPopup ); m_designSelectedTableAction = new TDEAction(i18n("&Design Table"), SmallIcon("edit"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(designSelectedTable()), TQT_TQOBJECT(this), "relationsview_designTable"); + this, TQT_SLOT(designSelectedTable()), this, "relationsview_designTable"); m_designSelectedTableAction->plug( m_tableQueryPopup ); m_tableQueryPopup->insertSeparator(); @@ -95,24 +95,24 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, hide_action->setIconSet(TQIconSet()); plugSharedAction("edit_delete",m_connectionPopup); - plugSharedAction("edit_delete",TQT_TQOBJECT(this), TQT_SLOT(removeSelectedObject())); + plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject())); connect(m_relationView, TQT_SIGNAL(tableViewGotFocus()), - TQT_TQOBJECT(this), TQT_SLOT(tableViewGotFocus())); + this, TQT_SLOT(tableViewGotFocus())); connect(m_relationView, TQT_SIGNAL(connectionViewGotFocus()), - TQT_TQOBJECT(this), TQT_SLOT(connectionViewGotFocus())); + this, TQT_SLOT(connectionViewGotFocus())); connect(m_relationView, TQT_SIGNAL(emptyAreaGotFocus()), - TQT_TQOBJECT(this), TQT_SLOT(emptyAreaGotFocus())); + this, TQT_SLOT(emptyAreaGotFocus())); connect(m_relationView, TQT_SIGNAL(tableContextMenuRequest( const TQPoint& )), - TQT_TQOBJECT(this), TQT_SLOT(tableContextMenuRequest( const TQPoint& ))); + this, TQT_SLOT(tableContextMenuRequest( const TQPoint& ))); connect(m_relationView, TQT_SIGNAL(connectionContextMenuRequest( const TQPoint& )), - TQT_TQOBJECT(this), TQT_SLOT(connectionContextMenuRequest( const TQPoint& ))); + this, TQT_SLOT(connectionContextMenuRequest( const TQPoint& ))); connect(m_relationView, TQT_SIGNAL(tableHidden(KexiDB::TableSchema&)), - TQT_TQOBJECT(this), TQT_SLOT(slotTableHidden(KexiDB::TableSchema&))); + this, TQT_SLOT(slotTableHidden(KexiDB::TableSchema&))); connect(m_relationView, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), - TQT_TQOBJECT(this), TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*))); + this, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*))); connect(m_relationView, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), - TQT_TQOBJECT(this), TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*))); + this, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*))); #if 0 if(!embedd) @@ -172,7 +172,7 @@ KexiRelationWidget::addTable(KexiDB::TableSchema *t, const TQRect &rect) if (!c) return; connect(c->tableView(), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_TQOBJECT(this), TQT_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int))); + this, TQT_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int))); } const TQString tname = t->name().lower(); diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index dbb89f5db..11ff828d2 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -102,10 +102,10 @@ class KexiTableView::WhatsThis : public TQWhatsThis const int leftMargin = m_tv->verticalHeaderVisible() ? m_tv->verticalHeader()->width() : 0; //const int topMargin = m_tv->horizontalHeaderVisible() ? m_tv->d->pTopHeader->height() : 0; //const int bottomMargin = m_tv->d->appearance.navigatorEnabled ? m_tv->m_navPanel->height() : 0; - if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->childAt(pos)))) { + if (KexiUtils::hasParent(m_tv->verticalHeader(), m_tv->childAt(pos))) { return i18n("Contains a pointer to the currently selected row"); } - else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->childAt(pos)))) { + else if (KexiUtils::hasParent(m_tv->m_navPanel, m_tv->childAt(pos))) { return i18n("Row navigator"); // return TQWhatsThis::textFor(m_tv->m_navPanel, TQPoint( pos.x(), pos.y() - m_tv->height() + bottomMargin )); } @@ -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 || w!=viewport() && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast<TQObject*>(m_editor)), TQT_TQOBJECT(w)))) { + if (!w || w!=viewport() && w!=this && (!m_editor || !KexiUtils::hasParent(dynamic_cast<TQObject*>(m_editor), w))) { //don't process stranger's events e->ignore(); return; @@ -2478,8 +2478,8 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e ) } /* else if (e->type()==TQEvent::FocusOut && o->inherits("TQWidget")) { //hp==true if currently focused widget is a child of this table view - const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget()); - if (!hp && KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) { + const bool hp = KexiUtils::hasParent( o, focusWidget()); + if (!hp && KexiUtils::hasParent( this, o)) { //accept row editing if focus is moved to foreign widget //(not a child, like eg. editor) from one of our table view's children //or from table view itself diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index f52ff7d58..e127bea65 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -63,20 +63,20 @@ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent) insertTitle(TQString()); d->insertFromFileAction = new TDEAction(i18n("Insert From &File..."), SmallIconSet("document-open"), 0, - TQT_TQOBJECT(this), TQT_SLOT(insertFromFile()), &d->actionCollection, "insert"); + this, TQT_SLOT(insertFromFile()), &d->actionCollection, "insert"); d->insertFromFileAction->plug(this); - d->saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), &d->actionCollection); + d->saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), &d->actionCollection); // d->saveAsAction->setText(i18n("&Save &As...")); d->saveAsAction->plug(this); insertSeparator(); - d->cutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), &d->actionCollection); + d->cutAction = KStdAction::cut(this, TQT_SLOT(cut()), &d->actionCollection); d->cutAction->plug(this); - d->copyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), &d->actionCollection); + d->copyAction = KStdAction::copy(this, TQT_SLOT(copy()), &d->actionCollection); d->copyAction->plug(this); - d->pasteAction = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), &d->actionCollection); + d->pasteAction = KStdAction::paste(this, TQT_SLOT(paste()), &d->actionCollection); d->pasteAction->plug(this); d->deleteAction = new TDEAction(i18n("&Clear"), SmallIconSet("edit-delete"), 0, - TQT_TQOBJECT(this), TQT_SLOT(clear()), &d->actionCollection, "delete"); + this, TQT_SLOT(clear()), &d->actionCollection, "delete"); d->deleteAction->plug(this); #ifdef KEXI_NO_UNFINISHED d->propertiesAction = 0; diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp index f009bd435..4aa7341c1 100644 --- a/kexi/widget/utils/kexigradientwidget.cpp +++ b/kexi/widget/utils/kexigradientwidget.cpp @@ -225,7 +225,7 @@ bool KexiGradientWidget::eventFilter( TQObject* object, TQEvent* event ) { if ( object == this ) { if ( event->type() == TQEvent::ChildInserted ) { child = dynamic_cast<TQWidget*>( dynamic_cast<TQChildEvent*>( event )->child() ); - if ( isValidChildWidget( TQT_TQOBJECT(child) ) == false ) { + if ( isValidChildWidget( child ) == false ) { return false; } /** diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 334c605ab..5e3cfae8e 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -106,7 +106,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const m_navRecordNumber->setFocusPolicy(TQWidget::ClickFocus); m_navRecordNumber->installEventFilter(this); // m_navRowNumber->setFixedWidth(fw); - m_navRecordNumberValidator = new TQIntValidator(1, INT_MAX, TQT_TQOBJECT(this)); + m_navRecordNumberValidator = new TQIntValidator(1, INT_MAX, this); m_navRecordNumber->setValidator(m_navRecordNumberValidator); m_navRecordNumber->installEventFilter(this); TQToolTip::add(m_navRecordNumber, i18n("Current row number")); |