summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
Diffstat (limited to 'kexi')
-rw-r--r--kexi/kexiutils/styleproxy.h12
-rw-r--r--kexi/main/startup/KexiStartupFileDialog_win.cpp4
-rw-r--r--kexi/plugins/forms/widgets/kexidbcombobox.cpp4
-rw-r--r--kexi/plugins/forms/widgets/kexidbimagebox.cpp2
-rw-r--r--kexi/widget/kexismalltoolbutton.cpp2
-rw-r--r--kexi/widget/pixmapcollection.cpp6
-rw-r--r--kexi/widget/relations/kexirelationviewtable.cpp2
-rw-r--r--kexi/widget/utils/kexicomboboxdropdownbutton.cpp2
-rw-r--r--kexi/widget/utils/kexidropdownbutton.cpp2
-rw-r--r--kexi/widget/utils/kexirecordmarker.cpp2
10 files changed, 19 insertions, 19 deletions
diff --git a/kexi/kexiutils/styleproxy.h b/kexi/kexiutils/styleproxy.h
index a0d6792d..72ae565d 100644
--- a/kexi/kexiutils/styleproxy.h
+++ b/kexi/kexiutils/styleproxy.h
@@ -87,14 +87,14 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
m_style->drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, option );
}
- virtual void drawControl( TQ_ControlElement element,
+ virtual void drawControl( ControlElement element,
TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
m_style->drawControl( element, p, ceData, elementFlags, r, cg, how, option, widget );
}
- virtual void drawControlMask( TQ_ControlElement element,
+ virtual void drawControlMask( ControlElement element,
TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
@@ -106,7 +106,7 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
return m_style->subRect( r, ceData, elementFlags, widget );
}
- virtual void drawComplexControl( TQ_ComplexControl control,
+ virtual void drawComplexControl( ComplexControl control,
TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
const TQColorGroup &cg, SFlags how = Style_Default,
#ifdef TQ_TQDOC
@@ -119,21 +119,21 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
drawComplexControl( control, p, ceData, elementFlags, r, cg, how, sub, subActive, option, widget );
}
- virtual void drawComplexControlMask( TQ_ComplexControl control,
+ virtual void drawComplexControlMask( ComplexControl control,
TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
m_style->drawComplexControlMask( control, p, ceData, elementFlags, r, option, widget );
}
- virtual TQRect querySubControlMetrics( TQ_ComplexControl control,
+ virtual TQRect querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
return m_style->querySubControlMetrics( control, ceData, elementFlags, sc, option, widget );
}
- virtual SubControl querySubControl( TQ_ComplexControl control,
+ virtual SubControl querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index aac7b271..9708b037 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -105,11 +105,11 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
//TODO true );
//TODO d->completionLock = false;
-//TODO TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
+//TODO TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar );
//TODO toolbar = 0; //(js)
//(js) toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true);
//(js) toolbar->setFlat(true);
-//TODO tqInstallMsgHandler( oldHandler );
+//TODO qInstallMsgHandler( oldHandler );
//(js) d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true,
//(js) toolbar, "path combo" );
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index d9e33b9b..088d0a48 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -161,7 +161,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) );
TQRect r( TQStyle::visualRect( style().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget
- style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
+ style().drawPrimitive( TQStyle::PE_FocusRect, &p,
r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight()));
}
//todo
@@ -508,7 +508,7 @@ TQSize KexiDBComboBox::sizeHint() const
const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18;
const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2;
- d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
+ d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut()));
return d->sizeHint;
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index f205de05..4c23fead 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -685,7 +685,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
// if the widget is focused, draw focus indicator rect _if_ there is no chooser button
if (!m_designMode && !dataSource().isEmpty() && hasFocus() && (!m_chooser || !m_chooser->isVisible())) {
- style().tqdrawPrimitive(
+ style().drawPrimitive(
TQStyle::PE_FocusRect, &p, style().subRect(TQStyle::SR_PushButtonContents, this),
palette().active() );
}
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index bb3b0ec8..e7d5c6b9 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -124,7 +124,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter )
arrowFlags |= TQStyle::Style_Down;
if (isEnabled())
arrowFlags |= TQStyle::Style_Enabled;
- style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
+ style().drawPrimitive(TQStyle::PE_ArrowDown, _painter,
TQRect(width()-7, height()-7, 5, 5), colorGroup(),
arrowFlags, TQStyleOption() );
}
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 3ad9e556..9248916c 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -60,7 +60,7 @@ PixmapCollection::addPixmapPath(const KURL &url)
name += "2";
}
- m_pixmaps.insert(name, tqMakePair(url.path(), 0));
+ m_pixmaps.insert(name, qMakePair(url.path(), 0));
return name;
}
@@ -78,7 +78,7 @@ PixmapCollection::addPixmapName(const TQString &icon, int size)
name += "2";
}
- m_pixmaps.insert(name, tqMakePair(icon, size));
+ m_pixmaps.insert(name, qMakePair(icon, size));
return name;
}
@@ -144,7 +144,7 @@ PixmapCollection::load(TQDomNode node)
for(TQDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling())
{
TQDomElement el = n.toElement();
- TQPair<TQString, int> pair = tqMakePair(el.text(), el.attribute("size").toInt());
+ TQPair<TQString, int> pair = qMakePair(el.text(), el.attribute("size").toInt());
m_pixmaps[el.attribute("name")] = pair;
}
}
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index 2e18e00a..347805be 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -420,7 +420,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
{
if (painter) {
- style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
+ style().drawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
TQStyle::Style_FocusAtBorder);
}
return itemRect(item);
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index 319bf305..dd55920c 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -64,7 +64,7 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p)
}
else {
r.setWidth(r.width()+2);
- style().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
+ style().drawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
}
}
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index 68ba7deb..17501673 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -54,7 +54,7 @@ void KexiDropDownButton::drawButton( TQPainter *p )
arrowFlags |= TQStyle::Style_Down;
if (isEnabled())
arrowFlags |= TQStyle::Style_Enabled;
- style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
+ style().drawPrimitive(TQStyle::PE_ArrowDown, p,
TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index ff97d21a..4309cd7f 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -205,7 +205,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
int y = ((d->rowHeight * i)-d->offset);
TQRect r(0, y, width(), d->rowHeight);
p.drawRect(r);
- style().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
+ style().drawPrimitive( TQStyle::PE_HeaderSection, &p, r,
(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()),
TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0));
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 20:29:47 +0000