diff options
Diffstat (limited to 'kexi/widget/relations')
-rw-r--r-- | kexi/widget/relations/kexirelationview.cpp | 26 | ||||
-rw-r--r-- | kexi/widget/relations/kexirelationviewtable.cpp | 14 | ||||
-rw-r--r-- | kexi/widget/relations/kexirelationwidget.cpp | 52 |
3 files changed, 46 insertions, 46 deletions
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 81ce1382..150ab65f 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -55,7 +55,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) m_focusedTableView = 0; setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); -// connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *))); +// connect(relation, TQ_SIGNAL(relationListUpdated(TQObject *)), this, TQ_SLOT(slotListUpdate(TQObject *))); viewport()->setPaletteBackgroundColor(colorGroup().mid()); setFocusPolicy(TQWidget::WheelFocus); @@ -70,15 +70,15 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) plugSharedAction("edit_delete", i18n("Hide Table"), m_tableQueryPopup); plugSharedAction("edit_delete",m_connectionPopup); - plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject())); + plugSharedAction("edit_delete",this, TQ_SLOT(removeSelectedObject())); */ #if 0 m_removeSelectedTableQueryAction = new TDEAction(i18n("&Hide Selected Table/Query"), "edit-delete", "", - this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery"); + this, TQ_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery"); m_removeSelectedConnectionAction = new TDEAction(i18n("&Remove Selected Relationship"), "button_cancel", "", - this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection"); + this, TQ_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection"); m_openSelectedTableQueryAction = new TDEAction(i18n("&Open Selected Table/Query"), "", "", - this, TQT_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery"); + this, TQ_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery"); #endif // invalidateActions(); @@ -137,12 +137,12 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect) /*! @todo what about query? */ new KexiDB::TableOrQuerySchema(t) ); - connect(c, TQT_SIGNAL(endDrag()), this, TQT_SLOT(slotTableViewEndDrag())); - connect(c, TQT_SIGNAL(gotFocus()), this, TQT_SLOT(slotTableViewGotFocus())); -// connect(c, TQT_SIGNAL(headerContextMenuRequest(const TQPoint&)), -// this, TQT_SLOT(tableHeaderContextMenuRequest(const TQPoint&))); - connect(c, TQT_SIGNAL(contextMenuRequest(const TQPoint&)), - this, TQT_SIGNAL(tableContextMenuRequest(const TQPoint&))); + connect(c, TQ_SIGNAL(endDrag()), this, TQ_SLOT(slotTableViewEndDrag())); + connect(c, TQ_SIGNAL(gotFocus()), this, TQ_SLOT(slotTableViewGotFocus())); +// connect(c, TQ_SIGNAL(headerContextMenuRequest(const TQPoint&)), +// this, TQ_SLOT(tableHeaderContextMenuRequest(const TQPoint&))); + connect(c, TQ_SIGNAL(contextMenuRequest(const TQPoint&)), + this, TQ_SIGNAL(tableContextMenuRequest(const TQPoint&))); addChild(c, 100,100); if (rect.isValid()) {//predefined size @@ -195,8 +195,8 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect) m_tables.insert(t->name(), c); - connect(c, TQT_SIGNAL(moved(KexiRelationViewTableContainer *)), this, - TQT_SLOT(containerMoved(KexiRelationViewTableContainer *))); + connect(c, TQ_SIGNAL(moved(KexiRelationViewTableContainer *)), this, + TQ_SLOT(containerMoved(KexiRelationViewTableContainer *))); if (hasFocus()) //ok? c->setFocus(); diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 7053c778..7c28d463 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -63,8 +63,8 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer( m_tableHeader->unsetFocus(); m_tableHeader->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); lyr->addWidget(m_tableHeader); - connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved())); - connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag())); + connect(m_tableHeader,TQ_SIGNAL(moved()),this,TQ_SLOT(moved())); + connect(m_tableHeader, TQ_SIGNAL(endDrag()), this, TQ_SIGNAL(endDrag())); m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable"); //m_tableHeader->setFocusProxy( m_tableView ); @@ -74,9 +74,9 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer( // m_tableView->resize( m_tableView->sizeHint() ); lyr->addWidget(m_tableView, 0); - connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved())); - connect(m_tableView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(m_tableView, TQ_SIGNAL(tableScrolling()), this, TQ_SLOT(moved())); + connect(m_tableView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } KexiRelationViewTableContainer::~KexiRelationViewTableContainer() @@ -299,8 +299,8 @@ KexiRelationViewTable::KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOr setSchema(tableOrQuerySchema); header()->hide(); - connect(this, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), this, TQT_SLOT(slotDropped(TQDropEvent *))); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotContentsMoving(int,int))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), this, TQ_SLOT(slotDropped(TQDropEvent *))); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotContentsMoving(int,int))); } KexiRelationViewTable::~KexiRelationViewTable() diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index e3a2e8b2..2fbda78e 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()), this, TQT_SLOT(slotAddTable())); + connect(m_btnAdd, TQ_SIGNAL(clicked()), this, TQ_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()), this, TQT_SLOT(aboutToShowPopupMenu())); + connect(m_tableQueryPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowPopupMenu())); m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup"); m_connectionPopupTitleID = m_connectionPopup->insertTitle(""); - connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu())); + connect(m_connectionPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowPopupMenu())); m_areaPopup = new TDEPopupMenu(this, "m_areaPopup"); m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("document-open"), TDEShortcut(), - this, TQT_SLOT(openSelectedTable()), this, "relationsview_openTable"); + this, TQ_SLOT(openSelectedTable()), this, "relationsview_openTable"); m_openSelectedTableAction->plug( m_tableQueryPopup ); m_designSelectedTableAction = new TDEAction(i18n("&Design Table"), SmallIcon("edit"), TDEShortcut(), - this, TQT_SLOT(designSelectedTable()), this, "relationsview_designTable"); + this, TQ_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",this, TQT_SLOT(removeSelectedObject())); - - connect(m_relationView, TQT_SIGNAL(tableViewGotFocus()), - this, TQT_SLOT(tableViewGotFocus())); - connect(m_relationView, TQT_SIGNAL(connectionViewGotFocus()), - this, TQT_SLOT(connectionViewGotFocus())); - connect(m_relationView, TQT_SIGNAL(emptyAreaGotFocus()), - this, TQT_SLOT(emptyAreaGotFocus())); - connect(m_relationView, TQT_SIGNAL(tableContextMenuRequest( const TQPoint& )), - this, TQT_SLOT(tableContextMenuRequest( const TQPoint& ))); - connect(m_relationView, TQT_SIGNAL(connectionContextMenuRequest( const TQPoint& )), - this, TQT_SLOT(connectionContextMenuRequest( const TQPoint& ))); - connect(m_relationView, TQT_SIGNAL(tableHidden(KexiDB::TableSchema&)), - this, TQT_SLOT(slotTableHidden(KexiDB::TableSchema&))); - connect(m_relationView, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), - this, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*))); - connect(m_relationView, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), - this, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*))); + plugSharedAction("edit_delete",this, TQ_SLOT(removeSelectedObject())); + + connect(m_relationView, TQ_SIGNAL(tableViewGotFocus()), + this, TQ_SLOT(tableViewGotFocus())); + connect(m_relationView, TQ_SIGNAL(connectionViewGotFocus()), + this, TQ_SLOT(connectionViewGotFocus())); + connect(m_relationView, TQ_SIGNAL(emptyAreaGotFocus()), + this, TQ_SLOT(emptyAreaGotFocus())); + connect(m_relationView, TQ_SIGNAL(tableContextMenuRequest( const TQPoint& )), + this, TQ_SLOT(tableContextMenuRequest( const TQPoint& ))); + connect(m_relationView, TQ_SIGNAL(connectionContextMenuRequest( const TQPoint& )), + this, TQ_SLOT(connectionContextMenuRequest( const TQPoint& ))); + connect(m_relationView, TQ_SIGNAL(tableHidden(KexiDB::TableSchema&)), + this, TQ_SLOT(slotTableHidden(KexiDB::TableSchema&))); + connect(m_relationView, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), + this, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*))); + connect(m_relationView, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), + this, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*))); #if 0 if(!embedd) @@ -126,7 +126,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, #ifdef TESTING_KexiRelationWidget for (int i=0;i<(int)m_db->tableNames().count();i++) - TQTimer::singleShot(100,this,TQT_SLOT(slotAddTable())); + TQTimer::singleShot(100,this,TQ_SLOT(slotAddTable())); #endif invalidateActions(); @@ -171,8 +171,8 @@ KexiRelationWidget::addTable(KexiDB::TableSchema *t, const TQRect &rect) kdDebug() << "KexiRelationWidget::slotAddTable(): adding table " << t->name() << endl; if (!c) return; - connect(c->tableView(), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int))); + connect(c->tableView(), TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int))); } const TQString tname = t->name().lower(); |