summaryrefslogtreecommitdiffstats
path: root/lib/koproperty
diff options
context:
space:
mode:
Diffstat (limited to 'lib/koproperty')
-rw-r--r--lib/koproperty/editoritem.cpp4
-rw-r--r--lib/koproperty/editors/booledit.cpp2
-rw-r--r--lib/koproperty/editors/fontedit.cpp8
-rw-r--r--lib/koproperty/editors/pixmapedit.cpp2
-rw-r--r--lib/koproperty/editors/pointedit.cpp2
-rw-r--r--lib/koproperty/editors/rectedit.cpp2
-rw-r--r--lib/koproperty/editors/sizeedit.cpp2
-rw-r--r--lib/koproperty/editors/symbolcombo.cpp2
-rw-r--r--lib/koproperty/property.h2
-rw-r--r--lib/koproperty/widgetproxy.cpp8
10 files changed, 17 insertions, 17 deletions
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index 0a4313292..1027d2242 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -133,7 +133,7 @@ class GroupWidgetBase : public TQWidget
TQRect r(rect());
TQPainter p(this);
TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default;
- kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, tqpalette().active(), flags);
+ kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags);
paintListViewExpander(&p, this, r.height()+2, tqpalette().active(), isOpen());
if (!m_miniicon.isNull()) {
@@ -143,7 +143,7 @@ class GroupWidgetBase : public TQWidget
if (!m_titleStr.isNull())
{
int indent = 16 + (m_miniicon.isNull() ? 0 : (m_miniicon.width()+4));
- p.setPen(tqpalette().active().text());
+ p.setPen(palette().active().text());
TQFont f = p.font();
f.setBold(true);
p.setFont(f);
diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp
index da3fd994d..7791730c7 100644
--- a/lib/koproperty/editors/booledit.cpp
+++ b/lib/koproperty/editors/booledit.cpp
@@ -46,7 +46,7 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name)
m_toggle->setUsesTextLabel(true);
m_toggle->setTextPosition(TQToolButton::Right);
m_toggle->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
- //we're not using tqlayout to because of problems with button size
+ //we're not using layout to because of problems with button size
m_toggle->move(0, 0);
m_toggle->resize(width(), height());
setFocusWidget(m_toggle);
diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp
index f85279cee..a4f4b5192 100644
--- a/lib/koproperty/editors/fontedit.cpp
+++ b/lib/koproperty/editors/fontedit.cpp
@@ -47,7 +47,7 @@ class FontEditRequester : public KFontRequester
FontEditRequester(TQWidget* parent)
: KFontRequester(parent)
{
- label()->setPaletteBackgroundColor(tqpalette().active().base());
+ label()->setPaletteBackgroundColor(palette().active().base());
label()->setMinimumWidth(0);
label()->setFrameShape(TQFrame::Box);
label()->setIndent(-1);
@@ -55,9 +55,9 @@ class FontEditRequester : public KFontRequester
label()->setFocusPolicy(TQ_ClickFocus);
KAcceleratorManager::setNoAccel(label());
#endif
- tqlayout()->remove(label());
- tqlayout()->remove(button());//->reparent(this, 0, TQPoint(0,0));
- delete tqlayout();
+ layout()->remove(label());
+ layout()->remove(button());//->reparent(this, 0, TQPoint(0,0));
+ delete layout();
button()->setText(i18n("..."));
TQToolTip::add(button(), i18n("Change font"));
button()->setFocusPolicy(TQ_NoFocus);
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index d887a8cde..265ee16d3 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -73,7 +73,7 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name)
m_button->setFocusPolicy(TQ_NoFocus);
m_popup = new TQLabel(0, "m_popup", TQt::WStyle_Customize|TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop);
- m_popup->setPaletteBackgroundColor(m_popup->tqpalette().active().base());
+ m_popup->setPaletteBackgroundColor(m_popup->palette().active().base());
m_popup->setFrameStyle(TQFrame::Plain|TQFrame::Box);
m_popup->setMargin(2);
m_popup->setLineWidth(1);
diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp
index c47c854fe..7badc4dec 100644
--- a/lib/koproperty/editors/pointedit.cpp
+++ b/lib/koproperty/editors/pointedit.cpp
@@ -41,7 +41,7 @@ PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name)
m_edit = new KActiveLabel(this);
m_edit->setFocusPolicy(TQ_NoFocus);
// m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN);
- m_edit->setPaletteBackgroundColor(tqpalette().active().base());
+ m_edit->setPaletteBackgroundColor(palette().active().base());
m_edit->setWordWrap( TQTextEdit::NoWrap );
// m_edit->setBackgroundMode(TQt::PaletteBase);
// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp
index 3cebfea8d..2422eec88 100644
--- a/lib/koproperty/editors/rectedit.cpp
+++ b/lib/koproperty/editors/rectedit.cpp
@@ -39,7 +39,7 @@ RectEdit::RectEdit(Property *property, TQWidget *parent, const char *name)
setHasBorders(false);
m_edit = new KActiveLabel(this);
m_edit->setFocusPolicy(TQ_NoFocus);
- m_edit->setPaletteBackgroundColor(tqpalette().active().base());
+ m_edit->setPaletteBackgroundColor(palette().active().base());
m_edit->setWordWrap( TQTextEdit::NoWrap );
m_edit->setMinimumHeight(5);
setEditor(m_edit);
diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index 98075515e..3e0213d95 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -41,7 +41,7 @@ SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name)
m_edit = new KActiveLabel(this);
m_edit->setFocusPolicy(TQ_NoFocus);
// m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN);
- m_edit->setPaletteBackgroundColor(tqpalette().active().base());
+ m_edit->setPaletteBackgroundColor(palette().active().base());
// m_edit->setBackgroundMode(TQt::PaletteBase);
// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
m_edit->setMinimumHeight(5);
diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp
index 65a7d9511..faaefdb93 100644
--- a/lib/koproperty/editors/symbolcombo.cpp
+++ b/lib/koproperty/editors/symbolcombo.cpp
@@ -61,7 +61,7 @@ TQVariant
SymbolCombo::value() const
{
if (!(m_edit->text().isNull()))
- return m_edit->text().at(0).tqunicode();
+ return m_edit->text().at(0).unicode();
else
return 0;
}
diff --git a/lib/koproperty/property.h b/lib/koproperty/property.h
index 5f61ff6bf..9f097c617 100644
--- a/lib/koproperty/property.h
+++ b/lib/koproperty/property.h
@@ -104,7 +104,7 @@ enum PropertyType {
//predefined custom types
ValueFromList = 2000 /**<string value from a list*/,
- Symbol = 2001 /**<tqunicode symbol code*/,
+ Symbol = 2001 /**<unicode symbol code*/,
FontName /**<font name, e.g. "times new roman"*/,
FileURL /**<url of a file*/,
PictureFileURL /**<url of a pixmap*/,
diff --git a/lib/koproperty/widgetproxy.cpp b/lib/koproperty/widgetproxy.cpp
index a45583197..9e6ea602f 100644
--- a/lib/koproperty/widgetproxy.cpp
+++ b/lib/koproperty/widgetproxy.cpp
@@ -30,7 +30,7 @@ class WidgetProxyPrivate
{
public:
WidgetProxyPrivate()
- : property(0), widget(0), type(Invalid), tqlayout(0)
+ : property(0), widget(0), type(Invalid), layout(0)
{}
~WidgetProxyPrivate() {}
@@ -38,7 +38,7 @@ class WidgetProxyPrivate
Widget *widget;
PropertyType type;
- TQHBoxLayout *tqlayout;
+ TQHBoxLayout *layout;
};
}
@@ -49,7 +49,7 @@ WidgetProxy::WidgetProxy(TQWidget *parent, const char *name)
{
d = new WidgetProxyPrivate();
d->property = new Property();
- d->tqlayout = new TQHBoxLayout(this, 0, 0);
+ d->layout = new TQHBoxLayout(this, 0, 0);
}
WidgetProxy::~WidgetProxy()
@@ -118,7 +118,7 @@ WidgetProxy::setWidget()
if (d->widget) {
d->widget->reparent(this, TQPoint(0,0), true);
- d->tqlayout->addWidget(d->widget);
+ d->layout->addWidget(d->widget);
}
}