summaryrefslogtreecommitdiffstats
path: root/kdeui
diff options
context:
space:
mode:
Diffstat (limited to 'kdeui')
-rw-r--r--kdeui/kactionclasses.cpp6
-rw-r--r--kdeui/karrowbutton.cpp4
-rw-r--r--kdeui/kcharselect.cpp24
-rw-r--r--kdeui/kcolorbutton.cpp18
-rw-r--r--kdeui/kcompletionbox.cpp2
-rw-r--r--kdeui/kdatepicker.cpp2
-rw-r--r--kdeui/kdialog.cpp2
-rw-r--r--kdeui/kdockwidget.cpp12
-rw-r--r--kdeui/keditcl1.cpp4
-rw-r--r--kdeui/kfontdialog.cpp2
-rw-r--r--kdeui/kguiitem.cpp2
-rw-r--r--kdeui/kjanuswidget.cpp2
-rw-r--r--kdeui/klineedit.cpp16
-rw-r--r--kdeui/klistview.cpp4
-rw-r--r--kdeui/kmainwindow.cpp4
-rw-r--r--kdeui/kmainwindowiface.cpp2
-rw-r--r--kdeui/kmenubar.cpp10
-rw-r--r--kdeui/kpopupmenu.cpp4
-rw-r--r--kdeui/kselect.cpp26
-rw-r--r--kdeui/kseparator.cpp2
-rw-r--r--kdeui/ktabbar.cpp12
-rw-r--r--kdeui/ktabwidget.cpp6
-rw-r--r--kdeui/ktextedit.cpp2
-rw-r--r--kdeui/ktoolbar.cpp8
-rw-r--r--kdeui/ktoolbarbutton.cpp20
-rw-r--r--kdeui/kurllabel.cpp4
-rw-r--r--kdeui/kxmlguiclient.cpp4
27 files changed, 102 insertions, 102 deletions
diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp
index c8b861e12..9e2241408 100644
--- a/kdeui/kactionclasses.cpp
+++ b/kdeui/kactionclasses.cpp
@@ -2326,7 +2326,7 @@ void KPasteTextAction::menuAboutToShow()
if (reply.isValid())
list = reply;
}
- TQString clipboardText = tqApp->tqclipboard()->text(TQClipboard::Clipboard);
+ TQString clipboardText = tqApp->clipboard()->text(TQClipboard::Clipboard);
if (list.isEmpty())
list << clipboardText;
bool found = false;
@@ -2354,7 +2354,7 @@ void KPasteTextAction::menuItemActivated( int id)
TQString clipboardText = reply;
reply = klipper.call("setClipboardContents(TQString)", clipboardText);
if (reply.isValid())
- kdDebug(129) << "Clipboard: " << TQString(tqApp->tqclipboard()->text(TQClipboard::Clipboard)) << endl;
+ kdDebug(129) << "Clipboard: " << TQString(tqApp->clipboard()->text(TQClipboard::Clipboard)) << endl;
}
TQTimer::singleShot(20, this, TQT_SLOT(slotActivated()));
}
@@ -2363,7 +2363,7 @@ void KPasteTextAction::slotActivated()
{
if (!m_mixedMode) {
TQWidget *w = tqApp->widgetAt(TQCursor::pos(), true);
- TQMimeSource *data = TQApplication::tqclipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
if (!data->provides("text/plain") && w) {
m_popup->popup(w->mapToGlobal(TQPoint(0, w->height())));
} else
diff --git a/kdeui/karrowbutton.cpp b/kdeui/karrowbutton.cpp
index 4808bcd54..4dbbe5bab 100644
--- a/kdeui/karrowbutton.cpp
+++ b/kdeui/karrowbutton.cpp
@@ -63,7 +63,7 @@ void KArrowButton::drawButton(TQPainter *p)
const unsigned int margin = 2;
p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
- tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
+ style().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
colorGroup(),
isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default,
TQStyleOption( 2, 0 ) );
@@ -103,7 +103,7 @@ void KArrowButton::drawButton(TQPainter *p)
int flags = TQStyle::Style_Enabled;
if ( isDown() )
flags |= TQStyle::Style_Down;
- tqstyle().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
+ style().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
colorGroup(), flags );
}
diff --git a/kdeui/kcharselect.cpp b/kdeui/kcharselect.cpp
index e8ff5e6c3..6cb1f0477 100644
--- a/kdeui/kcharselect.cpp
+++ b/kdeui/kcharselect.cpp
@@ -45,7 +45,7 @@
class KCharSelect::KCharSelectPrivate
{
public:
- TQLineEdit *tqunicodeLine;
+ TQLineEdit *unicodeLine;
};
TQFontDatabase * KCharSelect::fontDataBase = 0;
@@ -155,7 +155,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
c += row * numCols();
c += col;
- if ( c == vChr.tqunicode() ) {
+ if ( c == vChr.unicode() ) {
p->setBrush( TQBrush( colorGroup().highlight() ) );
p->setPen( NoPen );
p->drawRect( 0, 0, w, h );
@@ -172,8 +172,8 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
p->setPen( colorGroup().text() );
}
- if ( c == focusItem.tqunicode() && hasFocus() ) {
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ),
+ if ( c == focusItem.unicode() && hasFocus() ) {
+ style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ),
colorGroup() );
focusPos = TQPoint( col, row );
}
@@ -409,13 +409,13 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
const TQRegExp rx( "[a-fA-F0-9]{1,4}" );
TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) );
- d->tqunicodeLine = new KLineEdit( bar );
- d->tqunicodeLine->setValidator(validator);
- lUnicode->setBuddy(d->tqunicodeLine);
- d->tqunicodeLine->resize( d->tqunicodeLine->sizeHint() );
+ d->unicodeLine = new KLineEdit( bar );
+ d->unicodeLine->setValidator(validator);
+ lUnicode->setBuddy(d->unicodeLine);
+ d->unicodeLine->resize( d->unicodeLine->sizeHint() );
slotUpdateUnicode(_chr);
- connect( d->tqunicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) );
+ connect( d->unicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) );
charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQString(TQVBox::font().family()) : _font, _chr, _tableNum );
const TQSize sz( charTable->contentsWidth() + 4 ,
@@ -513,7 +513,7 @@ void KCharSelect::tableChanged( int _value )
//==================================================================
void KCharSelect::slotUnicodeEntered( )
{
- const TQString s = d->tqunicodeLine->text();
+ const TQString s = d->unicodeLine->text();
if (s.isEmpty())
return;
@@ -532,10 +532,10 @@ void KCharSelect::slotUnicodeEntered( )
void KCharSelect::slotUpdateUnicode( const TQChar &c )
{
- const int uc = c.tqunicode();
+ const int uc = c.unicode();
TQString s;
s.sprintf("%04X", uc);
- d->tqunicodeLine->setText(s);
+ d->unicodeLine->setText(s);
}
void KCharSelectTable::virtual_hook( int, void*)
diff --git a/kdeui/kcolorbutton.cpp b/kdeui/kcolorbutton.cpp
index 4d3db2983..ceded0f58 100644
--- a/kdeui/kcolorbutton.cpp
+++ b/kdeui/kcolorbutton.cpp
@@ -105,18 +105,18 @@ void KColorButton::setDefaultColor( const TQColor &c )
void KColorButton::drawButtonLabel( TQPainter *painter )
{
int x, y, w, h;
- TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this );
+ TQRect r = style().subRect( TQStyle::SR_PushButtonContents, this );
r.rect(&x, &y, &w, &h);
- int margin = tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this );
+ int margin = style().pixelMetric( TQStyle::PM_ButtonMargin, this );
x += margin;
y += margin;
w -= 2*margin;
h -= 2*margin;
if (isOn() || isDown()) {
- x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
- y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+ x += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+ y += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
}
TQColor fillCol = isEnabled() ? col : backgroundColor();
@@ -125,14 +125,14 @@ void KColorButton::drawButtonLabel( TQPainter *painter )
painter->fillRect( x+1, y+1, w-2, h-2, fillCol );
if ( hasFocus() ) {
- TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this );
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
+ TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this );
+ style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
}
}
TQSize KColorButton::sizeHint() const
{
- return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
+ return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
expandedTo(TQApplication::globalStrut());
}
@@ -155,11 +155,11 @@ void KColorButton::keyPressEvent( TQKeyEvent *e )
if ( KStdAccel::copy().contains( key ) ) {
TQMimeSource* mime = new KColorDrag( color() );
- TQApplication::tqclipboard()->setData( mime, TQClipboard::Clipboard );
+ TQApplication::clipboard()->setData( mime, TQClipboard::Clipboard );
}
else if ( KStdAccel::paste().contains( key ) ) {
TQColor color;
- KColorDrag::decode( TQApplication::tqclipboard()->data( TQClipboard::Clipboard ), color );
+ KColorDrag::decode( TQApplication::clipboard()->data( TQClipboard::Clipboard ), color );
setColor( color );
}
else
diff --git a/kdeui/kcompletionbox.cpp b/kdeui/kcompletionbox.cpp
index 069a1733f..56d52b88a 100644
--- a/kdeui/kcompletionbox.cpp
+++ b/kdeui/kcompletionbox.cpp
@@ -361,7 +361,7 @@ TQRect KCompletionBox::calculateGeometry() const
comboCorner.y() - parentCorner.y();
//Ask the style to refine this a bit
- TQRect styleAdj = tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox,
+ TQRect styleAdj = style().querySubControlMetrics(TQStyle::CC_ComboBox,
cb, TQStyle::SC_ComboBoxListBoxPopup,
TQStyleOption(x, y, w, h));
//TQCommonStyle returns TQRect() by default, so this is what we get if the
diff --git a/kdeui/kdatepicker.cpp b/kdeui/kdatepicker.cpp
index 82775be4f..ded20474a 100644
--- a/kdeui/kdatepicker.cpp
+++ b/kdeui/kdatepicker.cpp
@@ -507,7 +507,7 @@ KDatePicker::setFontSize(int s)
maxMonthRect.setHeight(QMAX(r.height(), maxMonthRect.height()));
}
- TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton,
+ TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton,
selectMonth,
maxMonthRect);
selectMonth->setMinimumSize(metricBound);
diff --git a/kdeui/kdialog.cpp b/kdeui/kdialog.cpp
index a0832b4e4..f1fc79061 100644
--- a/kdeui/kdialog.cpp
+++ b/kdeui/kdialog.cpp
@@ -405,7 +405,7 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent)
TQFrame* frame = new TQFrame( this );
frame->setFrameStyle( TQFrame::NoFrame );
- frame->setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
+ frame->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
// we need to set the minimum size for the window
frame->setMinimumWidth(400);
vbox->addWidget( frame );
diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp
index aef984f58..c8d14a0d3 100644
--- a/kdeui/kdockwidget.cpp
+++ b/kdeui/kdockwidget.cpp
@@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
paint.begin( this );
- tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
+ style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -228,7 +228,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
closeButton = new KDockButton_Private( this, "DockCloseButton" );
TQToolTip::add( closeButton, i18n("Close") );
- closeButton->setPixmap( tqstyle().stylePixmap (TQStyle::SP_TitleBarCloseButton , this));
+ closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this));
closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked()));
connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
@@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
TQWidget::paintEvent(pe);
TQPainter paint;
paint.begin( this );
- tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
+ style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -601,7 +601,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme)
int styleheight;
TQPoint mp;
mp=mme->pos();
- styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+ styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
bbottom=mp.y()>=height()-styleheight;
btop=mp.y()<=styleheight;
bleft=mp.x()<=styleheight;
@@ -689,7 +689,7 @@ void KDockWidget::mouseMoveEvent(TQMouseEvent* mme)
int styleheight;
TQPoint mp;
mp=mme->pos();
- styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+ styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
bbottom=mp.y()>=height()-styleheight;
btop=mp.y()<=styleheight;
bleft=mp.x()<=styleheight;
@@ -791,7 +791,7 @@ void KDockWidget::updateHeader()
header->setTopLevel( true );
header->show();
#ifdef BORDERLESS_WINDOWS
- layout->setMargin(2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this));
+ layout->setMargin(2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this));
setMouseTracking(true);
#endif
}
diff --git a/kdeui/keditcl1.cpp b/kdeui/keditcl1.cpp
index a8d9f5953..5b4c21883 100644
--- a/kdeui/keditcl1.cpp
+++ b/kdeui/keditcl1.cpp
@@ -140,7 +140,7 @@ KEdit::insertText(TQTextStream *stream)
// TQString str = text();
// for (int i = 0; i < (int) str.length(); i++)
- // printf("KEdit: U+%04X\n", str[i].tqunicode());
+ // printf("KEdit: U+%04X\n", str[i].unicode());
}
@@ -471,7 +471,7 @@ void KEdit::keyPressEvent ( TQKeyEvent *e)
else if ( isReadOnly() )
TQMultiLineEdit::keyPressEvent( e );
// If this is an unmodified printable key, send it directly to TQMultiLineEdit.
- else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && TQString(e->text()).tqunicode()->isPrint() )
+ else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && TQString(e->text()).unicode()->isPrint() )
TQMultiLineEdit::keyPressEvent( e );
else if ( KStdAccel::paste().contains( key ) ) {
paste();
diff --git a/kdeui/kfontdialog.cpp b/kdeui/kfontdialog.cpp
index 1fcb3a2f2..eb5b262f8 100644
--- a/kdeui/kfontdialog.cpp
+++ b/kdeui/kfontdialog.cpp
@@ -464,7 +464,7 @@ void KFontChooser::toggled_checkbox()
void KFontChooser::family_chosen_slot(const TQString& family)
{
TQFontDatabase dbase;
- TQStringList styles = TQStringList(dbase.tqstyles(family));
+ TQStringList styles = TQStringList(dbase.styles(family));
styleListBox->clear();
currentStyles.clear();
for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) {
diff --git a/kdeui/kguiitem.cpp b/kdeui/kguiitem.cpp
index abcc3868a..7b73c7401 100644
--- a/kdeui/kguiitem.cpp
+++ b/kdeui/kguiitem.cpp
@@ -135,7 +135,7 @@ TQString KGuiItem::plainText() const
int resultLength = 0;
stripped.setLength(len);
- const TQChar* data = d->m_text.tqunicode();
+ const TQChar* data = d->m_text.unicode();
for ( int pos = 0; pos < len; ++pos )
{
if ( data[ pos ] != '&' )
diff --git a/kdeui/kjanuswidget.cpp b/kdeui/kjanuswidget.cpp
index a11cbbaf2..4c291eda4 100644
--- a/kdeui/kjanuswidget.cpp
+++ b/kdeui/kjanuswidget.cpp
@@ -769,7 +769,7 @@ TQSize KJanusWidget::minimumSizeHint() const
if( mFace == TreeList )
{
- s1.rwidth() += tqstyle().pixelMetric( TQStyle::PM_SplitterWidth );
+ s1.rwidth() += style().pixelMetric( TQStyle::PM_SplitterWidth );
s2 = mTreeList->minimumSize();
}
else
diff --git a/kdeui/klineedit.cpp b/kdeui/klineedit.cpp
index 87fc29d83..bc667aaf0 100644
--- a/kdeui/klineedit.cpp
+++ b/kdeui/klineedit.cpp
@@ -420,9 +420,9 @@ bool KLineEdit::copySqueezedText(bool clipboard) const
return false;
TQString t = d->squeezedText;
t = t.mid(start, end - start);
- disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
- TQApplication::tqclipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection );
- connect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this,
+ disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
+ TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection );
+ connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this,
TQT_SLOT(clipboardChanged()) );
return true;
}
@@ -453,7 +453,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
}
else if ( KStdAccel::pasteSelection().contains( key ) )
{
- TQString text = TQApplication::tqclipboard()->text( TQClipboard::Selection);
+ TQString text = TQApplication::clipboard()->text( TQClipboard::Selection);
insert( text );
deselect();
return;
@@ -575,7 +575,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
mode == KGlobalSettings::CompletionMan) && noModifier )
{
TQString keycode = e->text();
- if ( !keycode.isEmpty() && (keycode.tqunicode()->isPrint() ||
+ if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() ||
e->key() == Key_Backspace || e->key() == Key_Delete ) )
{
bool hasUserSelection=d->userSelection;
@@ -658,7 +658,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
// as if there was no selection. After processing the key event, we
// can set the new autocompletion again.
if (hadSelection && !hasUserSelection && start>cPos &&
- ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) ||
+ ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) ||
e->key() == Key_Backspace || e->key() == Key_Delete ) )
{
del();
@@ -679,7 +679,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
int len = txt.length();
if ( txt != old_txt && len/* && ( cursorPosition() == len || force )*/ &&
- ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) ||
+ ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) ||
e->key() == Key_Backspace || e->key() == Key_Delete) )
{
if ( e->key() == Key_Backspace )
@@ -840,7 +840,7 @@ void KLineEdit::mousePressEvent( TQMouseEvent* e )
void KLineEdit::mouseReleaseEvent( TQMouseEvent* e )
{
TQLineEdit::mouseReleaseEvent( e );
- if (TQApplication::tqclipboard()->supportsSelection() ) {
+ if (TQApplication::clipboard()->supportsSelection() ) {
if ( e->button() == Qt::LeftButton ) {
// Fix copying of squeezed text if needed
copySqueezedText( false );
diff --git a/kdeui/klistview.cpp b/kdeui/klistview.cpp
index fd5a6c51c..e1c5811ca 100644
--- a/kdeui/klistview.cpp
+++ b/kdeui/klistview.cpp
@@ -1358,7 +1358,7 @@ TQRect KListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
r = itemRect(item);
r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize());
if (painter)
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
+ style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
TQStyle::Style_FocusAtBorder, colorGroup().highlight());
}
@@ -1940,7 +1940,7 @@ void KListView::viewportPaintEvent(TQPaintEvent *e)
TQPainter painter(viewport());
// This is where we actually draw the drop-highlighter
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
+ style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
TQStyle::Style_FocusAtBorder);
}
d->painting = false;
diff --git a/kdeui/kmainwindow.cpp b/kdeui/kmainwindow.cpp
index 1442fa587..397c2479c 100644
--- a/kdeui/kmainwindow.cpp
+++ b/kdeui/kmainwindow.cpp
@@ -1197,7 +1197,7 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
break;
case KToolBar::Flat:
- size += TQSize(0, 3+kapp->tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
+ size += TQSize(0, 3+kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
break;
default:
@@ -1207,7 +1207,7 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
KMenuBar *mb = internalMenuBar();
if (mb && !mb->isHidden()) {
size += TQSize(0,mb->heightForWidth(size.width()));
- if (tqstyle().styleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this))
+ if (style().styleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this))
size += TQSize( 0, dockWindowsMovable() ? 1 : 2);
}
TQStatusBar *sb = internalStatusBar();
diff --git a/kdeui/kmainwindowiface.cpp b/kdeui/kmainwindowiface.cpp
index 9394d27bb..f8ef88c31 100644
--- a/kdeui/kmainwindowiface.cpp
+++ b/kdeui/kmainwindowiface.cpp
@@ -135,7 +135,7 @@ int KMainWindowInterface::getWinID()
}
void KMainWindowInterface::grabWindowToClipBoard()
{
- TQClipboard *clipboard = TQApplication::tqclipboard();
+ TQClipboard *clipboard = TQApplication::clipboard();
clipboard->setPixmap(TQPixmap::grabWidget(m_MainWindow));
}
void KMainWindowInterface::hide()
diff --git a/kdeui/kmenubar.cpp b/kdeui/kmenubar.cpp
index 5ee844b22..462fb93b8 100644
--- a/kdeui/kmenubar.cpp
+++ b/kdeui/kmenubar.cpp
@@ -528,10 +528,10 @@ void KMenuBar::drawContents( TQPainter* p )
e = mi->isEnabledAndVisible();
if ( e )
- g = isEnabled() ? ( isActiveWindow() ? tqpalette().active() :
- tqpalette().inactive() ) : tqpalette().disabled();
+ g = isEnabled() ? ( isActiveWindow() ? palette().active() :
+ palette().inactive() ) : palette().disabled();
else
- g = tqpalette().disabled();
+ g = palette().disabled();
bool item_active = ( actItem == i );
@@ -548,12 +548,12 @@ void KMenuBar::drawContents( TQPainter* p )
flags |= TQStyle::Style_Down;
flags |= TQStyle::Style_HasFocus;
- tqstyle().drawControl(TQStyle::CE_MenuBarItem, p, this,
+ style().drawControl(TQStyle::CE_MenuBarItem, p, this,
r, g, flags, TQStyleOption(mi));
}
else
{
- tqstyle().drawItem(p, r, AlignCenter | AlignVCenter | ShowPrefix,
+ style().drawItem(p, r, AlignCenter | AlignVCenter | ShowPrefix,
g, e, mi->pixmap(), mi->text());
}
}
diff --git a/kdeui/kpopupmenu.cpp b/kdeui/kpopupmenu.cpp
index d0ebf25f3..a14575233 100644
--- a/kdeui/kpopupmenu.cpp
+++ b/kdeui/kpopupmenu.cpp
@@ -90,14 +90,14 @@ void KPopupTitle::paintEvent(TQPaintEvent *)
{
TQRect r(rect());
TQPainter p(this);
- kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, tqpalette().active());
+ kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
if (!miniicon.isNull())
p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon);
if (!titleStr.isNull())
{
- p.setPen(tqpalette().active().text());
+ p.setPen(palette().active().text());
TQFont f = p.font();
f.setBold(true);
p.setFont(f);
diff --git a/kdeui/kselect.cpp b/kdeui/kselect.cpp
index cda0c2685..70a63a9a8 100644
--- a/kdeui/kselect.cpp
+++ b/kdeui/kselect.cpp
@@ -53,7 +53,7 @@ KXYSelector::~KXYSelector()
void KXYSelector::setRange( int _minX, int _minY, int _maxX, int _maxY )
{
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
px = w;
py = w;
minX = _minX;
@@ -74,7 +74,7 @@ void KXYSelector::setYValue( int _yPos )
void KXYSelector::setValues( int _xPos, int _yPos )
{
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) w = 5;
xPos = _xPos;
@@ -98,7 +98,7 @@ void KXYSelector::setValues( int _xPos, int _yPos )
TQRect KXYSelector::contentsRect() const
{
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) {
w = 5;
}
@@ -113,7 +113,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
TQRect paintRect = ev->rect();
TQRect borderRect = rect();
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) {
w = 5 - w;
}
@@ -122,7 +122,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
TQPainter painter;
painter.begin( this );
- tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &painter,
+ style().tqdrawPrimitive(TQStyle::PE_Panel, &painter,
borderRect, colorGroup(),
TQStyle::Style_Sunken);
@@ -150,7 +150,7 @@ void KXYSelector::mouseMoveEvent( TQMouseEvent *e )
{
int xVal, yVal;
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
valuesFromPosition( e->pos().x() - w, e->pos().y() - w, xVal, yVal );
setValues( xVal, yVal );
@@ -170,7 +170,7 @@ void KXYSelector::wheelEvent( TQWheelEvent *e )
void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const
{
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) w = 5;
xVal = ( (maxX-minX) * (x-w) ) / ( width()-2*w );
yVal = maxY - ( ( (maxY-minY) * (y-w) ) / ( height()-2*w ) );
@@ -188,7 +188,7 @@ void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const
void KXYSelector::setPosition( int xp, int yp )
{
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) w = 5;
if ( xp < w )
xp = w;
@@ -256,7 +256,7 @@ KSelector::~KSelector()
TQRect KSelector::contentsRect() const
{
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical )
return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw );
@@ -267,7 +267,7 @@ TQRect KSelector::contentsRect() const
void KSelector::paintEvent( TQPaintEvent * )
{
TQPainter painter;
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
painter.begin( this );
@@ -281,7 +281,7 @@ void KSelector::paintEvent( TQPaintEvent * )
r.addCoords(0, iw - w, -iw, w - iw);
else
r.addCoords(iw - w, 0, w - iw, -iw);
- tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &painter,
+ style().tqdrawPrimitive(TQStyle::PE_Panel, &painter,
r, colorGroup(),
TQStyle::Style_Sunken);
}
@@ -329,7 +329,7 @@ void KSelector::valueChange()
void KSelector::moveArrow( const TQPoint &pos )
{
int val;
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical )
@@ -346,7 +346,7 @@ TQPoint KSelector::calcArrowPos( int val )
{
TQPoint p;
- int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical )
{
diff --git a/kdeui/kseparator.cpp b/kdeui/kseparator.cpp
index d20710a1d..8fb7fd5a8 100644
--- a/kdeui/kseparator.cpp
+++ b/kdeui/kseparator.cpp
@@ -95,7 +95,7 @@ void KSeparator::drawFrame(TQPainter *p)
}
TQStyleOption opt( lineWidth(), midLineWidth() );
- tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g,
+ style().tqdrawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g,
TQStyle::Style_Sunken, opt );
}
diff --git a/kdeui/ktabbar.cpp b/kdeui/ktabbar.cpp
index 3b54aab99..a2d20a505 100644
--- a/kdeui/ktabbar.cpp
+++ b/kdeui/ktabbar.cpp
@@ -172,8 +172,8 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
int xoff = 0, yoff = 0;
// The additional offsets were found by try and error, TODO: find the rational behind them
if ( t == tab( currentTab() ) ) {
- xoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
- yoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
+ xoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
+ yoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
}
else {
xoff = 7;
@@ -341,8 +341,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
r.setLeft( r.left() + pixw + 4 );
r.setRight( r.right() + 2 );
- int inactiveXShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
- int inactiveYShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
+ int inactiveXShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
+ int inactiveYShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2;
@@ -362,8 +362,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
if ( mTabColors.contains( t->identifier() ) )
cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] );
- tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, r,
- t->isEnabled() ? cg : tqpalette().disabled(),
+ style().drawControl( TQStyle::CE_TabBarLabel, p, this, r,
+ t->isEnabled() ? cg : palette().disabled(),
flags, TQStyleOption(t) );
}
diff --git a/kdeui/ktabwidget.cpp b/kdeui/ktabwidget.cpp
index 7570c6716..a87a677d6 100644
--- a/kdeui/ktabwidget.cpp
+++ b/kdeui/ktabwidget.cpp
@@ -163,8 +163,8 @@ bool KTabWidget::tabCloseActivatePrevious() const
unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
{
int hframe, overlap;
- hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
- overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
+ hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
+ overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
TQFontMetrics fm = tabBar()->fontMetrics();
int x = 0;
@@ -177,7 +177,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
int iw = 0;
if ( tab->iconSet() )
iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
- x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this,
+ x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this,
TQSize( QMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
TQStyleOption( tab ) ) ).width();
}
diff --git a/kdeui/ktextedit.cpp b/kdeui/ktextedit.cpp
index be8e2925f..bc077ddb2 100644
--- a/kdeui/ktextedit.cpp
+++ b/kdeui/ktextedit.cpp
@@ -172,7 +172,7 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
}
else if ( KStdAccel::pasteSelection().contains( key ) )
{
- TQString text = TQApplication::tqclipboard()->text( TQClipboard::Selection);
+ TQString text = TQApplication::clipboard()->text( TQClipboard::Selection);
if ( !text.isEmpty() )
insert( text );
e->accept();
diff --git a/kdeui/ktoolbar.cpp b/kdeui/ktoolbar.cpp
index cd22242e2..3bbbfcc90 100644
--- a/kdeui/ktoolbar.cpp
+++ b/kdeui/ktoolbar.cpp
@@ -169,7 +169,7 @@ void KToolBarSeparator::drawContents( TQPainter* p )
if ( orientation() == Qt::Horizontal )
flags = flags | TQStyle::Style_Horizontal;
- tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p,
+ style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p,
contentsRect(), colorGroup(), flags);
} else {
TQFrame::drawContents(p);
@@ -183,7 +183,7 @@ void KToolBarSeparator::styleChange( TQStyle& )
TQSize KToolBarSeparator::sizeHint() const
{
- int dim = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
+ int dim = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 );
}
@@ -1371,7 +1371,7 @@ TQSize KToolBar::sizeHint() const
minSize += TQSize(2, 0); // A little bit extra spacing behind it.
}
- minSize += TQSize(TQApplication::tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0);
+ minSize += TQSize(TQApplication::style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0);
minSize += TQSize(margin*2, margin*2);
break;
@@ -1390,7 +1390,7 @@ TQSize KToolBar::sizeHint() const
minSize = minSize.expandedTo(TQSize(sh.width(), 0));
minSize += TQSize(0, sh.height()+1);
}
- minSize += TQSize(0, TQApplication::tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
+ minSize += TQSize(0, TQApplication::style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
minSize += TQSize(margin*2, margin*2);
break;
diff --git a/kdeui/ktoolbarbutton.cpp b/kdeui/ktoolbarbutton.cpp
index 76d87f06c..a2d3c27fe 100644
--- a/kdeui/ktoolbarbutton.cpp
+++ b/kdeui/ktoolbarbutton.cpp
@@ -246,7 +246,7 @@ void KToolBarButton::modeChange()
break;
}
- mysize = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, mysize).
+ mysize = style().tqsizeFromContents(TQStyle::CT_ToolButton, this, mysize).
expandedTo(TQApplication::globalStrut());
// make sure that this isn't taller then it is wide
@@ -494,7 +494,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
if (hasFocus()) flags |= TQStyle::Style_HasFocus;
// Draw a styled toolbutton
- tqstyle().drawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(),
+ style().drawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(),
colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption());
int dx, dy;
@@ -513,7 +513,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = ( width() - pixmap.width() ) / 2;
dy = ( height() - pixmap.height() ) / 2;
- if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -531,7 +531,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = 4;
dy = ( height() - pixmap.height() ) / 2;
- if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -547,7 +547,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
else
dx = 4;
dy = 0;
- if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -562,7 +562,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
textFlags = AlignVCenter|AlignLeft;
dx = (width() - fm.width(textLabel())) / 2;
dy = (height() - fm.lineSpacing()) / 2;
- if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -580,7 +580,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = (width() - pixmap.width()) / 2;
dy = (height() - fm.lineSpacing() - pixmap.height()) / 2;
- if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -594,7 +594,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
dx = (width() - fm.width(textLabel())) / 2;
dy = height() - fm.lineSpacing() - 4;
- if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -608,7 +608,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
_painter->setFont(KGlobalSettings::toolBarFont());
if (!isEnabled())
- _painter->setPen(tqpalette().disabled().dark());
+ _painter->setPen(palette().disabled().dark());
else if(d->m_isRaised)
_painter->setPen(KGlobalSettings::toolBarHighlightColor());
else
@@ -623,7 +623,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
if (isDown()) arrowFlags |= TQStyle::Style_Down;
if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled;
- tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
+ style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
TQRect(width()-7, height()-7, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}
diff --git a/kdeui/kurllabel.cpp b/kdeui/kurllabel.cpp
index 943cf393a..71f90abd9 100644
--- a/kdeui/kurllabel.cpp
+++ b/kdeui/kurllabel.cpp
@@ -356,7 +356,7 @@ bool KURLLabel::event (TQEvent *e)
// use parentWidget() unless you are a toplevel widget, then try qAapp
TQPalette p = parentWidget() ? parentWidget()->palette() : tqApp->palette();
p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background));
- p.setColor(TQColorGroup::Foreground, tqpalette().active().foreground());
+ p.setColor(TQColorGroup::Foreground, palette().active().foreground());
setPalette(p);
d->LinkColor = KGlobalSettings::linkColor();
setLinkColor(d->LinkColor);
@@ -367,7 +367,7 @@ bool KURLLabel::event (TQEvent *e)
if (result && hasFocus()) {
TQPainter p(this);
TQRect r( activeRect() );
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
+ style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
}
return result;
}
diff --git a/kdeui/kxmlguiclient.cpp b/kdeui/kxmlguiclient.cpp
index 63da79fc6..ff463e45f 100644
--- a/kdeui/kxmlguiclient.cpp
+++ b/kdeui/kxmlguiclient.cpp
@@ -760,9 +760,9 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml )
unsigned int endpos;
for (endpos = pos; endpos < xml.length(); endpos++)
{
- if (xml[endpos].tqunicode() >= '0' && xml[endpos].tqunicode() <= '9')
+ if (xml[endpos].unicode() >= '0' && xml[endpos].unicode() <= '9')
continue; //Number..
- if (xml[endpos].tqunicode() == '"') //End of parameter
+ if (xml[endpos].unicode() == '"') //End of parameter
break;
else //This shouldn't be here..
{