diff options
Diffstat (limited to 'kexi/widget')
19 files changed, 58 insertions, 58 deletions
diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui index fc488852..6dd4fbf8 100644 --- a/kexi/widget/kexidbconnectionwidgetbase.ui +++ b/kexi/widget/kexidbconnectionwidgetbase.ui @@ -449,7 +449,7 @@ <tabstop>titleEdit</tabstop> <tabstop>frmEngine</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui index 6c173b42..f1f161de 100644 --- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui +++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui @@ -185,7 +185,7 @@ <Q_SLOTS> <slot access="protected">slotCBToggled( bool on )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kexi/widget/kexiprjtypeselectorbase.ui b/kexi/widget/kexiprjtypeselectorbase.ui index 069a89b0..059bf080 100644 --- a/kexi/widget/kexiprjtypeselectorbase.ui +++ b/kexi/widget/kexiprjtypeselectorbase.ui @@ -158,5 +158,5 @@ <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index fbcf91de..f5bc4d9e 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -112,14 +112,14 @@ PixmapCollection::tqcontains(const TQString &name) } void -PixmapCollection::save(TQDomNode tqparentNode) +PixmapCollection::save(TQDomNode parentNode) { if(m_pixmaps.isEmpty()) return; - TQDomDocument domDoc = tqparentNode.ownerDocument(); + TQDomDocument domDoc = parentNode.ownerDocument(); TQDomElement collection = domDoc.createElement("collection"); - tqparentNode.appendChild(collection); + parentNode.appendChild(collection); PixmapMap::ConstIterator it; PixmapMap::ConstIterator endIt = m_pixmaps.constEnd(); @@ -282,7 +282,7 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW void PixmapCollectionEditor::newItemByName() { - LoadIconDialog d(tqparentWidget()); + LoadIconDialog d(parentWidget()); if(d.exec()== TQDialog::Accepted) { if(d.iconName().isEmpty()) @@ -296,7 +296,7 @@ PixmapCollectionEditor::newItemByName() void PixmapCollectionEditor::newItemByPath() { - KURL url = KFileDialog::getImageOpenURL("::kexi", tqparentWidget()); + KURL url = KFileDialog::getImageOpenURL("::kexi", parentWidget()); if(url.isEmpty()) return; TQString name = m_collection->addPixmapPath(url); @@ -310,7 +310,7 @@ PixmapCollectionEditor::removeItem() if( !item ) return; - int confirm = KMessageBox::questionYesNo(tqparentWidget(), TQString("<qt>")+ + int confirm = KMessageBox::questionYesNo(parentWidget(), TQString("<qt>")+ i18n("Do you want to remove item \"%1\" from collection \"%2\"?") .tqarg(item->text()).tqarg(m_collection->collectionName()) + "</qt>"); if(confirm == KMessageBox::No) @@ -427,7 +427,7 @@ PixmapCollectionChooser::getPixmap(const TQString &name) void PixmapCollectionChooser::slotUser1() { - PixmapCollectionEditor dialog(m_collection, tqparentWidget()); + PixmapCollectionEditor dialog(m_collection, parentWidget()); dialog.exec(); m_iconView->clear(); diff --git a/kexi/widget/pixmapcollection.h b/kexi/widget/pixmapcollection.h index 53637e28..caf11fd5 100644 --- a/kexi/widget/pixmapcollection.h +++ b/kexi/widget/pixmapcollection.h @@ -56,7 +56,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject bool tqcontains(const TQString &name); TQPixmap getPixmap(const TQString &name); - void save(TQDomNode tqparentNode); + void save(TQDomNode parentNode); void load(TQDomNode node); TQString collectionName() {return m_name; } diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index ae35334b..2be89bb0 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -81,7 +81,7 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name) this, TQT_SLOT(openSelectedTableQuery()), 0/*tqparent->actionCollection()*/, "relationsview_openSelectedTableQuery"); #endif -// tqinvalidateActions(); +// invalidateActions(); #if 0 @@ -91,7 +91,7 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name) m_removeSelectedTableQueryAction->plug( m_popup ); m_removeSelectedConnectionAction->plug( m_popup ); - tqinvalidateActions(); + invalidateActions(); #endif tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true); @@ -334,7 +334,7 @@ KexiRelationView::setReadOnly(bool b) { m_readOnly=b; //TODO -// tqinvalidateActions(); +// invalidateActions(); /* TableList::Iterator it, end( m_tables.end() ); for ( it=m_tables.begin(); it != end; ++it) { @@ -381,7 +381,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev) updateContents(cview->connectionRect()); m_selectedConnection = cview; emit connectionViewGotFocus(); -// tqinvalidateActions(); +// invalidateActions(); if(ev->button() == Qt::RightButton) {//show popup kdDebug() << "KexiRelationView::contentsMousePressEvent(): context" << endl; @@ -395,7 +395,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev) } //connection not found clearSelection(); -// tqinvalidateActions(); +// invalidateActions(); if(ev->button() == Qt::RightButton) {//show popup on view background area // TQPopupMenu m; // m_removeSelectedConnectionAction->plug( &m ); @@ -415,13 +415,13 @@ void KexiRelationView::clearSelection() m_focusedTableView->unsetFocus(); m_focusedTableView = 0; // setFocus(); -// tqinvalidateActions(); +// invalidateActions(); } if (m_selectedConnection) { m_selectedConnection->setSelected(false); updateContents(m_selectedConnection->connectionRect()); m_selectedConnection = 0; -// tqinvalidateActions(); +// invalidateActions(); } } @@ -516,7 +516,7 @@ KexiRelationView::removeSelectedObject() #endif delete m_selectedConnection; m_selectedConnection = 0; -// tqinvalidateActions(); +// invalidateActions(); } else if (m_focusedTableView) { KexiRelationViewTableContainer *tmp = m_focusedTableView; @@ -580,7 +580,7 @@ void KexiRelationView::slotTableViewGotFocus() // if (m_focusedTableView) // m_focusedTableView->unsetFocus(); m_focusedTableView = (KexiRelationViewTableContainer*)sender(); -// tqinvalidateActions(); +// invalidateActions(); emit tableViewGotFocus(); } @@ -614,12 +614,12 @@ void KexiRelationView::tableHeaderContextMenuRequest(const TQPoint& pos) if (m_focusedTableView != sender()) return; kdDebug() << "HEADER CTXT MENU!" <<endl; - tqinvalidateActions(); + invalidateActions(); m_tableQueryPopup->exec(pos); } //! Invalidates all actions availability -void KexiRelationView::tqinvalidateActions() +void KexiRelationView::invalidateActions() { setAvailable("edit_delete", m_selectedConnection || m_focusedTableView); } diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h index b5d1785d..dcf78834 100644 --- a/kexi/widget/relations/kexirelationview.h +++ b/kexi/widget/relations/kexirelationview.h @@ -151,7 +151,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView void recalculateSize(int width, int height); void stretchExpandSize(); -// void tqinvalidateActions(); +// void invalidateActions(); // void clearTableSelection(); // void clearConnSelection(); diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index c850d722..2145cf20 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -214,7 +214,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev) diffY=TQT_TQMOUSEEVENT(ev)->globalPos().y()-m_grabY; if ((abs(diffX)>2) || (abs(diffY)>2)) { - TQPoint newPos=tqparentWidget()->pos()+TQPoint(diffX,diffY); + TQPoint newPos=parentWidget()->pos()+TQPoint(diffX,diffY); //correct the x position if (newPos.x()<0) { m_offsetX+=newPos.x(); @@ -244,7 +244,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev) } //move and update helpers - tqparentWidget()->move(newPos); + parentWidget()->move(newPos); m_grabX=TQT_TQMOUSEEVENT(ev)->globalPos().x(); m_grabY=TQT_TQMOUSEEVENT(ev)->globalPos().y(); // kdDebug()<<"HEADER:emitting moved"<<endl; @@ -258,7 +258,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev) void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) { kdDebug()<<"KexiRelationViewTableContainerHeader::Mouse Press Event"<<endl; - tqparentWidget()->setFocus(); + parentWidget()->setFocus(); ev->accept(); if (ev->button()==Qt::LeftButton) { m_dragging=true; @@ -270,7 +270,7 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) { return; } if (ev->button()==Qt::RightButton) { - emit static_cast<KexiRelationViewTableContainer*>(tqparentWidget()) + emit static_cast<KexiRelationViewTableContainer*>(parentWidget()) ->contextMenuRequest(ev->globalPos()); } // TQLabel::mousePressEvent(ev); @@ -410,11 +410,11 @@ KexiRelationViewTable::slotContentsMoving(int,int) void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev) { - tqparentWidget()->setFocus(); + parentWidget()->setFocus(); setFocus(); KListView::contentsMousePressEvent(ev); // if (ev->button()==Qt::RightButton) -// static_cast<KexiRelationView*>(tqparentWidget())->executePopup(ev->pos()); +// static_cast<KexiRelationView*>(parentWidget())->executePopup(ev->pos()); } TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item) diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index 7ef5a961..e48a5d00 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -129,7 +129,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, TQTimer::singleShot(100,this,TQT_SLOT(slotAddTable())); #endif - tqinvalidateActions(); + invalidateActions(); } KexiRelationWidget::~KexiRelationWidget() @@ -228,39 +228,39 @@ void KexiRelationWidget::tableViewGotFocus() // if (m_focusedTableView) // m_focusedTableView->unsetFocus(); // m_focusedTableView = (KexiRelationViewTableContainer*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); - tqinvalidateActions(); + invalidateActions(); } void KexiRelationWidget::connectionViewGotFocus() { - tqinvalidateActions(); + invalidateActions(); } void KexiRelationWidget::emptyAreaGotFocus() { - tqinvalidateActions(); + invalidateActions(); } void KexiRelationWidget::tableContextMenuRequest(const TQPoint& pos) { - tqinvalidateActions(); + invalidateActions(); executePopup( pos ); } void KexiRelationWidget::connectionContextMenuRequest(const TQPoint& pos) { - tqinvalidateActions(); + invalidateActions(); executePopup( pos ); // m_connectionPopup->exec(pos); } void KexiRelationWidget::emptyAreaContextMenuRequest( const TQPoint& /*pos*/ ) { - tqinvalidateActions(); + invalidateActions(); //TODO } -void KexiRelationWidget::tqinvalidateActions() +void KexiRelationWidget::invalidateActions() { setAvailable("edit_delete", m_relationView->selectedConnection() || m_relationView->focusedTableView()); } diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h index 869dbf11..20a70174 100644 --- a/kexi/widget/relations/kexirelationwidget.h +++ b/kexi/widget/relations/kexirelationwidget.h @@ -115,7 +115,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase void executePopup( TQPoint pos = TQPoint(-1,-1) ); //! Invalidates all actions availability. - void tqinvalidateActions(); + void invalidateActions(); //! Fills table's combo box with all available table names. void fillTablesCombo(); diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 4352c260..dbf95ad6 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -88,7 +88,7 @@ KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqpa // m_proc = 0; // m_content = 0; m_hasFocusableWidget = false; - d->button = new KexiDropDownButton( tqparentWidget() /*usually a viewport*/ ); + d->button = new KexiDropDownButton( parentWidget() /*usually a viewport*/ ); d->button->hide(); TQToolTip::add(d->button, i18n("Click to show available actions for this cell")); diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp index 19cf0b99..89ba63cf 100644 --- a/kexi/widget/tableview/kexicomboboxbase.cpp +++ b/kexi/widget/tableview/kexicomboboxbase.cpp @@ -482,7 +482,7 @@ void KexiComboBoxBase::slotItemSelected(KexiTableItem*) if (valueToSet.toString().isEmpty() && !m_insideCreatePopup) { clear(); TQWidget* thisWidget = dynamic_cast<TQWidget*>(this); - thisWidget->tqparentWidget()->setFocus(); + thisWidget->parentWidget()->setFocus(); return; } } diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp index 65edd806..4fe8b940 100644 --- a/kexi/widget/tableview/kexicomboboxpopup.cpp +++ b/kexi/widget/tableview/kexicomboboxpopup.cpp @@ -298,9 +298,9 @@ void KexiComboBoxPopup::updateSize(int minWidth) d->tv->adjustColumnWidthToContents(-1); - KexiTableEdit *te = dynamic_cast<KexiTableEdit*>(tqparentWidget()); + KexiTableEdit *te = dynamic_cast<KexiTableEdit*>(parentWidget()); const int width = TQMAX( d->tv->tableSize().width(), - (te ? te->totalSize().width() : (tqparentWidget()?tqparentWidget()->width():0/*sanity*/)) ); + (te ? te->totalSize().width() : (parentWidget()?parentWidget()->width():0/*sanity*/)) ); kexidbg << "KexiComboBoxPopup::updateSize(): size=" << size() << endl; resize( TQMAX(minWidth, width)/*+(d->tv->columns()>1?2:0)*/ /*(d->updateSizeCalled?0:1)*/, d->tv->rowHeight() * rows +2 ); kexidbg << "KexiComboBoxPopup::updateSize(): size after=" << size() << endl; diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index ba61e305..4695dbf8 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -68,7 +68,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg { setName("KexiComboBoxTableEdit"); m_setVisibleValueOnSetValueInternal = true; - d->button = new KexiComboBoxDropDownButton( tqparentWidget() /*usually a viewport*/ ); + d->button = new KexiComboBoxDropDownButton( parentWidget() /*usually a viewport*/ ); d->button->hide(); d->button->setFocusPolicy( TQ_NoFocus ); connect(d->button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonClicked())); diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 799a1a8b..9fc319ff 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -128,7 +128,7 @@ KexiTableViewCellToolTip::KexiTableViewCellToolTip( KexiTableView * tableView ) KexiTableViewCellToolTip::~KexiTableViewCellToolTip() { - remove(tqparentWidget()); + remove(parentWidget()); } void KexiTableViewCellToolTip::maybeTip( const TQPoint & p ) @@ -718,8 +718,8 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro int x2 = w - 1; int y2 = h - 1; -/* if (0==qstrcmp("KexiComboBoxPopup",tqparentWidget()->className())) { - kexidbg << tqparentWidget()->className() << " >>>>>> KexiTableView::paintCell(col=" << col <<"row="<<row<<") w="<<w<<endl; +/* if (0==qstrcmp("KexiComboBoxPopup",parentWidget()->className())) { + kexidbg << parentWidget()->className() << " >>>>>> KexiTableView::paintCell(col=" << col <<"row="<<row<<") w="<<w<<endl; }*/ // Draw our lines @@ -923,7 +923,7 @@ TQPoint KexiTableView::viewportToContents2( const TQPoint& vp ) void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch ) { -// qDebug("%s: paintEmptyArea(x:%d y:%d w:%d h:%d)", (const char*)tqparentWidget()->caption(),cx,cy,cw,ch); +// qDebug("%s: paintEmptyArea(x:%d y:%d w:%d h:%d)", (const char*)parentWidget()->caption(),cx,cy,cw,ch); // Regions work with shorts, so avoid an overflow and adjust the // table size to the visible size diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h index 56241fcb..b22d619d 100644 --- a/kexi/widget/tableview/kexitableviewdata.h +++ b/kexi/widget/tableview/kexitableviewdata.h @@ -285,7 +285,7 @@ public: inline bool isDBAware() { return m_cursor; } /*! For db-aware data set only: table name is returned; - equivalent to cursor()->query()->tqparentTable()->name(). */ + equivalent to cursor()->query()->parentTable()->name(). */ TQString dbTableName() const; inline KexiDB::Cursor* cursor() const { return m_cursor; } diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp index 05212dd1..f6a839e3 100644 --- a/kexi/widget/tableview/kexitableviewheader.cpp +++ b/kexi/widget/tableview/kexitableviewheader.cpp @@ -31,8 +31,8 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy { public: - KexiTableViewHeaderStyle(TQStyle *tqparentStyle, TQWidget *widget) - : KexiUtils::StyleProxy(tqparentStyle) + KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget) + : KexiUtils::StyleProxy(parentStyle) { setBackgroundColor( widget->tqpalette().active().background() ); } diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp index a805f5e3..2c6f86aa 100644 --- a/kexi/widget/utils/kexiarrowtip.cpp +++ b/kexi/widget/utils/kexiarrowtip.cpp @@ -50,13 +50,13 @@ KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* tqparent) setAutoMask( false ); //generate tqmask - TQPixmap tqmaskPm(size()); - tqmaskPm.fill( black ); - TQPainter tqmaskPainter(&tqmaskPm); - drawFrame(tqmaskPainter); - TQImage tqmaskImg( tqmaskPm.convertToImage() ); + TQPixmap maskPm(size()); + maskPm.fill( black ); + TQPainter maskPainter(&maskPm); + drawFrame(maskPainter); + TQImage maskImg( maskPm.convertToImage() ); TQBitmap bm; - bm = tqmaskImg.createHeuristicMask(); + bm = maskImg.createHeuristicMask(); setMask( bm ); } diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp index d7150c6b..e5f98aee 100644 --- a/kexi/widget/utils/kexiflowlayout.cpp +++ b/kexi/widget/utils/kexiflowlayout.cpp @@ -244,7 +244,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) } // kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl; - TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child tqlayouts) + TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) if ((x + oSizeHint.width()) > r.right() && h > 0) { // do the tqlayout of current line TQPtrListIterator<TQLayoutItem> it2(currentLine); @@ -360,7 +360,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) continue; } - TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child tqlayouts) + TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) if (y + oSizeHint.height() > r.bottom() && w > 0) { // do the tqlayout of current line TQPtrListIterator<TQLayoutItem> it2(currentLine); |