summaryrefslogtreecommitdiffstats
path: root/kexi/widget/tableview
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/widget/tableview')
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexibooltableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexicomboboxpopup.cpp6
-rw-r--r--kexi/widget/tableview/kexicomboboxtableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexidataawareobjectiface.cpp4
-rw-r--r--kexi/widget/tableview/kexidataawarepropertyset.cpp4
-rw-r--r--kexi/widget/tableview/kexidataawarepropertyset.h2
-rw-r--r--kexi/widget/tableview/kexiinputtableedit.cpp6
-rw-r--r--kexi/widget/tableview/kexitableview.cpp100
-rw-r--r--kexi/widget/tableview/kexitableview.h4
-rw-r--r--kexi/widget/tableview/kexitableview_p.cpp2
-rw-r--r--kexi/widget/tableview/kexitableviewdata.cpp4
-rw-r--r--kexi/widget/tableview/kexitableviewheader.cpp2
13 files changed, 70 insertions, 70 deletions
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 7ad76c34..c818606d 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -559,7 +559,7 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
s = TQMIN( h-3, s );
s = TQMIN( w-3, s );//avoid too large box
TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s);
- p->setPen(TQPen(tqcolorGroup().text(), 1));
+ p->setPen(TQPen(colorGroup().text(), 1));
p->drawRect(r);
if (val.asBool()) {
p->drawLine(r.x(), r.y(), r.right(), r.bottom());
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index 8f199b5d..c0753269 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -105,7 +105,7 @@ void KexiBoolTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria
s = TQMIN( h-3, s );
s = TQMIN( w-3, s );//avoid too large box
TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s);
-//already set ouotside: p->setPen(TQPen(tqcolorGroup().text(), 1));
+//already set ouotside: p->setPen(TQPen(colorGroup().text(), 1));
p->drawRect(r);
if (val.isNull()) { // && !field()->isNotNull()) {
p->drawText( r, TQt::AlignCenter, "?" );
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 6a2feec8..9ecae92f 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -56,8 +56,8 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView
a.rowHighlightingEnabled = true;
a.rowMouseOverHighlightingEnabled = true;
a.persistentSelections = false;
- a.rowMouseOverHighlightingColor = tqcolorGroup().highlight();
- a.rowMouseOverHighlightingTextColor = tqcolorGroup().highlightedText();
+ a.rowMouseOverHighlightingColor = colorGroup().highlight();
+ a.rowMouseOverHighlightingTextColor = colorGroup().highlightedText();
a.rowHighlightingTextColor = a.rowMouseOverHighlightingTextColor;
a.gridEnabled = false;
setAppearance(a);
@@ -68,7 +68,7 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView
setContextMenuEnabled( false );
setScrollbarToolTipsEnabled( false );
installEventFilter(this);
- setBottomMarginInternal( - horizontalScrollBar()->tqsizeHint().height() );
+ setBottomMarginInternal( - horizontalScrollBar()->sizeHint().height() );
}
virtual void setData( KexiTableViewData *data, bool owner = true )
{ KexiTableView::setData( data, owner ); }
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 3ae97974..37ababa5 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -80,7 +80,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
// m_lineedit->setFrameStyle( TQFrame::Plain | TQFrame::Box );
// m_lineedit->setLineWidth( 1 );
// if (f.isNumericType()) {
-// m_lineedit->tqsetAlignment(AlignRight);
+// m_lineedit->setAlignment(AlignRight);
// }
// setView( m_lineedit );
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index 79613d9d..721cb2d8 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -84,7 +84,7 @@ KexiDataAwareObjectInterface::KexiDataAwareObjectInterface()
m_scrollBarTip->setPalette(TQToolTip::palette());
m_scrollBarTip->setMargin(2);
m_scrollBarTip->setIndent(0);
- m_scrollBarTip->tqsetAlignment(TQt::AlignCenter);
+ m_scrollBarTip->setAlignment(TQt::AlignCenter);
m_scrollBarTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
m_scrollBarTip->setLineWidth(1);
@@ -1950,7 +1950,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c
if (firstCharacter != -1 && firstCharacter != 0) { //we're not at 0-th char
firstCharacter = -1;
}
- else if (where.tqstartsWith(stringValue, caseSensitive)) {
+ else if (where.startsWith(stringValue, caseSensitive)) {
if (wholeWordsOnly) {
// If where.length() < stringValue.length(), true will be returned too - fine.
return !where.at( stringValue.length() ).isLetterOrNumber();
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 257cf0aa..dde99b31 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -92,10 +92,10 @@ uint KexiDataAwarePropertySet::size() const
return m_sets.size();
}
-void KexiDataAwarePropertySet::clear(uint tqminimumSize)
+void KexiDataAwarePropertySet::clear(uint minimumSize)
{
m_sets.clear();
- m_sets.resize(TQMAX(tqminimumSize, MAX_FIELDS));
+ m_sets.resize(TQMAX(minimumSize, MAX_FIELDS));
m_view->setDirty(true);
m_view->propertySetSwitched();
}
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h
index e24fbd8a..b2c66f96 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.h
+++ b/kexi/widget/tableview/kexidataawarepropertyset.h
@@ -97,7 +97,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject
public slots:
void removeCurrentPropertySet();
- void clear(uint tqminimumSize = 0);
+ void clear(uint minimumSize = 0);
/*! Inserts \a set property set at \a row position.
If there was a buffer at this position before, it will be destroyed.
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index 1b834fe9..36b662f9 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -47,7 +47,7 @@ class MyLineEdit : public KLineEdit
{}
protected:
virtual void drawFrame ( TQPainter * p ) {
- p->setPen( TQPen( tqcolorGroup().text() ) );
+ p->setPen( TQPen( colorGroup().text() ) );
TQRect r = rect();
p->moveTo( r.topLeft() );
p->lineTo( r.topRight() );
@@ -100,7 +100,7 @@ void KexiInputTableEdit::init()
m_lineedit = new MyLineEdit(this, "KexiInputTableEdit-KLineEdit");
setViewWidget(m_lineedit);
if (align_right)
- m_lineedit->tqsetAlignment(AlignRight);
+ m_lineedit->setAlignment(AlignRight);
// m_cview->setFrame(false);
// m_cview->setFrameStyle( TQFrame::Plain | TQFrame::Box );
// m_cview->setLineWidth( 1 );
@@ -222,7 +222,7 @@ TQString KexiInputTableEdit::valueToText(KexiDB::Field* field, const TQVariant&
void KexiInputTableEdit::paintEvent ( TQPaintEvent * /*e*/ )
{
TQPainter p(this);
- p.setPen( TQPen( tqcolorGroup().text() ) );
+ p.setPen( TQPen( colorGroup().text() ) );
p.drawRect( rect() );
}
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 4ed993cd..35ad2369 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->tqchildAt(pos)))) {
+ if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(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->tqchildAt(pos)))) {
+ else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->childAt(pos)))) {
return i18n("Row navigator");
// return TQWhatsThis::textFor(m_tv->m_navPanel, TQPoint( pos.x(), pos.y() - m_tv->height() + bottomMargin ));
}
@@ -204,8 +204,8 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
setBackgroundMode(TQt::PaletteBackground);
// setEmptyAreaColor(d->appearance.baseColor);//palette().active().color(TQColorGroup::Base));
-// d->baseColor = tqcolorGroup().base();
-// d->textColor = tqcolorGroup().text();
+// d->baseColor = colorGroup().base();
+// d->textColor = colorGroup().text();
// d->altColor = KGlobalSettings::alternateBackgroundColor();
// d->grayColor = TQColor(200,200,200);
@@ -253,8 +253,8 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
m_verticalHeader->setCurrentRow(-1);
setMargins(
- TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
- m_horizontalHeader->tqsizeHint().height(), 0, 0);
+ TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
+ m_horizontalHeader->sizeHint().height(), 0, 0);
setupNavigator();
@@ -288,7 +288,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
// horizontalScrollBar()->show();
updateScrollBars();
-// resize(tqsizeHint());
+// resize(sizeHint());
// updateContents();
// setMinimumHeight(horizontalScrollBar()->height() + d->rowHeight + topMargin());
@@ -333,7 +333,7 @@ void KexiTableView::setupNavigator()
m_navPanel = new KexiRecordNavigator(this, leftMargin(), "navPanel");
m_navPanel->setRecordHandler(this);
- m_navPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
+ m_navPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
}
void KexiTableView::initDataContents()
@@ -399,8 +399,8 @@ void KexiTableView::updateFonts(bool tqrepaint)
// if(d->rowHeight < 22)
// d->rowHeight = 22;
setMargins(
- TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
- m_horizontalHeader->tqsizeHint().height(), 0, 0);
+ TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
+ m_horizontalHeader->sizeHint().height(), 0, 0);
// setMargins(14, d->rowHeight, 0, 0);
m_verticalHeader->setCellHeight(d->rowHeight);
@@ -494,29 +494,29 @@ TQSizePolicy KexiTableView::sizePolicy() const
return TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
}
-TQSize KexiTableView::tqsizeHint() const
+TQSize KexiTableView::sizeHint() const
{
const TQSize &ts = tableSize();
- int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->tqsizeHint().width() + 2*2,
+ int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->sizeHint().width() + 2*2,
(m_navPanel->isVisible() ? m_navPanel->width() : 0) );
- int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(),
- tqminimumSizeHint().height() );
+ int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(),
+ minimumSizeHint().height() );
w = TQMIN( w, tqApp->desktop()->width()*3/4 ); //stretch
h = TQMIN( h, tqApp->desktop()->height()*3/4 ); //stretch
-// kexidbg << "KexiTableView::tqsizeHint()= " <<w <<", " <<h << endl;
+// kexidbg << "KexiTableView::sizeHint()= " <<w <<", " <<h << endl;
return TQSize(w, h);
/*TQSize(
TQMAX( ts.width() + leftMargin() + 2*2, (m_navPanel ? m_navPanel->width() : 0) ),
//+ TQMIN(m_verticalHeader->width(),d->rowHeight) + margin()*2,
- TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(),
- tqminimumSizeHint().height() )
+ TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(),
+ minimumSizeHint().height() )
);*/
-// TQMAX(ts.height() + topMargin(), tqminimumSizeHint().height()) );
+// TQMAX(ts.height() + topMargin(), minimumSizeHint().height()) );
}
-TQSize KexiTableView::tqminimumSizeHint() const
+TQSize KexiTableView::minimumSizeHint() const
{
return TQSize(
leftMargin() + ((columns()>0)?columnWidth(0):KEXI_DEFAULT_DATA_COLUMN_WIDTH) + 2*2,
@@ -658,7 +658,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch)
if(d->pBufferPm->isNull())
return;
TQPainter *pb = new TQPainter(d->pBufferPm, this);
-// pb->fillRect(0, 0, cw, ch, tqcolorGroup().base());
+// pb->fillRect(0, 0, cw, ch, colorGroup().base());
// int maxwc = TQMIN(cw, (columnPos(d->numCols - 1) + columnWidth(d->numCols - 1)));
int maxwc = columnPos(columns() - 1) + columnWidth(columns() - 1);
@@ -812,7 +812,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
&& usesSelectedTextColor)
{
- defaultPen = TQPen(tqcolorGroup().highlightedText()); //selected text
+ defaultPen = TQPen(colorGroup().highlightedText()); //selected text
}
else if (d->appearance.rowHighlightingEnabled && row == m_curRow
&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
@@ -849,7 +849,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
if (m_currentItem == item && (col == m_curCol || d->appearance.fullRowSelection)) {
if (edit && ((d->appearance.rowHighlightingEnabled && !d->appearance.fullRowSelection) || (row == m_curRow && d->highlightedRow==-1 && d->appearance.fullRowSelection))) //!dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted)
edit->paintSelectionBackground( p, isEnabled(), txt, align, x, y_offset, w, h,
- isEnabled() ? tqcolorGroup().highlight() : TQColor(200,200,200),//d->grayColor,
+ isEnabled() ? colorGroup().highlight() : TQColor(200,200,200),//d->grayColor,
p->fontMetrics(), columnReadOnly, d->appearance.fullRowSelection );
}
@@ -945,15 +945,15 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch
// Subtract the table from it
// reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts-TQSize(0,m_navPanel->isVisible() ? m_navPanel->height() : 0) ) );
reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts
- -TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->tqsizeHint().height())
- - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0)
+ -TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->sizeHint().height())
+ - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0)
+ (horizontalScrollBar()->isVisible() ? 0 :
d->internal_bottomMargin
-// horizontalScrollBar()->tqsizeHint().height()/2
+// horizontalScrollBar()->sizeHint().height()/2
)
-//- /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2
+//- /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2
+ contentsY()
-// - (verticalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0)
+// - (verticalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0)
)
) );
// reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts ) );
@@ -1261,7 +1261,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
const int k = e->key();
const bool ro = isReadOnly();
- TQWidget *w = tqfocusWidget();
+ 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)))) {
@@ -1636,10 +1636,10 @@ void KexiTableView::resizeEvent(TQResizeEvent *e)
/* m_navPanel->setGeometry(
frameWidth(),
viewport()->height() +d->pTopHeader->height()
- -(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height())
+ -(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height())
+frameWidth(),
- m_navPanel->tqsizeHint().width(), // - verticalScrollBar()->tqsizeHint().width() - horizontalScrollBar()->tqsizeHint().width(),
- horizontalScrollBar()->tqsizeHint().height()
+ m_navPanel->sizeHint().width(), // - verticalScrollBar()->sizeHint().width() - horizontalScrollBar()->sizeHint().width(),
+ horizontalScrollBar()->sizeHint().height()
);*/
// updateContents();
// m_navPanel->setGeometry(1,horizontalScrollBar()->pos().y(),
@@ -1923,42 +1923,42 @@ TQSize KexiTableView::tableSize() const
if ((rows()+ (isInsertingEnabled()?1:0) ) > 0 && columns() > 0) {
/* kexidbg << "tableSize()= " << columnPos( columns() - 1 ) + columnWidth( columns() - 1 )
<< ", " << rowPos( rows()-1+(isInsertingEnabled()?1:0)) + d->rowHeight
-// + TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->tqsizeHint().height())
- + (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 )
+// + TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->sizeHint().height())
+ + (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 )
+ margin() << endl;
*/
// kexidbg<< m_navPanel->isVisible() <<" "<<m_navPanel->height()<<" "
-// <<horizontalScrollBar()->tqsizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl;
+// <<horizontalScrollBar()->sizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl;
- //int xx = horizontalScrollBar()->tqsizeHint().height()/2;
+ //int xx = horizontalScrollBar()->sizeHint().height()/2;
TQSize s(
columnPos( columns() - 1 ) + columnWidth( columns() - 1 ),
-// + verticalScrollBar()->tqsizeHint().width(),
+// + verticalScrollBar()->sizeHint().width(),
rowPos( rows()-1+(isInsertingEnabled()?1:0) ) + d->rowHeight
- + (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height())
+ + (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height())
+ d->internal_bottomMargin
-// horizontalScrollBar()->tqsizeHint().height()/2
-// - /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2
+// horizontalScrollBar()->sizeHint().height()/2
+// - /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2
// + ( (m_navPanel && m_navPanel->isVisible() && verticalScrollBar()->isVisible()
// && !horizontalScrollBar()->isVisible())
- // ? horizontalScrollBar()->tqsizeHint().height() : 0)
+ // ? horizontalScrollBar()->sizeHint().height() : 0)
// + TQMAX( (m_navPanel && m_navPanel->isVisible()) ? m_navPanel->height() : 0,
-// horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() : 0)
+// horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() : 0)
// + (m_navPanel->isVisible()
-// ? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 )
+// ? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 )
-// - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() :0 )
+// - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() :0 )
+ margin()
//-2*d->rowHeight
);
// kexidbg << rows()-1 <<" "<< (isInsertingEnabled()?1:0) <<" "<< (m_rowEditing?1:0) << " " << s << endl;
return s;
-// +horizontalScrollBar()->tqsizeHint().height() + margin() );
+// +horizontalScrollBar()->sizeHint().height() + margin() );
}
return TQSize(0,0);
}
@@ -2271,13 +2271,13 @@ void KexiTableView::setVerticalHeaderVisible(bool set)
int left_width;
if (set) {
m_verticalHeader->show();
- left_width = TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight);
+ left_width = TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight);
}
else {
m_verticalHeader->hide();
left_width = 0;
}
- setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->tqsizeHint().height() : 0, 0, 0);
+ setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->sizeHint().height() : 0, 0, 0);
}
bool KexiTableView::horizontalHeaderVisible() const
@@ -2291,7 +2291,7 @@ void KexiTableView::setHorizontalHeaderVisible(bool set)
d->horizontalHeaderVisible = set; //needed because isVisible() is not always accurate
if (set) {
m_horizontalHeader->show();
- top_height = m_horizontalHeader->tqsizeHint().height();
+ top_height = m_horizontalHeader->sizeHint().height();
}
else {
m_horizontalHeader->hide();
@@ -2478,7 +2478,7 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e )
}
/* else if (e->type()==TQEvent::FocusOut && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
//hp==true if currently focused widget is a child of this table view
- const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), tqfocusWidget());
+ const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget());
if (!hp && KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) {
//accept row editing if focus is moved to foreign widget
//(not a child, like eg. editor) from one of our table view's tqchildren
@@ -2531,8 +2531,8 @@ void KexiTableView::setAppearance(const Appearance& a)
m_verticalHeader->setCellHeight(d->rowHeight);
if (m_horizontalHeader) {
setMargins(
- TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
- m_horizontalHeader->tqsizeHint().height(), 0, 0);
+ TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
+ m_horizontalHeader->sizeHint().height(), 0, 0);
}
// }
if (a.rowHighlightingEnabled)
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index 9cfcf47e..daabe0f9 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -223,8 +223,8 @@ public:
// reimplemented for internal reasons
virtual TQSizePolicy sizePolicy() const;
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
/*! Reimplemented to update cached fonts and row sizes for the painter. */
void setFont(const TQFont &f);
diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp
index d5e1641a..983378cb 100644
--- a/kexi/widget/tableview/kexitableview_p.cpp
+++ b/kexi/widget/tableview/kexitableview_p.cpp
@@ -48,7 +48,7 @@ KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t)
//moved scrollBarTipTimerCnt = 0;
//moved scrollBarTip = 0;
ensureCellVisibleOnShow = TQPoint(-1,-1);
- internal_bottomMargin = tv->horizontalScrollBar()->tqsizeHint().height()/2;
+ internal_bottomMargin = tv->horizontalScrollBar()->sizeHint().height()/2;
highlightedRow = -1;
moveCursorOnMouseRelease = false;
horizontalHeaderVisible = true;
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index 5905706b..ad670e3e 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -822,7 +822,7 @@ void KexiTableViewData::clearInternal()
removeLast();
#ifndef KEXI_NO_PROCESS_EVENTS
if (i % 1000 == 0)
- tqApp->tqprocessEvents( 1 );
+ tqApp->processEvents( 1 );
#endif
}
}
@@ -873,7 +873,7 @@ void KexiTableViewData::preloadAllRows()
m_cursor->moveNext();
#ifndef KEXI_NO_PROCESS_EVENTS
if ((i % 1000) == 0)
- tqApp->tqprocessEvents( 1 );
+ tqApp->processEvents( 1 );
#endif
}
}
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index 4a00be38..d217337b 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -126,7 +126,7 @@ bool KexiTableViewHeader::eventFilter(TQObject * watched, TQEvent * e)
TQString tip = m_toolTips[ section ];
if (tip.isEmpty()) { //try label
TQFontMetrics fm(font());
- int minWidth = fm.width( label( section ) ) + tqstyle().tqpixelMetric( TQStyle::PM_HeaderMargin );
+ int minWidth = fm.width( label( section ) ) + tqstyle().pixelMetric( TQStyle::PM_HeaderMargin );
TQIconSet *iset = iconSet( section );
if (iset)
minWidth += (2+iset->pixmap( TQIconSet::Small, TQIconSet::Normal ).width()); //taken from TQHeader::sectionSizeHint()
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 11:36:06 +0000