summaryrefslogtreecommitdiffstats
path: root/kexi/widget/relations
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/widget/relations')
-rw-r--r--kexi/widget/relations/kexirelationview.cpp14
-rw-r--r--kexi/widget/relations/kexirelationview.h2
-rw-r--r--kexi/widget/relations/kexirelationviewconnection.cpp4
-rw-r--r--kexi/widget/relations/kexirelationviewtable.cpp22
-rw-r--r--kexi/widget/relations/kexirelationviewtable.h2
-rw-r--r--kexi/widget/relations/kexirelationwidget.cpp6
-rw-r--r--kexi/widget/relations/kexirelationwidget.h2
7 files changed, 26 insertions, 26 deletions
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index 18c19ef9..378d2580 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -57,7 +57,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
// connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *)));
- viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
+ viewport()->setPaletteBackgroundColor(colorGroup().mid());
setFocusPolicy(TQ_WheelFocus);
setResizePolicy(Manual);
/*MOVED TO KexiRelationDialog
@@ -94,7 +94,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
invalidateActions();
#endif
- tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
+ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
}
KexiRelationView::~KexiRelationView()
@@ -146,13 +146,13 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
addChild(c, 100,100);
if (rect.isValid()) {//predefined size
- TQSize finalSize = c->size().expandedTo( c->tqsizeHint() );
+ TQSize finalSize = c->size().expandedTo( c->sizeHint() );
TQRect r = rect;
r.setSize( finalSize + TQSize(0,10) );
moveChild( c, rect.left(), rect.top() );
//we're doing this instead of setGeometry(rect)
//because the geomenty might be saved on other system with bigger fonts :)
- c->resize(c->tqsizeHint());
+ c->resize(c->sizeHint());
// c->setGeometry(r);
//TODO
@@ -164,7 +164,7 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
updateGeometry();
if (!rect.isValid()) {
c->updateGeometry();
- c->resize(c->tqsizeHint());
+ c->resize(c->sizeHint());
}
int x, y;
@@ -584,9 +584,9 @@ void KexiRelationView::slotTableViewGotFocus()
emit tableViewGotFocus();
}
-TQSize KexiRelationView::tqsizeHint() const
+TQSize KexiRelationView::sizeHint() const
{
- return TQSize(TQScrollView::tqsizeHint());//.width(), 600);
+ return TQSize(TQScrollView::sizeHint());//.width(), 600);
}
void KexiRelationView::clear()
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index 6bc31b31..404fbcbe 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -96,7 +96,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
inline KexiRelationViewTableContainer* focusedTableView() const { return m_focusedTableView; }
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
const ConnectionList* connections() const { return &m_connectionViews; }
diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp
index c0635c1b..ab3f1ac4 100644
--- a/kexi/widget/relations/kexirelationviewconnection.cpp
+++ b/kexi/widget/relations/kexirelationviewconnection.cpp
@@ -92,7 +92,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p)
pa.setPoint(0, rx - 4, ry - 3);
pa.setPoint(1, rx - 4, ry + 3);
pa.setPoint(2, rx - 1, ry);
- p->tqdrawPolygon(pa, true);
+ p->drawPolygon(pa, true);
//master side
p->drawLine(sx, sy - 1, sx + side1CharWidth -1, sy - 1);
@@ -134,7 +134,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p)
pa.setPoint(0, lx + 3, ry - 3);
pa.setPoint(1, lx + 3, ry + 3);
pa.setPoint(2, lx, ry);
- p->tqdrawPolygon(pa, true);
+ p->drawPolygon(pa, true);
// p->drawLine(lx, ry, lx + 8, ry);
// p->drawPoint(lx + 1, ry - 1);
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index 55440da4..ea1682f7 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -61,18 +61,18 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
m_tableHeader = new KexiRelationViewTableContainerHeader(schema->name(), this);
m_tableHeader->unsetFocus();
- m_tableHeader->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+ 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()));
m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable");
//m_tableHeader->setFocusProxy( m_tableView );
- m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+ m_tableView->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
- m_tableView->setMaximumSize( m_tableView->tqsizeHint() );
+ m_tableView->setMaximumSize( m_tableView->sizeHint() );
-// m_tableView->resize( m_tableView->tqsizeHint() );
+// 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(KListView*, TQListViewItem*, const TQPoint&)),
@@ -110,13 +110,13 @@ int KexiRelationViewTableContainer::globalY(const TQString &field)
}
#if 0//js
-TQSize KexiRelationViewTableContainer::tqsizeHint()
+TQSize KexiRelationViewTableContainer::sizeHint()
{
#ifdef TQ_WS_WIN
- TQSize s = m_tableView->tqsizeHint()
+ TQSize s = m_tableView->sizeHint()
+ TQSize( 2 * 5 , m_tableHeader->height() + 2 * 5 );
#else
- TQSize s = m_tableView->tqsizeHint();
+ TQSize s = m_tableView->sizeHint();
s.setWidth(s.width() + 4);
s.setHeight(m_tableHeader->height() + s.height());
#endif
@@ -307,7 +307,7 @@ KexiRelationViewTable::~KexiRelationViewTable()
{
}
-TQSize KexiRelationViewTable::tqsizeHint() const
+TQSize KexiRelationViewTable::sizeHint() const
{
TQFontMetrics fm(fontMetrics());
@@ -341,7 +341,7 @@ KexiRelationViewTable::globalY(const TQString &item)
TQListViewItem *i = findItem(item, 0);
if (!i)
return -1;
- int y = tqitemRect(i).y() + (tqitemRect(i).height() / 2);
+ int y = itemRect(i).y() + (itemRect(i).height() / 2);
if (contentsY() > itemPos(i))
y = 0;
else if (y == 0)
@@ -420,10 +420,10 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
{
if (painter) {
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, tqitemRect(item), tqcolorGroup(),
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
TQStyle::Style_FocusAtBorder);
}
- return tqitemRect(item);
+ return itemRect(item);
}
#include "kexirelationviewtable.moc"
diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h
index 5c622dad..6578cdd5 100644
--- a/kexi/widget/relations/kexirelationviewtable.h
+++ b/kexi/widget/relations/kexirelationviewtable.h
@@ -105,7 +105,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView
// KexiDB::TableSchema *table() const { return m_table; };
int globalY(const TQString &item);
// void setReadOnly(bool);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
signals:
void tableScrolling();
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 4b952163..4c5754b5 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -59,7 +59,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
m_tableCombo->setInsertionPolicy(TQComboBox::NoInsertion);
hlyr->addWidget(lbl);
hlyr->addWidget(m_tableCombo);
- m_tableCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred));
+ m_tableCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred));
fillTablesCombo();
m_btnAdd = new KPushButton(i18n("&Add"), this);
@@ -302,9 +302,9 @@ void KexiRelationWidget::designSelectedTable()
Kexi::DesignViewMode, openingCancelled);
}
-TQSize KexiRelationWidget::tqsizeHint() const
+TQSize KexiRelationWidget::sizeHint() const
{
- return m_relationView->tqsizeHint();
+ return m_relationView->sizeHint();
}
void KexiRelationWidget::slotTableHidden(KexiDB::TableSchema &table)
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 39ac549a..713ce8fc 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -60,7 +60,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
// void openTable(KexiDB::TableSchema* table, bool designMode);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
/*! Used to add newly created object information to the combo box. */
void objectCreated(const TQCString &mime, const TQCString& name);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 17:19:47 +0000