Rename obsolete tq methods to standard names

(cherry picked from commit b492b550f3)
v3.5.13-sru
Timothy Pearson 12 years ago committed by Slávek Banko
parent a5b44fbe44
commit 0251b10c2e

@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal ); grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp); vbox->addWidget(grp);
TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(), TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
KDialogBase::spacingHint()); KDialogBase::spacingHint());
systemBell = new TQCheckBox(i18n("Use &system bell"), grp); systemBell = new TQCheckBox(i18n("Use &system bell"), grp);
@ -291,7 +291,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal ); grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp); vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp); visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp);
vvbox->addWidget(visibleBell); vvbox->addWidget(visibleBell);
@ -353,7 +353,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal ); grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp); vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp); stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp);
vvbox->addWidget(stickyKeys); vvbox->addWidget(stickyKeys);
@ -377,7 +377,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal ); grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp); vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp); toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp);
vvbox->addWidget(toggleKeysBeep); vvbox->addWidget(toggleKeysBeep);
@ -415,7 +415,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal ); grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp); vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp); slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp);
vvbox->addWidget(slowKeys); vvbox->addWidget(slowKeys);
@ -447,7 +447,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal ); grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp); vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp); bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp);
vvbox->addWidget(bounceKeys); vvbox->addWidget(bounceKeys);
@ -491,7 +491,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal ); grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp); vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp); gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp);
vvbox->addWidget(gestures); vvbox->addWidget(gestures);
@ -521,7 +521,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal ); grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp); vbox->addWidget(grp);
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp); accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp);
vvbox->addWidget(accessxBeep); vvbox->addWidget(accessxBeep);

@ -8,7 +8,7 @@
static int TQHash(TQString key) static int TQHash(TQString key)
{ {
int g, h = 0; int g, h = 0;
const TQChar *p = key.tqunicode(); const TQChar *p = key.unicode();
for (unsigned i=0; i < key.length(); i++) { for (unsigned i=0; i < key.length(); i++) {
h = (h << 4) + p[i].cell(); h = (h << 4) + p[i].cell();
if ((g = (h & 0xf0000000))) if ((g = (h & 0xf0000000)))

@ -74,7 +74,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
box->setColumnLayout( 0, Qt::Horizontal ); box->setColumnLayout( 0, Qt::Horizontal );
layout->addWidget(box); layout->addWidget(box);
layout->addStretch(); layout->addStretch();
TQGridLayout *grid = new TQGridLayout(box->tqlayout(), KDialog::spacingHint()); TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
grid->setColStretch(0, 0); grid->setColStretch(0, 0);
grid->setColStretch(1, 1); grid->setColStretch(1, 1);
grid->addColSpacing(0, 30); grid->addColSpacing(0, 30);

@ -435,7 +435,7 @@ void WidgetCanvas::drawSampleWidgets()
// Menu bar // Menu bar
//qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush); //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush);
kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint, kapp->style().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint,
TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg); TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg);
paint.setFont( menuFont ); paint.setFont( menuFont );
@ -443,7 +443,7 @@ void WidgetCanvas::drawSampleWidgets()
TQString file = i18n("File"); TQString file = i18n("File");
textLen = paint.fontMetrics().width( file ); textLen = paint.fontMetrics().width( file );
//qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush); //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush);
kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &paint, kapp->style().tqdrawPrimitive(TQStyle::PE_Panel, &paint,
TQRect(30, 59, textLen + 10, 21), cg); TQRect(30, 59, textLen + 10, 21), cg);
paint.drawText( 35, 74, file ); paint.drawText( 35, 74, file );
@ -528,7 +528,7 @@ void WidgetCanvas::drawSampleWidgets()
cg2.setColor(TQColorGroup::Button, button); cg2.setColor(TQColorGroup::Button, button);
cg2.setColor(TQColorGroup::Background, window); cg2.setColor(TQColorGroup::Background, window);
//qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush); //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush);
kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint, kapp->style().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint,
TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised); TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised);
paint.setPen(buttonTxt); paint.setPen(buttonTxt);
paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter, paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter,

@ -291,7 +291,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(), TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(),
KDialog::spacingHint()); KDialog::spacingHint());
TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->tqlayout(), KDialog::spacingHint()); TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->layout(), KDialog::spacingHint());
mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse); mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse);
vvbox->addWidget(mouseKeys); vvbox->addWidget(mouseKeys);

@ -228,7 +228,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
loadLanguageList(langcombo); loadLanguageList(langcombo);
connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
label = new TQLabel(langcombo, i18n("Languag&e:"), group); label = new TQLabel(langcombo, i18n("Languag&e:"), group);
TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
hbox->setColStretch(1, 1); hbox->setColStretch(1, 1);
hbox->addWidget(label, 1, 0); hbox->addWidget(label, 1, 0);
hbox->addWidget(langcombo, 1, 1); hbox->addWidget(langcombo, 1, 1);
@ -244,7 +244,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group ); sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group );
connect( sakbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); connect( sakbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
TQGridLayout *hbox2 = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); TQGridLayout *hbox2 = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
hbox2->setColStretch(1, 1); hbox2->setColStretch(1, 1);
hbox2->addWidget(sakbox, 1, 0); hbox2->addWidget(sakbox, 1, 0);
wtstr = i18n("Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing measure."); wtstr = i18n("Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing measure.");
@ -351,7 +351,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo)
if (p.width() > 100 || p.height() > 100) if (p.width() > 100 || p.height() > 100)
p = p.smoothScale(100, 100, TQ_ScaleMin); p = p.smoothScale(100, 100, TQ_ScaleMin);
logobutton->setPixmap(p); logobutton->setPixmap(p);
uint bd = tqstyle().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
logobutton->setFixedSize(p.width() + bd, p.height() + bd); logobutton->setFixedSize(p.width() + bd, p.height() + bd);
logopath = logo; logopath = logo;
return true; return true;

@ -168,7 +168,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
userbutton = new TQPushButton( hlpw ); userbutton = new TQPushButton( hlpw );
userbutton->setAcceptDrops( true ); userbutton->setAcceptDrops( true );
userbutton->installEventFilter( this ); // for drag and drop userbutton->installEventFilter( this ); // for drag and drop
uint sz = tqstyle().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
userbutton->setFixedSize( sz, sz ); userbutton->setFixedSize( sz, sz );
connect( userbutton, TQT_SIGNAL(clicked()), connect( userbutton, TQT_SIGNAL(clicked()),
TQT_SLOT(slotUserButtonClicked()) ); TQT_SLOT(slotUserButtonClicked()) );

@ -163,7 +163,7 @@ static void removeSymbols(TQString &str)
TQChar space(' '); TQChar space(' ');
for(int c=0; c<len; ++c) for(int c=0; c<len; ++c)
if(str[c].tqunicode()<0x20 || str[c].tqunicode()>0x7E) if(str[c].unicode()<0x20 || str[c].unicode()>0x7E)
str[c]=space; str[c]=space;
str=str.simplifyWhiteSpace(); str=str.simplifyWhiteSpace();

@ -439,7 +439,7 @@ static bool hasStr(XftFont *font, TQString &str)
ch; ch;
for(ch=0; ch<slen; ++ch) for(ch=0; ch<slen; ++ch)
if(!FcCharSetHasChar(font->charset, str[ch].tqunicode())) if(!FcCharSetHasChar(font->charset, str[ch].unicode()))
return false; return false;
return true; return true;
} }

@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *)
{ {
if(!itsCurrentUrl.isEmpty()) if(!itsCurrentUrl.isEmpty())
{ {
paint.setPen(kapp->tqpalette().active().text()); paint.setPen(kapp->palette().active().text());
paint.drawText(rect(), AlignCenter, i18n(" No preview available")); paint.drawText(rect(), AlignCenter, i18n(" No preview available"));
} }
} }

@ -140,7 +140,7 @@ void SMBRoOptions::save()
for (uint i=0; i<password.length(); i++) for (uint i=0; i<password.length(); i++)
{ {
TQChar c = password[i]; TQChar c = password[i];
unsigned int num = (c.tqunicode() ^ 173) + 17; unsigned int num = (c.unicode() ^ 173) + 17;
unsigned int a1 = (num & 0xFC00) >> 10; unsigned int a1 = (num & 0xFC00) >> 10;
unsigned int a2 = (num & 0x3E0) >> 5; unsigned int a2 = (num & 0x3E0) >> 5;
unsigned int a3 = (num & 0x1F); unsigned int a3 = (num & 0x1F);

@ -47,7 +47,7 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e )
TQString keycode = e->text(); TQString keycode = e->text();
if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period || if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period ||
(cursorPosition() > 0 && key == Qt::Key_Minus) || (cursorPosition() > 0 && key == Qt::Key_Minus) ||
(!keycode.isEmpty() && keycode.tqunicode()->isLetterOrNumber()) ) (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) )
{ {
KLineEdit::keyPressEvent(e); KLineEdit::keyPressEvent(e);
return; return;

@ -38,7 +38,7 @@ DomainListView::DomainListView(KConfig *config,const TQString &title,
setColumnLayout(0, Qt::Vertical); setColumnLayout(0, Qt::Vertical);
layout()->setSpacing(0); layout()->setSpacing(0);
layout()->setMargin(0); layout()->setMargin(0);
TQGridLayout* thisLayout = new TQGridLayout(tqlayout()); TQGridLayout* thisLayout = new TQGridLayout(layout());
thisLayout->setAlignment(Qt::AlignTop); thisLayout->setAlignment(Qt::AlignTop);
thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setSpacing(KDialog::spacingHint());
thisLayout->setMargin(KDialog::marginHint()); thisLayout->setMargin(KDialog::marginHint());

@ -82,7 +82,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa
// Tabbed Browsing // Tabbed Browsing
TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this ); TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), KDialog::spacingHint() ); TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() );
m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing ); m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing );
TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, " TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "

@ -135,7 +135,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
setColumnLayout(0, Qt::Vertical); setColumnLayout(0, Qt::Vertical);
layout()->setSpacing(0); layout()->setSpacing(0);
layout()->setMargin(0); layout()->setMargin(0);
TQGridLayout *this_layout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2); TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
this_layout->setAlignment(Qt::AlignTop); this_layout->setAlignment(Qt::AlignTop);
this_layout->setSpacing(3); this_layout->setSpacing(3);
this_layout->setMargin(11); this_layout->setMargin(11);

@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num)
continue; continue;
if (!(0 <= bo && bo <= 1)) if (!(0 <= bo && bo <= 1))
continue; continue;
color[fi] = kapp->tqpalette().active().text(); color[fi] = kapp->palette().active().text();
transparent[fi] = tr; transparent[fi] = tr;
bold[fi] = bo; bold[fi] = bo;
type[fi] = 1; type[fi] = 1;
@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num)
continue; continue;
if (!(0 <= bo && bo <= 1)) if (!(0 <= bo && bo <= 1))
continue; continue;
color[fi] = kapp->tqpalette().active().base(); color[fi] = kapp->palette().active().base();
transparent[fi] = tr; transparent[fi] = tr;
bold[fi] = bo; bold[fi] = bo;
type[fi] = 2; type[fi] = 2;

@ -57,10 +57,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
"given in the section 'Startup indication timeout'")); "given in the section 'Startup indication timeout'"));
GroupBox1->setColumnLayout(0, Qt::Vertical ); GroupBox1->setColumnLayout(0, Qt::Vertical );
GroupBox1->tqlayout()->setSpacing( 0 ); GroupBox1->layout()->setSpacing( 0 );
GroupBox1->tqlayout()->setMargin( 0 ); GroupBox1->layout()->setMargin( 0 );
Form1Layout->addWidget( GroupBox1 ); Form1Layout->addWidget( GroupBox1 );
TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->tqlayout(), 3, 2 ); TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->layout(), 3, 2 );
GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setSpacing( 6 );
GroupBox1Layout->setMargin( 11 ); GroupBox1Layout->setMargin( 11 );
GroupBox1Layout->setColStretch( 1, 1 ); GroupBox1Layout->setColStretch( 1, 1 );
@ -97,10 +97,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
"given in the section 'Startup indication timeout'")); "given in the section 'Startup indication timeout'"));
GroupBox2->setColumnLayout( 0, Qt::Vertical ); GroupBox2->setColumnLayout( 0, Qt::Vertical );
GroupBox2->tqlayout()->setSpacing( 0 ); GroupBox2->layout()->setSpacing( 0 );
GroupBox2->tqlayout()->setMargin( 0 ); GroupBox2->layout()->setMargin( 0 );
Form1Layout->addWidget( GroupBox2 ); Form1Layout->addWidget( GroupBox2 );
TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->tqlayout(), 2, 2 ); TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->layout(), 2, 2 );
GroupBox2Layout->setSpacing( 6 ); GroupBox2Layout->setSpacing( 6 );
GroupBox2Layout->setMargin( 11 ); GroupBox2Layout->setMargin( 11 );
GroupBox2Layout->setColStretch( 1, 1 ); GroupBox2Layout->setColStretch( 1, 1 );

@ -45,7 +45,7 @@ KLocaleSample::KLocaleSample(KLocale *locale,
lay->setAutoAdd(TRUE); lay->setAutoAdd(TRUE);
// Whatever the color scheme is, we want black text // Whatever the color scheme is, we want black text
TQColorGroup a = tqpalette().active(); TQColorGroup a = palette().active();
a.setColor(TQColorGroup::Foreground, Qt::black); a.setColor(TQColorGroup::Foreground, Qt::black);
TQPalette pal(a, a, a); TQPalette pal(a, a, a);

@ -133,7 +133,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mSaverGroup->setColumnLayout( 0, Qt::Horizontal ); mSaverGroup->setColumnLayout( 0, Qt::Horizontal );
vLayout->addWidget(mSaverGroup); vLayout->addWidget(mSaverGroup);
vLayout->setStretchFactor( mSaverGroup, 10 ); vLayout->setStretchFactor( mSaverGroup, 10 );
TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(), TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(),
KDialog::spacingHint() ); KDialog::spacingHint() );
mSaverListView = new TQListView( mSaverGroup ); mSaverListView = new TQListView( mSaverGroup );
@ -162,7 +162,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mSettingsGroup = new TQGroupBox( i18n("Settings"), this ); mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
mSettingsGroup->setColumnLayout( 0, Qt::Vertical ); mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
leftColumnLayout->addWidget( mSettingsGroup ); leftColumnLayout->addWidget( mSettingsGroup );
groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(), groupLayout = new TQVBoxLayout( mSettingsGroup->layout(),
KDialog::spacingHint() ); KDialog::spacingHint() );
mEnabledCheckBox = new TQCheckBox(i18n( mEnabledCheckBox = new TQCheckBox(i18n(

@ -160,7 +160,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
gbWidgetStyle->layout()->setMargin( KDialog::marginHint() ); gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() ); gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() ); gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
gbWidgetStyleLayout->setAlignment( Qt::AlignTop ); gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
@ -195,7 +195,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
gbPreview->layout()->setSpacing( KDialog::spacingHint() ); gbPreview->layout()->setSpacing( KDialog::spacingHint() );
gbPreview->setFlat( true ); gbPreview->setFlat( true );
stylePreview = new StylePreview( gbPreview ); stylePreview = new StylePreview( gbPreview );
gbPreview->tqlayout()->add( stylePreview ); gbPreview->layout()->add( stylePreview );
page1Layout->addWidget( gbWidgetStyle ); page1Layout->addWidget( gbWidgetStyle );
page1Layout->addWidget( gbPreview ); page1Layout->addWidget( gbPreview );
@ -804,7 +804,7 @@ void KCMStyle::loadStyle( KConfig& config )
break; break;
else if ( id.contains( cfgStyle ) ) else if ( id.contains( cfgStyle ) )
break; break;
else if ( id.contains( TQApplication::tqstyle().className() ) ) else if ( id.contains( TQApplication::style().className() ) )
break; break;
item = 0; item = 0;
} }

@ -39,7 +39,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
gbox->setColumnLayout( 0, Qt::Horizontal ); gbox->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(gbox); vbox->addWidget(gbox);
TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->tqlayout(), KDialog::spacingHint()); TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
TQSplitter *splitter = new TQSplitter(gbox); TQSplitter *splitter = new TQSplitter(gbox);
vvbox->addWidget(splitter); vvbox->addWidget(splitter);

@ -1211,7 +1211,7 @@ void KDCOPWindow::slotCopy()
// below list view. If there is nothing selected from // below list view. If there is nothing selected from
// the below menu then tell the tree to copy its current // the below menu then tell the tree to copy its current
// selection as text. // selection as text.
TQClipboard *clipboard = TQApplication::tqclipboard(); TQClipboard *clipboard = TQApplication::clipboard();
if (mainView->lb_replyData->count()!= 0) if (mainView->lb_replyData->count()!= 0)
{ {

@ -159,7 +159,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
// Initialize media handler // Initialize media handler
mMediaListView = new TQListView(); mMediaListView = new TQListView();
connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()),
this, TQT_SLOT(slotClipboardDataChanged()) ); this, TQT_SLOT(slotClipboardDataChanged()) );
setURL( desktopURL() ); // sets m_url setURL( desktopURL() ); // sets m_url
@ -1327,7 +1327,7 @@ void KDIconView::slotClipboardDataChanged()
// This is very related to KonqDirPart::slotClipboardDataChanged // This is very related to KonqDirPart::slotClipboardDataChanged
KURL::List lst; KURL::List lst;
TQMimeSource *data = TQApplication::tqclipboard()->data(); TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) ) if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) )
if ( KonqDrag::decodeIsCutSelection( data ) ) if ( KonqDrag::decodeIsCutSelection( data ) )
(void) KURLDrag::decode( data, lst ); (void) KURLDrag::decode( data, lst );

@ -268,7 +268,7 @@ void PasswordDlg::setLayoutText( const TQString &txt )
{ {
mLayoutButton->setText( txt ); mLayoutButton->setText( txt );
TQSize sz = mLayoutButton->fontMetrics().size( 0, txt ); TQSize sz = mLayoutButton->fontMetrics().size( 0, txt );
int mrg = mLayoutButton->tqstyle().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; int mrg = mLayoutButton->style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg ); mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg );
} }
@ -790,7 +790,7 @@ void PasswordDlg::slotSwitchUser()
int fw = lv->frameWidth() * 2; int fw = lv->frameWidth() * 2;
TQSize hds( lv->header()->sizeHint() ); TQSize hds( lv->header()->sizeHint() );
lv->setMinimumWidth( fw + hds.width() + lv->setMinimumWidth( fw + hds.width() +
(ns > 10 ? tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) ); (ns > 10 ? style().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
lv->setFixedHeight( fw + hds.height() + lv->setFixedHeight( fw + hds.height() +
itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) ); itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) );
lv->header()->adjustHeaderSize(); lv->header()->adjustHeaderSize();

@ -276,7 +276,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
freeStrArr( tlist ); freeStrArr( tlist );
targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget ); targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget );
TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh ); TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh );
int spc = kapp->tqstyle().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ) int spc = kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
+ howGroup->insideSpacing(); + howGroup->insideSpacing();
hb->addSpacing( spc ); hb->addSpacing( spc );
hb->addWidget( targets ); hb->addWidget( targets );
@ -484,7 +484,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
lfrm->setFrameStyle( TQFrame::NoFrame ); lfrm->setFrameStyle( TQFrame::NoFrame );
else else
lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
lfrm->setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) ); lfrm->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) );
// we need to set the minimum size for the logout box, since it // we need to set the minimum size for the logout box, since it
// gets too small if there all options are not available // gets too small if there all options are not available
lfrm->setMinimumSize(300,120); lfrm->setMinimumSize(300,120);

@ -136,7 +136,7 @@ public:
maxw = thisw; maxw = thisw;
} }
cachedSizeHint.setWidth( cachedSizeHint.setWidth(
tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) + style().pixelMetric( TQStyle::PM_ScrollBarExtent ) +
frameWidth() * 2 + maxw ); frameWidth() * 2 + maxw );
} }
return cachedSizeHint; return cachedSizeHint;

@ -150,7 +150,7 @@ KGVerify::pluginName() const
TQString name( greetPlugins[pluginList[curPlugin]].library->fileName() ); TQString name( greetPlugins[pluginList[curPlugin]].library->fileName() );
uint st = name.findRev( '/' ) + 1; uint st = name.findRev( '/' ) + 1;
uint en = name.find( '.', st ); uint en = name.find( '.', st );
if (en - st > 7 && TQConstString( name.tqunicode() + st, 7 ).string() == "kgreet_") if (en - st > 7 && TQConstString( name.unicode() + st, 7 ).string() == "kgreet_")
st += 7; st += 7;
return name.mid( st, en - st ); return name.mid( st, en - st );
} }
@ -163,7 +163,7 @@ showWidgets( TQLayoutItem *li )
if ((w = li->widget())) if ((w = li->widget()))
w->show(); w->show();
else if ((l = li->tqlayout())) { else if ((l = li->layout())) {
TQLayoutIterator it = l->iterator(); TQLayoutIterator it = l->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it) for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
showWidgets( itm ); showWidgets( itm );

@ -116,7 +116,7 @@ KdmLabel::setTextInt( const TQString &txt)
if (cAccel != -1) { if (cAccel != -1) {
cText.remove('&'); cText.remove('&');
myAccel = new TQAccel(parentWidget()); myAccel = new TQAccel(parentWidget());
myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().tqunicode()); myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode());
connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel())); connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel()));
} }
} }

@ -178,7 +178,7 @@ void KfindWindow::copySelection()
if (drag_obj) if (drag_obj)
{ {
TQClipboard *cb = kapp->tqclipboard(); TQClipboard *cb = kapp->clipboard();
cb->setData(drag_obj); cb->setData(drag_obj);
} }
} }

@ -62,7 +62,7 @@ View::~View()
void View::copySelectedText() void View::copySelectedText()
{ {
kapp->tqclipboard()->setText( selectedText() ); kapp->clipboard()->setText( selectedText() );
} }
bool View::openURL( const KURL &url ) bool View::openURL( const KURL &url )
@ -276,7 +276,7 @@ void View::showMenu( const TQString& url, const TQPoint& pos)
void View::slotCopyLink() void View::slotCopyLink()
{ {
TQApplication::tqclipboard()->setText(mCopyURL); TQApplication::clipboard()->setText(mCopyURL);
} }
bool View::prevPage(bool checkOnly) bool View::prevPage(bool checkOnly)

@ -86,23 +86,23 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
settings = new SettingsWidgetImp(prefs, zone, 0, "General"); settings = new SettingsWidgetImp(prefs, zone, 0, "General");
connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background());
settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background());
// Digital // Digital
digitalPage = new DigitalWidget(0, "DigitalClock"); digitalPage = new DigitalWidget(0, "DigitalClock");
settings->widgetStack->addWidget(digitalPage, 1); settings->widgetStack->addWidget(digitalPage, 1);
digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background());
// Analog // Analog
analogPage = new AnalogWidget(0, "AnalogClock"); analogPage = new AnalogWidget(0, "AnalogClock");
settings->widgetStack->addWidget(analogPage, 2); settings->widgetStack->addWidget(analogPage, 2);
analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background());
// Fuzzy // Fuzzy
fuzzyPage = new FuzzyWidget(0, "FuzzyClock"); fuzzyPage = new FuzzyWidget(0, "FuzzyClock");
settings->widgetStack->addWidget(fuzzyPage, 3); settings->widgetStack->addWidget(fuzzyPage, 3);
fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background());
connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)), connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled())); TQT_SLOT(dateToggled()));
@ -386,7 +386,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
p.drawTiledPixmap(0, 0, width(), height(), lcdPattern); p.drawTiledPixmap(0, 0, width(), height(), lcdPattern);
} }
else if (_prefs->digitalBackgroundColor() != else if (_prefs->digitalBackgroundColor() !=
KApplication::tqpalette().active().background()) KApplication::palette().active().background())
{ {
p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor()); p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor());
} }
@ -553,7 +553,7 @@ void AnalogClock::paintEvent( TQPaintEvent * )
paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern); paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern);
} }
else if (_prefs->analogBackgroundColor() != KApplication::tqpalette().active().background()) else if (_prefs->analogBackgroundColor() != KApplication::palette().active().background())
{ {
_spPx->fill(_prefs->analogBackgroundColor()); _spPx->fill(_prefs->analogBackgroundColor());
} }
@ -1169,7 +1169,7 @@ void ClockApplet::preferences(bool timezone)
void ClockApplet::updateFollowBackground() void ClockApplet::updateFollowBackground()
{ {
TQColor globalBgroundColor = KApplication::tqpalette().active().background(); TQColor globalBgroundColor = KApplication::palette().active().background();
TQColor bgColor; TQColor bgColor;
switch (_prefs->type()) switch (_prefs->type())
@ -1306,7 +1306,7 @@ void ClockApplet::setTimerTo60()
void ClockApplet::setBackground() void ClockApplet::setBackground()
{ {
TQColor globalBgroundColor = KApplication::tqpalette().active().background(); TQColor globalBgroundColor = KApplication::palette().active().background();
TQColor fgColor, bgColor; TQColor fgColor, bgColor;
if (!_clock) if (!_clock)
@ -1371,7 +1371,7 @@ void ClockApplet::globalPaletteChange()
if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting) if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting)
return; return;
TQColor globalBgroundColor = KApplication::tqpalette().active().background(); TQColor globalBgroundColor = KApplication::palette().active().background();
if (m_dateFollowBackgroundSetting) if (m_dateFollowBackgroundSetting)
_prefs->setDateBackgroundColor(globalBgroundColor); _prefs->setDateBackgroundColor(globalBgroundColor);
@ -1605,7 +1605,7 @@ void ClockApplet::slotCopyMenuActivated( int id )
{ {
TQPopupMenu *m = (TQPopupMenu *) sender(); TQPopupMenu *m = (TQPopupMenu *) sender();
TQString s = m->text(id); TQString s = m->text(id);
TQApplication::tqclipboard()->setText(s); TQApplication::clipboard()->setText(s);
} }
TQTime ClockApplet::clockGetTime() TQTime ClockApplet::clockGetTime()

@ -20,11 +20,11 @@
<group name="Date"> <group name="Date">
<entry name="DateForegroundColor" type="Color" key="Foreground_Color"> <entry name="DateForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label> <label>Foreground color.</label>
<default code="true">KApplication::tqpalette().active().text()</default> <default code="true">KApplication::palette().active().text()</default>
</entry> </entry>
<entry name="DateBackgroundColor" type="Color" key="Background_Color"> <entry name="DateBackgroundColor" type="Color" key="Background_Color">
<label>Foreground color.</label> <label>Foreground color.</label>
<default code="true">KApplication::tqpalette().active().background()</default> <default code="true">KApplication::palette().active().background()</default>
</entry> </entry>
<entry name="DateFont" type="Font" key="Font"> <entry name="DateFont" type="Font" key="Font">
<label>Font for the clock.</label> <label>Font for the clock.</label>
@ -63,11 +63,11 @@ defFont.setBold(true);
</entry> </entry>
<entry name="PlainForegroundColor" type="Color" key="Foreground_Color"> <entry name="PlainForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label> <label>Foreground color.</label>
<default code="true">KApplication::tqpalette().active().text()</default> <default code="true">KApplication::palette().active().text()</default>
</entry> </entry>
<entry name="PlainBackgroundColor" type="Color" key="Background_Color"> <entry name="PlainBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label> <label>Background color.</label>
<default code="true">KApplication::tqpalette().active().background()</default> <default code="true">KApplication::palette().active().background()</default>
</entry> </entry>
</group> </group>
<group name="Digital"> <group name="Digital">
@ -89,15 +89,15 @@ defFont.setBold(true);
</entry> </entry>
<entry name="DigitalForegroundColor" type="Color" key="Foreground_Color"> <entry name="DigitalForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label> <label>Foreground color.</label>
<default code="true">KApplication::tqpalette().active().text()</default> <default code="true">KApplication::palette().active().text()</default>
</entry> </entry>
<entry name="DigitalBackgroundColor" type="Color" key="Background_Color"> <entry name="DigitalBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label> <label>Background color.</label>
<default code="true">KApplication::tqpalette().active().background()</default> <default code="true">KApplication::palette().active().background()</default>
</entry> </entry>
<entry name="DigitalShadowColor" type="Color" key="Shadow_Color"> <entry name="DigitalShadowColor" type="Color" key="Shadow_Color">
<label>Shadow color.</label> <label>Shadow color.</label>
<default code="true">KApplication::tqpalette().active().mid()</default> <default code="true">KApplication::palette().active().mid()</default>
</entry> </entry>
<entry name="DigitalBlink" type="Bool" key="Blink"> <entry name="DigitalBlink" type="Bool" key="Blink">
<label>Blink</label> <label>Blink</label>
@ -127,15 +127,15 @@ defFont.setBold(true);
</entry> </entry>
<entry name="AnalogForegroundColor" type="Color" key="Foreground_Color"> <entry name="AnalogForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label> <label>Foreground color.</label>
<default code="true">KApplication::tqpalette().active().text()</default> <default code="true">KApplication::palette().active().text()</default>
</entry> </entry>
<entry name="AnalogBackgroundColor" type="Color" key="Background_Color"> <entry name="AnalogBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label> <label>Background color.</label>
<default code="true">KApplication::tqpalette().active().background()</default> <default code="true">KApplication::palette().active().background()</default>
</entry> </entry>
<entry name="AnalogShadowColor" type="Color" key="Shadow_Color"> <entry name="AnalogShadowColor" type="Color" key="Shadow_Color">
<label>Shadow color.</label> <label>Shadow color.</label>
<default code="true">KApplication::tqpalette().active().mid()</default> <default code="true">KApplication::palette().active().mid()</default>
</entry> </entry>
<entry name="AnalogLCDStyle" type="Bool" key="LCD_Style"> <entry name="AnalogLCDStyle" type="Bool" key="LCD_Style">
<label>LCD Style</label> <label>LCD Style</label>
@ -168,11 +168,11 @@ defFont=KGlobalSettings::generalFont();
</entry> </entry>
<entry name="FuzzyForegroundColor" type="Color" key="Foreground_Color"> <entry name="FuzzyForegroundColor" type="Color" key="Foreground_Color">
<label>Foreground color.</label> <label>Foreground color.</label>
<default code="true">KApplication::tqpalette().active().text()</default> <default code="true">KApplication::palette().active().text()</default>
</entry> </entry>
<entry name="FuzzyBackgroundColor" type="Color" key="Background_Color"> <entry name="FuzzyBackgroundColor" type="Color" key="Background_Color">
<label>Background color.</label> <label>Background color.</label>
<default code="true">KApplication::tqpalette().active().background()</default> <default code="true">KApplication::palette().active().background()</default>
</entry> </entry>
<entry name="Fuzzyness" type="Int"> <entry name="Fuzzyness" type="Int">
<label>Fuzzyness</label> <label>Fuzzyness</label>

@ -145,7 +145,7 @@ void MediumButton::slotCopy()
{ {
KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false); KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false);
TQApplication::tqclipboard()->setData( obj ); TQApplication::clipboard()->setData( obj );
} }
void MediumButton::dragEnterEvent(TQDragEnterEvent* e) void MediumButton::dragEnterEvent(TQDragEnterEvent* e)

@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
} }
// Now strip 'kdeinit:' prefix. // Now strip 'kdeinit:' prefix.
TQString tqunicode(TQString::fromLocal8Bit(s)); TQString unicode(TQString::fromLocal8Bit(s));
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
int mib[4] ; int mib[4] ;
@ -280,12 +280,12 @@ NaughtyProcessMonitor::processName(ulong pid) const
} }
// Now strip 'kdeinit:' prefix. // Now strip 'kdeinit:' prefix.
TQString tqunicode(TQString::fromLocal8Bit(argv[0])); TQString unicode(TQString::fromLocal8Bit(argv[0]));
free (argv) ; free (argv) ;
#endif #endif
TQStringList parts(TQStringList::split(' ', tqunicode)); TQStringList parts(TQStringList::split(' ', unicode));
TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0]; TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0];

@ -75,14 +75,14 @@ AppletHandle::AppletHandle(AppletContainer* parent)
int AppletHandle::heightForWidth( int /* w */ ) const int AppletHandle::heightForWidth( int /* w */ ) const
{ {
int size = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
return size; return size;
} }
int AppletHandle::widthForHeight( int /* h */ ) const int AppletHandle::widthForHeight( int /* h */ ) const
{ {
int size = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
return size; return size;
} }
@ -310,7 +310,7 @@ AppletHandleDrag::AppletHandleDrag(AppletHandle* parent)
TQSize AppletHandleDrag::minimumSizeHint() const TQSize AppletHandleDrag::minimumSizeHint() const
{ {
int wh = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
if (m_parent->orientation() == Qt::Horizontal) if (m_parent->orientation() == Qt::Horizontal)
{ {
@ -367,7 +367,7 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *)
TQRect r = rect(); TQRect r = rect();
tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, style().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r,
colorGroup(), flags); colorGroup(), flags);
} }
else else
@ -384,7 +384,7 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent)
TQSize AppletHandleButton::minimumSizeHint() const TQSize AppletHandleButton::minimumSizeHint() const
{ {
int height = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
int width = height; int width = height;
if (m_parent->orientation() == Qt::Horizontal) if (m_parent->orientation() == Qt::Horizontal)

@ -1408,11 +1408,11 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e)
// KPanelExtension::Left/Right don't seem to draw the separators at all! // KPanelExtension::Left/Right don't seem to draw the separators at all!
if (position() == KPanelExtension::Left) { if (position() == KPanelExtension::Left) {
rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height()); rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height());
tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
} }
else if (position() == KPanelExtension::Right) { else if (position() == KPanelExtension::Right) {
rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height()); rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height());
tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
} }
else if (position() == KPanelExtension::Top) { else if (position() == KPanelExtension::Top) {
// Nastiness to both vertically flip the PE_Separator // Nastiness to both vertically flip the PE_Separator
@ -1422,12 +1422,12 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e)
rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH);
TQColorGroup darkcg = colorGroup(); TQColorGroup darkcg = colorGroup();
darkcg.setColor(TQColorGroup::Light, colorGroup().dark()); darkcg.setColor(TQColorGroup::Light, colorGroup().dark());
tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); style().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default );
p.drawPixmap(0,height()-2,inv_pm); p.drawPixmap(0,height()-2,inv_pm);
} }
else { else {
rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH);
tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default ); style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default );
} }
} }
} }

@ -1958,7 +1958,7 @@ void DragIndicator::paintEvent(TQPaintEvent*)
{ {
TQPainter painter(this); TQPainter painter(this);
TQRect rect(0, 0, width(), height()); TQRect rect(0, 0, width(), height());
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), style().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(),
TQStyle::Style_Default, colorGroup().base() ); TQStyle::Style_Default, colorGroup().base() );
} }

@ -199,7 +199,7 @@ void Kicker::paletteChanged()
{ {
KConfigGroup c(KGlobal::config(), "General"); KConfigGroup c(KGlobal::config(), "General");
KickerSettings::setTintColor(c.readColorEntry("TintColor", KickerSettings::setTintColor(c.readColorEntry("TintColor",
&tqpalette().active().mid())); &palette().active().mid()));
KickerSettings::self()->writeConfig(); KickerSettings::self()->writeConfig();
} }

@ -421,7 +421,7 @@ void PanelKMenu::repairDisplay(void) {
// Now do a nasty hack to prevent search bar merging into the side image // Now do a nasty hack to prevent search bar merging into the side image
// This forces a layout/repaint of the qpopupmenu // This forces a layout/repaint of the qpopupmenu
repaint(); // This ensures that the side bar image was applied repaint(); // This ensures that the side bar image was applied
styleChange(tqstyle()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. styleChange(style()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu.
update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above
} }
} }
@ -624,7 +624,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e)
TQPainter p(this); TQPainter p(this);
p.setClipRegion(e->region()); p.setClipRegion(e->region());
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
TQRect( 0, 0, width(), height() ), TQRect( 0, 0, width(), height() ),
colorGroup(), TQStyle::Style_Default, colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0 ) ); TQStyleOption( frameWidth(), 0 ) );

@ -522,7 +522,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
m_sloppySourceClicked = true; m_sloppySourceClicked = true;
if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) { if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) {
int timeout= tqstyle().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); int timeout= style().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay);
if (m_sloppySourceClicked) if (m_sloppySourceClicked)
timeout = 3000; timeout = 3000;
m_sloppyTimer.start(timeout); m_sloppyTimer.start(timeout);

@ -58,7 +58,7 @@ void KickoffTabBar::paint(TQPainter* p, TQTab* t, bool selected) const
//selection flags //selection flags
if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) if(t->rect().contains(mapFromGlobal(TQCursor::pos())))
flags |= TQStyle::Style_MouseOver; flags |= TQStyle::Style_MouseOver;
tqstyle().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), style().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(),
colorGroup(), flags, TQStyleOption(t) ); colorGroup(), flags, TQStyleOption(t) );
paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() ); paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() );
@ -70,7 +70,7 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha
TQRect r = br; TQRect r = br;
bool selected = m_tabsActivated && (currentTab() == t->identifier()); bool selected = m_tabsActivated && (currentTab() == t->identifier());
int vframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
p->setFont( font() ); p->setFont( font() );
TQFontMetrics fm = p->fontMetrics(); TQFontMetrics fm = p->fontMetrics();
@ -116,8 +116,8 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha
// flags |= TQStyle::Style_Sunken; // flags |= TQStyle::Style_Sunken;
if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) if(t->rect().contains(mapFromGlobal(TQCursor::pos())))
flags |= TQStyle::Style_MouseOver; flags |= TQStyle::Style_MouseOver;
tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, rt, style().drawControl( TQStyle::CE_TabBarLabel, p, this, rt,
t->isEnabled() ? colorGroup(): tqpalette().disabled(), t->isEnabled() ? colorGroup(): palette().disabled(),
flags, TQStyleOption(t) ); flags, TQStyleOption(t) );
} }
@ -135,9 +135,9 @@ void KickoffTabBar::layoutTabs()
TQFontMetrics fm = fontMetrics(); TQFontMetrics fm = fontMetrics();
int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4; int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4;
int hframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); int hframe = style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
int vframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
int overlap = tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, this ); int overlap = style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
TQSize s; TQSize s;
for (int t = 0; t < count(); ++t) for (int t = 0; t < count(); ++t)
@ -161,7 +161,7 @@ void KickoffTabBar::layoutTabs()
iw = tab->iconSet()->pixmap( TQIconSet::Large, TQIconSet::Normal ).width(); iw = tab->iconSet()->pixmap( TQIconSet::Large, TQIconSet::Normal ).width();
int w = QMAX(iw, fw + 6 + 6 ) + hframe; int w = QMAX(iw, fw + 6 + 6 ) + hframe;
h += ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + vframe; h += ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + vframe;
tab->setRect(TQRect(TQPoint(x, 0), tqstyle().tqsizeFromContents(TQStyle::CT_TabBarTab, this, tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this,
TQSize(w, h), TQStyleOption(tab)))); TQSize(w, h), TQStyleOption(tab))));
x += tab->rect().width() - overlap; x += tab->rect().width() - overlap;
} }

@ -46,7 +46,7 @@ public:
{ {
p->save(); p->save();
TQRect r(x, y, w, h); TQRect r(x, y, w, h);
kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu,
p, r, cg); p, r, cg);
if (!m_desktopName.isEmpty()) if (!m_desktopName.isEmpty())
@ -73,7 +73,7 @@ public:
{ {
TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName);
size.setHeight(size.height() + size.setHeight(size.height() +
(kapp->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
return size; return size;
} }

@ -81,7 +81,7 @@
<entry name="TintColor" type="Color" > <entry name="TintColor" type="Color" >
<label>The tint color used to colorize transparent panels</label> <label>The tint color used to colorize transparent panels</label>
<default code="true">(TQApplication::tqpalette().active().mid())</default> <default code="true">(TQApplication::palette().active().mid())</default>
<whatsthis>This option sets the color to use when tinting transparent panels</whatsthis> <whatsthis>This option sets the color to use when tinting transparent panels</whatsthis>
</entry> </entry>

@ -539,7 +539,7 @@ void PanelButton::drawButton(TQPainter *p)
if (m_tileColor.isValid()) if (m_tileColor.isValid())
{ {
p->fillRect(rect(), m_tileColor); p->fillRect(rect(), m_tileColor);
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
} }
else if (paletteBackgroundPixmap()) else if (paletteBackgroundPixmap())
{ {
@ -559,7 +559,7 @@ void PanelButton::drawButton(TQPainter *p)
else if (isDown() || isOn()) else if (isDown() || isOn())
{ {
// Draw shapes to indicate the down state. // Draw shapes to indicate the down state.
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
} }
drawButtonLabel(p); drawButtonLabel(p);
@ -569,7 +569,7 @@ void PanelButton::drawButton(TQPainter *p)
int x1, y1, x2, y2; int x1, y1, x2, y2;
TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
TQStyle::Style_Default, colorGroup().button()); TQStyle::Style_Default, colorGroup().button());
} }
} }
@ -581,7 +581,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
if (m_tileColor.isValid()) if (m_tileColor.isValid())
{ {
p->fillRect(rect(), m_tileColor); p->fillRect(rect(), m_tileColor);
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
} }
else if (paletteBackgroundPixmap()) else if (paletteBackgroundPixmap())
{ {
@ -595,10 +595,10 @@ void PanelButton::drawDeepButton(TQPainter *p)
TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2); TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2);
if (isDown() || isOn()) { if (isDown() || isOn()) {
tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down); style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down);
} }
else { else {
tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised); style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
} }
drawButtonLabel(p,0,FALSE); drawButtonLabel(p,0,FALSE);
@ -608,7 +608,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
int x1, y1, x2, y2; int x1, y1, x2, y2;
TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
TQStyle::Style_Default, colorGroup().button()); TQStyle::Style_Default, colorGroup().button());
} }
} }
@ -718,7 +718,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
if (m_drawArrow && (m_highlight || active) && drawArrow) if (m_drawArrow && (m_highlight || active) && drawArrow)
{ {
TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp; TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp;
int arrowSize = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator); int arrowSize = style().pixelMetric(TQStyle::PM_MenuButtonIndicator);
TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize); TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
switch (m_arrowDirection) switch (m_arrowDirection)
@ -762,7 +762,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
{ {
flags |= TQStyle::Style_Down; flags |= TQStyle::Style_Down;
} }
tqstyle().tqdrawPrimitive(e, p, r, colorGroup(), flags); style().tqdrawPrimitive(e, p, r, colorGroup(), flags);
} }
} }

@ -99,7 +99,7 @@ void SimpleButton::drawButton( TQPainter *p )
if (m_highlight || isDown() || isOn()) { if (m_highlight || isDown() || isOn()) {
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down; if (isDown() || isOn()) flags |= TQStyle::Style_Down;
tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags); style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
} }
} }
@ -263,7 +263,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down; if (isDown() || isOn()) flags |= TQStyle::Style_Down;
tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags); style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
if (m_forceStandardCursor) { if (m_forceStandardCursor) {
SimpleButton::drawButton(p); SimpleButton::drawButton(p);

@ -755,7 +755,7 @@ void TOM::paintEvent(TQPaintEvent * e)
TQPainter p(this); TQPainter p(this);
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
TQRect( 0, 0, width(), height() ), TQRect( 0, 0, width(), height() ),
colorGroup(), TQStyle::Style_Default, colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0 ) ); TQStyleOption( frameWidth(), 0 ) );

@ -314,7 +314,7 @@ TQSizePolicy TaskContainer::sizePolicy() const
void TaskContainer::resizeEvent( TQResizeEvent * ) void TaskContainer::resizeEvent( TQResizeEvent * )
{ {
// calculate the icon rect // calculate the icon rect
TQRect br( tqstyle().subRect( TQStyle::SR_PushButtonContents, this ) ); TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) );
iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this );
} }
@ -533,7 +533,7 @@ void TaskContainer::drawButton(TQPainter *p)
font.setBold(active); font.setBold(active);
TQColorGroup colors = tqpalette().active(); TQColorGroup colors = palette().active();
if (TaskBarSettings::useCustomColors()) if (TaskBarSettings::useCustomColors())
{ {
@ -582,20 +582,20 @@ void TaskContainer::drawButton(TQPainter *p)
bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate));
bool reverse = TQApplication::reverseLayout(); bool reverse = TQApplication::reverseLayout();
TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this)); TQRect br(style().subRect(TQStyle::SR_PushButtonContents, this));
TQPoint shift = TQPoint(tqstyle().pixelMetric(TQStyle::PM_ButtonShiftHorizontal), TQPoint shift = TQPoint(style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal),
tqstyle().pixelMetric(TQStyle::PM_ButtonShiftVertical)); style().pixelMetric(TQStyle::PM_ButtonShiftVertical));
// draw button background // draw button background
if (drawButton) if (drawButton)
{ {
if (KickerSettings::showDeepButtons()) { if (KickerSettings::showDeepButtons()) {
tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p,
TQRect(1, 1, width()-3, height()-2), TQRect(1, 1, width()-3, height()-2),
colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised); colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised);
} }
else { else {
tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p,
TQRect(1, 1, width()-2, height()-2), TQRect(1, 1, width()-2, height()-2),
colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised); colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised);
} }
@ -794,7 +794,7 @@ void TaskContainer::drawButton(TQPainter *p)
flags |= TQStyle::Style_Down; flags |= TQStyle::Style_Down;
} }
tqstyle().tqdrawPrimitive(e, p, ar, colors, flags); style().tqdrawPrimitive(e, p, ar, colors, flags);
} }
// draw mouse over frame in transparent mode // draw mouse over frame in transparent mode

@ -1375,7 +1375,7 @@ TQPixmap Task::thumbnail(int maxDimension)
int thumbnailHeight = (int)(winAttr.height * factor); int thumbnailHeight = (int)(winAttr.height * factor);
TQPixmap thumbnail(thumbnailWidth, thumbnailHeight); TQPixmap thumbnail(thumbnailWidth, thumbnailHeight);
thumbnail.fill(TQApplication::tqpalette().active().background()); thumbnail.fill(TQApplication::palette().active().background());
#if 0 // TQImage::smoothScale() scaling #if 0 // TQImage::smoothScale() scaling
TQPixmap full(winAttr.width, winAttr.height); TQPixmap full(winAttr.width, winAttr.height);

@ -148,9 +148,9 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
p.fillRect(0, 0, length, 20, Qt::red); p.fillRect(0, 0, length, 20, Qt::red);
p.fillRect(length, 0, 150-length, 20, Qt::green); p.fillRect(length, 0, 150-length, 20, Qt::green);
TQColorGroup cg = TQApplication::tqpalette().active(); TQColorGroup cg = TQApplication::palette().active();
TQApplication::tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &p, TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, &p,
TQRect(0, 0, 150, 20), cg, TQRect(0, 0, 150, 20), cg,
TQStyle::Style_Sunken); TQStyle::Style_Sunken);

@ -93,7 +93,7 @@ namespace KioSMTP {
static bool isUsAscii( const TQString & s ) { static bool isUsAscii( const TQString & s ) {
for ( uint i = 0 ; i < s.length() ; ++i ) for ( uint i = 0 ; i < s.length() ; ++i )
if ( s[i].tqunicode() > 127 ) return false; if ( s[i].unicode() > 127 ) return false;
return true; return true;
} }

@ -109,8 +109,8 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
void ClipboardPoll::initPolling() void ClipboardPoll::initPolling()
{ {
connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged())); connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged()));
connect( kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() )); connect( kapp->clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() ));
connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout())); connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout()));
timer.start( 1000, false ); timer.start( 1000, false );
selection.atom = XA_PRIMARY; selection.atom = XA_PRIMARY;
@ -147,7 +147,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
if( xfixes_event_base != -1 && e->type == xfixes_event_base + XFixesSelectionNotify ) if( xfixes_event_base != -1 && e->type == xfixes_event_base + XFixesSelectionNotify )
{ {
XFixesSelectionNotifyEvent* ev = reinterpret_cast< XFixesSelectionNotifyEvent* >( e ); XFixesSelectionNotifyEvent* ev = reinterpret_cast< XFixesSelectionNotifyEvent* >( e );
if( ev->selection == XA_PRIMARY && !kapp->tqclipboard()->ownsSelection()) if( ev->selection == XA_PRIMARY && !kapp->clipboard()->ownsSelection())
{ {
#ifdef NOISY_KLIPPER_ #ifdef NOISY_KLIPPER_
kdDebug() << "SELECTION CHANGED (XFIXES)" << endl; kdDebug() << "SELECTION CHANGED (XFIXES)" << endl;
@ -155,7 +155,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
SET_QT_X_TIME(ev->timestamp); SET_QT_X_TIME(ev->timestamp);
emit clipboardChanged( true ); emit clipboardChanged( true );
} }
else if( ev->selection == xa_clipboard && !kapp->tqclipboard()->ownsClipboard()) else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard())
{ {
#ifdef NOISY_KLIPPER_ #ifdef NOISY_KLIPPER_
kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl; kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl;
@ -218,13 +218,13 @@ void ClipboardPoll::updateQtOwnership( SelectionData& data )
void ClipboardPoll::timeout() void ClipboardPoll::timeout()
{ {
KlipperWidget::updateTimestamp(); KlipperWidget::updateTimestamp();
if( !kapp->tqclipboard()->ownsSelection() && checkTimestamp( selection ) ) { if( !kapp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
#ifdef NOISY_KLIPPER_ #ifdef NOISY_KLIPPER_
kdDebug() << "SELECTION CHANGED" << endl; kdDebug() << "SELECTION CHANGED" << endl;
#endif #endif
emit clipboardChanged( true ); emit clipboardChanged( true );
} }
if( !kapp->tqclipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) { if( !kapp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
#ifdef NOISY_KLIPPER_ #ifdef NOISY_KLIPPER_
kdDebug() << "CLIPBOARD CHANGED" << endl; kdDebug() << "CLIPBOARD CHANGED" << endl;
#endif #endif

@ -109,7 +109,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
Q_ASSERT( id != -1 ); // Be sure that the item was inserted. Q_ASSERT( id != -1 ); // Be sure that the item was inserted.
TQMenuItem* mi = proxy_for_menu->findItem( id ); TQMenuItem* mi = proxy_for_menu->findItem( id );
int fontheight = TQFontMetrics( proxy_for_menu->fontMetrics() ).height(); int fontheight = TQFontMetrics( proxy_for_menu->fontMetrics() ).height();
int itemheight = proxy_for_menu->tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, int itemheight = proxy_for_menu->style().tqsizeFromContents(TQStyle::CT_PopupMenuItem,
proxy_for_menu, proxy_for_menu,
TQSize( 0, fontheight ), TQSize( 0, fontheight ),
TQStyleOption(mi,10,0) ).height(); TQStyleOption(mi,10,0) ).height();

@ -142,7 +142,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config )
updateTimestamp(); // read initial X user time updateTimestamp(); // read initial X user time
setBackgroundMode( X11ParentRelative ); setBackgroundMode( X11ParentRelative );
clip = kapp->tqclipboard(); clip = kapp->clipboard();
connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow())); connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow()));
m_overflowClearTimer.start( 1000 ); m_overflowClearTimer.start( 1000 );

@ -295,7 +295,7 @@ TQString KonqAboutPageFactory::specs()
.arg( i18n("Secure Sockets Layer") ) .arg( i18n("Secure Sockets Layer") )
.arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") ) .arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") )
.arg( i18n("OpenSSL") ) .arg( i18n("OpenSSL") )
.arg( i18n("Bidirectional 16bit tqunicode support") ) .arg( i18n("Bidirectional 16bit unicode support") )
.arg( i18n("built-in") ) .arg( i18n("built-in") )
.arg( i18n("AutoCompletion for forms") ) .arg( i18n("AutoCompletion for forms") )
.arg( i18n("built-in") ) .arg( i18n("built-in") )

@ -121,7 +121,7 @@
<td valign="top"><a href="http://www.openssl.org">%1<!--OpenSSL--></a></td> <td valign="top"><a href="http://www.openssl.org">%1<!--OpenSSL--></a></td>
</tr> </tr>
<tr bgcolor="#fff4c9"> <tr bgcolor="#fff4c9">
<td valign="top">%1<!--Bidirectional 16bit tqunicode support--></td> <td valign="top">%1<!--Bidirectional 16bit unicode support--></td>
<td valign="top">&nbsp;</td> <td valign="top">&nbsp;</td>
<td valign="top">%1<!--built-in--></td> <td valign="top">%1<!--built-in--></td>
</tr> </tr>

@ -345,7 +345,7 @@ void ActionsImpl::slotCopy() {
TQValueList<KBookmark> bookmarks TQValueList<KBookmark> bookmarks
= ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */); KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */);
kapp->tqclipboard()->setData(data, TQClipboard::Clipboard); kapp->clipboard()->setData(data, TQClipboard::Clipboard);
} }
void ActionsImpl::slotPaste() { void ActionsImpl::slotPaste() {
@ -353,7 +353,7 @@ void ActionsImpl::slotPaste() {
KEBMacroCommand *mcmd = KEBMacroCommand *mcmd =
CmdGen::insertMimeSource( CmdGen::insertMimeSource(
i18n("Paste"), i18n("Paste"),
kapp->tqclipboard()->data(TQClipboard::Clipboard), kapp->clipboard()->data(TQClipboard::Clipboard),
ListView::self()->userAddress()); ListView::self()->userAddress());
CmdHistory::self()->didCommand(mcmd); CmdHistory::self()->didCommand(mcmd);
} }

@ -247,7 +247,7 @@ KEBApp::KEBApp(
m_dcopIface = new KBookmarkEditorIface(); m_dcopIface = new KBookmarkEditorIface();
connect(kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ), connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ),
TQT_SLOT( slotClipboardDataChanged() )); TQT_SLOT( slotClipboardDataChanged() ));
ListView::self()->connectSignals(); ListView::self()->connectSignals();
@ -319,7 +319,7 @@ void KEBApp::slotClipboardDataChanged() {
// kdDebug() << "KEBApp::slotClipboardDataChanged" << endl; // kdDebug() << "KEBApp::slotClipboardDataChanged" << endl;
if (!m_readOnly) { if (!m_readOnly) {
m_canPaste = KBookmarkDrag::canDecode( m_canPaste = KBookmarkDrag::canDecode(
kapp->tqclipboard()->data(TQClipboard::Clipboard)); kapp->clipboard()->data(TQClipboard::Clipboard));
updateActions(); updateActions();
} }
} }

@ -540,7 +540,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) { if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) {
// check if the pixmap was clicked // check if the pixmap was clicked
int x = e->pos().x(); int x = e->pos().x();
int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
if ( x > x0 + 2 && x < lineEdit()->x() ) { if ( x > x0 + 2 && x < lineEdit()->x() ) {
m_dragStart = e->pos(); m_dragStart = e->pos();
@ -551,7 +551,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
// check if the lock icon was clicked // check if the lock icon was clicked
int x = e->pos().x(); int x = e->pos().x();
int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x();
if ( x < x0 ) if ( x < x0 )
emit showPageSecurity(); emit showPageSecurity();
@ -604,7 +604,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
TQComboBox::paintEvent( pe ); TQComboBox::paintEvent( pe );
TQLineEdit *edit = lineEdit(); TQLineEdit *edit = lineEdit();
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField );
re = TQStyle::visualRect(re, this); re = TQStyle::visualRect(re, this);
if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) { if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) {
@ -723,8 +723,8 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
pmWidth = pm->width() + 5; pmWidth = pm->width() + 5;
} }
int entryWidth = listBox()->width() - listBox()->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) - int entryWidth = listBox()->width() - listBox()->style().pixelMetric( TQStyle::PM_ScrollBarExtent ) -
2 * listBox()->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); 2 * listBox()->style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
int titleWidth = ( entryWidth / 3 ) - 1; int titleWidth = ( entryWidth / 3 ) - 1;
int urlWidth = entryWidth - titleWidth - pmWidth - 2; int urlWidth = entryWidth - titleWidth - pmWidth - 2;

@ -274,7 +274,7 @@ void KonqFrameStatusBar::updateActiveStatus()
bool hasFocus = m_pParentKonqFrame->isActivePart(); bool hasFocus = m_pParentKonqFrame->isActivePart();
const TQColorGroup& activeCg = kapp->tqpalette().active(); const TQColorGroup& activeCg = kapp->palette().active();
setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() ); setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() );
static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) ); static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) );

@ -3494,7 +3494,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) );
connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) );
connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );
@ -3535,7 +3535,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) );
disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) );
disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );
@ -3563,7 +3563,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
void KonqMainWindow::slotClipboardDataChanged() void KonqMainWindow::slotClipboardDataChanged()
{ {
//kdDebug(1202) << "KonqMainWindow::slotClipboardDataChanged()" << endl; //kdDebug(1202) << "KonqMainWindow::slotClipboardDataChanged()" << endl;
TQMimeSource *data = TQApplication::tqclipboard()->data(); TQMimeSource *data = TQApplication::clipboard()->data();
m_paPaste->setEnabled( data->provides( "text/plain" ) ); m_paPaste->setEnabled( data->provides( "text/plain" ) );
slotCheckComboSelection(); slotCheckComboSelection();
} }
@ -3583,7 +3583,7 @@ void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, TQt::Butto
m_combo->clearTemporary(); m_combo->clearTemporary();
focusLocationBar(); focusLocationBar();
if ( state & Qt::MidButton ) if ( state & Qt::MidButton )
m_combo->setURL( TQApplication::tqclipboard()->text( TQClipboard::Selection ) ); m_combo->setURL( TQApplication::clipboard()->text( TQClipboard::Selection ) );
} }
void KonqMainWindow::slotForceSaveMainWindowSettings() void KonqMainWindow::slotForceSaveMainWindowSettings()

@ -440,8 +440,8 @@ void KonqFrameTabs::slotSubPopupMenuTabActivated( int _id)
void KonqFrameTabs::slotMouseMiddleClick() void KonqFrameTabs::slotMouseMiddleClick()
{ {
TQApplication::tqclipboard()->setSelectionMode( TQClipboard::Selection ); TQApplication::clipboard()->setSelectionMode( TQClipboard::Selection );
KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::tqclipboard()->text() ) ); KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
if ( !filteredURL.isEmpty() ) { if ( !filteredURL.isEmpty() ) {
KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false); KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false);
if (newView == 0L) return; if (newView == 0L) return;
@ -461,8 +461,8 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
} }
} }
else { else {
TQApplication::tqclipboard()->setSelectionMode( TQClipboard::Selection ); TQApplication::clipboard()->setSelectionMode( TQClipboard::Selection );
KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::tqclipboard()->text() ) ); KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
if ( !filteredURL.isEmpty() ) { if ( !filteredURL.isEmpty() ) {
KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w); KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w);
if (frame) { if (frame) {

@ -144,7 +144,7 @@ void ListViewBrowserExtension::updateActions()
void ListViewBrowserExtension::copySelection( bool move ) void ListViewBrowserExtension::copySelection( bool move )
{ {
KonqDrag *urlData = new KonqDrag( m_listView->listViewWidget()->selectedUrls(false), m_listView->listViewWidget()->selectedUrls(true), move ); KonqDrag *urlData = new KonqDrag( m_listView->listViewWidget()->selectedUrls(false), m_listView->listViewWidget()->selectedUrls(true), move );
TQApplication::tqclipboard()->setData( urlData ); TQApplication::clipboard()->setData( urlData );
} }
void ListViewBrowserExtension::paste() void ListViewBrowserExtension::paste()

@ -551,7 +551,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )
TQPoint pt( m_rubber->x(), m_rubber->y() ); TQPoint pt( m_rubber->x(), m_rubber->y() );
pt = contentsToViewport( pt ); pt = contentsToViewport( pt );
tqstyle().tqdrawPrimitive( TQStyle::PE_RubberBand, p, style().tqdrawPrimitive( TQStyle::PE_RubberBand, p,
TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
colorGroup(), TQStyle::Style_Default, colorGroup().base() ); colorGroup(), TQStyle::Style_Default, colorGroup().base() );

@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
if ( !bookmark.isGroup() ) if ( !bookmark.isGroup() )
{ {
kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Selection ); TQClipboard::Selection );
kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Clipboard ); TQClipboard::Clipboard );
} }
} }

@ -162,7 +162,7 @@ void KonqSidebarDirTreeItem::itemSelected()
if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() ) if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() )
bInTrash = true; bInTrash = true;
TQMimeSource *data = TQApplication::tqclipboard()->data(); TQMimeSource *data = TQApplication::clipboard()->data();
bool paste = ( data->encodedData( data->format() ).size() != 0 ); bool paste = ( data->encodedData( data->format() ).size() != 0 );
tree()->enableActions( true, true, paste, true && !bInTrash, true, true ); tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
@ -197,7 +197,7 @@ void KonqSidebarDirTreeItem::paste()
{ {
// move or not move ? // move or not move ?
bool move = false; bool move = false;
TQMimeSource *data = TQApplication::tqclipboard()->data(); TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) { if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data ); move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl; kdDebug(1201) << "move (from clipboard data) = " << move << endl;

@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation()
{ {
if (!m_currentTopLevelItem) return; if (!m_currentTopLevelItem) return;
KURL url = m_currentTopLevelItem->externalURL(); KURL url = m_currentTopLevelItem->externalURL();
kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection ); kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard ); kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
} }
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////

@ -50,7 +50,7 @@ void KonqSidebarTreeTopLevelItem::setOpen( bool open )
void KonqSidebarTreeTopLevelItem::itemSelected() void KonqSidebarTreeTopLevelItem::itemSelected()
{ {
kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl; kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl;
TQMimeSource *data = TQApplication::tqclipboard()->data(); TQMimeSource *data = TQApplication::clipboard()->data();
bool paste = m_bTopLevelGroup && data->provides("text/uri-list"); bool paste = m_bTopLevelGroup && data->provides("text/uri-list");
tree()->enableActions( true, true, paste, true, true, true /*rename*/ ); tree()->enableActions( true, true, paste, true, true, true /*rename*/ );
} }
@ -157,7 +157,7 @@ void KonqSidebarTreeTopLevelItem::paste()
{ {
// move or not move ? // move or not move ?
bool move = false; bool move = false;
TQMimeSource *data = TQApplication::tqclipboard()->data(); TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) { if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data ); move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl; kdDebug(1201) << "move (from clipboard data) = " << move << endl;

@ -76,14 +76,14 @@ void KonqSidebar_Tree::cut()
{ {
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true ); TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true );
if (drag) if (drag)
TQApplication::tqclipboard()->setData( drag ); TQApplication::clipboard()->setData( drag );
} }
void KonqSidebar_Tree::copy() void KonqSidebar_Tree::copy()
{ {
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L ); TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L );
if (drag) if (drag)
TQApplication::tqclipboard()->setData( drag ); TQApplication::clipboard()->setData( drag );
} }
void KonqSidebar_Tree::paste() void KonqSidebar_Tree::paste()

@ -783,7 +783,7 @@ void TEScreen::compose(TQString compose)
TQChar c(image[lastPos].c); TQChar c(image[lastPos].c);
compose.prepend(c); compose.prepend(c);
compose.compose(); compose.compose();
image[lastPos].c = compose[0].tqunicode(); image[lastPos].c = compose[0].unicode();
} }
// Region commands ------------------------------------------------------------- // Region commands -------------------------------------------------------------

@ -193,10 +193,10 @@ void TEWidget::setColorTable(const ColorEntry table[])
xterm fonts have these at 0x00..0x1f. xterm fonts have these at 0x00..0x1f.
QT's iso mapping leaves 0x00..0x7f without any changes. But the graphicals QT's iso mapping leaves 0x00..0x7f without any changes. But the graphicals
come in here as proper tqunicode characters. come in here as proper unicode characters.
We treat non-iso10646 fonts as VT100 extended and do the requiered mapping We treat non-iso10646 fonts as VT100 extended and do the requiered mapping
from tqunicode to 0x00..0x1f. The remaining translation is then left to the from unicode to 0x00..0x1f. The remaining translation is then left to the
QCodec. QCodec.
*/ */
@ -215,7 +215,7 @@ unsigned short vt100_graphics[32] =
/* /*
static TQChar vt100extended(TQChar c) static TQChar vt100extended(TQChar c)
{ {
switch (c.tqunicode()) switch (c.unicode())
{ {
case 0x25c6 : return 1; case 0x25c6 : return 1;
case 0x2592 : return 2; case 0x2592 : return 2;
@ -391,7 +391,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
// konsole in opaque mode. // konsole in opaque mode.
bY = bX = 1; bY = bX = 1;
cb = TQApplication::tqclipboard(); cb = TQApplication::clipboard();
TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()), TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT(onClearSelection()) ); this, TQT_SLOT(onClearSelection()) );
@ -441,7 +441,7 @@ TEWidget::~TEWidget()
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/** /**
A table for emulating the simple (single width) tqunicode drawing chars. A table for emulating the simple (single width) unicode drawing chars.
It represents the 250x - 257x glyphs. If it's zero, we can't use it. It represents the 250x - 257x glyphs. If it's zero, we can't use it.
if it's not, it's encoded as follows: imagine a 5x5 grid where the points are numbered if it's not, it's encoded as follows: imagine a 5x5 grid where the points are numbered
0 to 24 left to top, top to bottom. Each point is represented by the corresponding bit. 0 to 24 left to top, top to bottom. Each point is represented by the corresponding bit.
@ -578,7 +578,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y,
} }
//Check for line-drawing char //Check for line-drawing char
if (isLineChar(drawstr[0].tqunicode())) if (isLineChar(drawstr[0].unicode()))
{ {
uchar code = drawstr[0].cell(); uchar code = drawstr[0].cell();
if (LineChars[code]) if (LineChars[code])
@ -1803,8 +1803,8 @@ void TEWidget::emitText(TQString text)
void TEWidget::emitSelection(bool useXselection,bool appendReturn) void TEWidget::emitSelection(bool useXselection,bool appendReturn)
// Paste Clipboard by simulating keypress events // Paste Clipboard by simulating keypress events
{ {
TQApplication::tqclipboard()->setSelectionMode( useXselection ); TQApplication::clipboard()->setSelectionMode( useXselection );
TQString text = TQApplication::tqclipboard()->text(); TQString text = TQApplication::clipboard()->text();
if(appendReturn) if(appendReturn)
text.append("\r"); text.append("\r");
if ( ! text.isEmpty() ) if ( ! text.isEmpty() )
@ -1814,13 +1814,13 @@ void TEWidget::emitSelection(bool useXselection,bool appendReturn)
emit keyPressedSignal(&e); // expose as a big fat keypress event emit keyPressedSignal(&e); // expose as a big fat keypress event
emit clearSelectionSignal(); emit clearSelectionSignal();
} }
TQApplication::tqclipboard()->setSelectionMode( false ); TQApplication::clipboard()->setSelectionMode( false );
} }
void TEWidget::setSelection(const TQString& t) void TEWidget::setSelection(const TQString& t)
{ {
// Disconnect signal while WE set the clipboard // Disconnect signal while WE set the clipboard
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()), TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT(onClearSelection()) ); this, TQT_SLOT(onClearSelection()) );
@ -2104,7 +2104,7 @@ void TEWidget::clearImage()
void TEWidget::calcGeometry() void TEWidget::calcGeometry()
{ {
scrollbar->resize(TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent), scrollbar->resize(TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent),
contentsRect().height()); contentsRect().height());
switch(scrollLoc) switch(scrollLoc)
{ {
@ -2268,7 +2268,7 @@ void TEWidget::dropEvent(TQDropEvent* event)
void TEWidget::doDrag() void TEWidget::doDrag()
{ {
dragInfo.state = diDragging; dragInfo.state = diDragging;
dragInfo.dragObject = new TQTextDrag(TQApplication::tqclipboard()->text(TQClipboard::Selection), this); dragInfo.dragObject = new TQTextDrag(TQApplication::clipboard()->text(TQClipboard::Selection), this);
dragInfo.dragObject->dragCopy(); dragInfo.dragObject->dragCopy();
// Don't delete the TQTextDrag object. Qt will delete it when it's done with it. // Don't delete the TQTextDrag object. Qt will delete it when it's done with it.
} }

@ -307,7 +307,7 @@ void TEmuVt102::initTokenizer()
#define ESC 27 #define ESC 27
#define CNTL(c) ((c)-'@') #define CNTL(c) ((c)-'@')
// process an incoming tqunicode character // process an incoming unicode character
void TEmuVt102::onRcvChar(int cc) void TEmuVt102::onRcvChar(int cc)
{ int i; { int i;

@ -251,7 +251,7 @@ int TEmulation::keymapNo()
*/ */
void TEmulation::onRcvChar(int c) void TEmulation::onRcvChar(int c)
// process application tqunicode input to terminal // process application unicode input to terminal
// this is a trivial scanner // this is a trivial scanner
{ {
c &= 0xff; c &= 0xff;
@ -284,7 +284,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev )
scr->setHistCursor(scr->getHistLines()); scr->setHistCursor(scr->getHistLines());
if (!ev->text().isEmpty()) if (!ev->text().isEmpty())
{ // A block of text { // A block of text
// Note that the text is proper tqunicode. // Note that the text is proper unicode.
// We should do a conversion here, but since this // We should do a conversion here, but since this
// routine will never be used, we simply emit plain ascii. // routine will never be used, we simply emit plain ascii.
emit sndBlock(TQString(ev->text()).ascii(),ev->text().length()); emit sndBlock(TQString(ev->text()).ascii(),ev->text().length());
@ -299,7 +299,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev )
// Unblocking, Byte to Unicode translation --------------------------------- -- // Unblocking, Byte to Unicode translation --------------------------------- --
/* /*
We are doing code conversion from locale to tqunicode first. We are doing code conversion from locale to unicode first.
*/ */
void TEmulation::onRcvBlock(const char *s, int len) void TEmulation::onRcvBlock(const char *s, int len)
@ -345,7 +345,7 @@ void TEmulation::onRcvBlock(const char *s, int len)
if (r[j].category() == TQChar::Mark_NonSpacing) if (r[j].category() == TQChar::Mark_NonSpacing)
scr->compose(r.mid(j,1)); scr->compose(r.mid(j,1));
else else
onRcvChar(r[j].tqunicode()); onRcvChar(r[j].unicode());
} }
i = l; i = l;
} }
@ -392,7 +392,7 @@ void TEmulation::clearSelection() {
void TEmulation::copySelection() { void TEmulation::copySelection() {
if (!connected) return; if (!connected) return;
TQString t = scr->getSelText(true); TQString t = scr->getSelText(true);
TQApplication::tqclipboard()->setText(t); TQApplication::clipboard()->setText(t);
} }
TQString TEmulation::getSelection() { TQString TEmulation::getSelection() {

@ -214,7 +214,7 @@ int string_width( const TQString &txt )
int w = 0; int w = 0;
for ( uint i = 1; i < txt.length(); ++i ) { for ( uint i = 1; i < txt.length(); ++i ) {
w += konsole_wcwidth(txt[i].tqunicode()); w += konsole_wcwidth(txt[i].unicode());
} }
return w; return w;
} }

@ -388,7 +388,7 @@ bool ColorSchema::rereadSchemaFile()
if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= tr && tr <= 1 )) continue;
if (!(0 <= bo && bo <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue;
m_table[fi].color = kapp->tqpalette().active().text(); m_table[fi].color = kapp->palette().active().text();
m_table[fi].transparent = tr; m_table[fi].transparent = tr;
m_table[fi].bold = bo; m_table[fi].bold = bo;
} }
@ -399,7 +399,7 @@ bool ColorSchema::rereadSchemaFile()
if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= tr && tr <= 1 )) continue;
if (!(0 <= bo && bo <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue;
m_table[fi].color = kapp->tqpalette().active().base(); m_table[fi].color = kapp->palette().active().base();
m_table[fi].transparent = tr; m_table[fi].transparent = tr;
m_table[fi].bold = bo; m_table[fi].bold = bo;
} }

@ -650,7 +650,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
TQFrame* frame = new TQFrame( this ); TQFrame* frame = new TQFrame( this );
frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
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 logout box, since it // we need to set the minimum size for the logout box, since it
// gets too small if there isn't all options available // gets too small if there isn't all options available
frame->setMinimumWidth(400); frame->setMinimumWidth(400);

@ -48,7 +48,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 1 ); TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 );
mTitle = new KLineEdit( groupBox ); mTitle = new KLineEdit( groupBox );
TQWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) ); TQWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) );
@ -57,7 +57,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
pageLayout->addWidget( groupBox, 0, 0 ); pageLayout->addWidget( groupBox, 0, 0 );
groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page );
boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 5 ); boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 );
boxLayout->setColStretch( 2, 1 ); boxLayout->setColStretch( 2, 1 );
TQLabel *label = new TQLabel( i18n( "Minimum value:" ), groupBox ); TQLabel *label = new TQLabel( i18n( "Minimum value:" ), groupBox );
@ -85,7 +85,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page );
boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 ); boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
boxLayout->setColStretch( 1, 1 ); boxLayout->setColStretch( 1, 1 );
mUseLowerLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox ); mUseLowerLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox );
@ -103,7 +103,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
pageLayout->addWidget( groupBox, 0, 0 ); pageLayout->addWidget( groupBox, 0, 0 );
groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page );
boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 ); boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
boxLayout->setColStretch( 1, 1 ); boxLayout->setColStretch( 1, 1 );
mUseUpperLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox ); mUseUpperLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox );

@ -79,7 +79,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() ); pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() );
groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page );
boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
boxLayout->setColStretch( 2, 1 ); boxLayout->setColStretch( 2, 1 );
mUseAutoRange = new TQCheckBox( i18n( "Automatic range detection" ), groupBox ); mUseAutoRange = new TQCheckBox( i18n( "Automatic range detection" ), groupBox );
@ -109,7 +109,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
pageLayout->addWidget( groupBox, 0, 0 ); pageLayout->addWidget( groupBox, 0, 0 );
groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page );
boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 2, spacingHint() ); boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() );
boxLayout->setRowStretch( 1, 1 ); boxLayout->setRowStretch( 1, 1 );
mHorizontalScale = new KIntNumInput( 1, groupBox ); mHorizontalScale = new KIntNumInput( 1, groupBox );
@ -127,7 +127,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() ); pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() );
groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page );
boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
boxLayout->setColStretch( 1, 1 ); boxLayout->setColStretch( 1, 1 );
mShowVerticalLines = new TQCheckBox( i18n( "Vertical lines" ), groupBox ); mShowVerticalLines = new TQCheckBox( i18n( "Vertical lines" ), groupBox );
@ -166,7 +166,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 ); pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 );
groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page );
boxLayout = new TQGridLayout( groupBox->tqlayout(), 3, 4, spacingHint() ); boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() );
boxLayout->setColStretch( 1, 1 ); boxLayout->setColStretch( 1, 1 );
mShowLabels = new TQCheckBox( i18n( "Labels" ), groupBox ); mShowLabels = new TQCheckBox( i18n( "Labels" ), groupBox );
@ -191,7 +191,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
pageLayout->addWidget( groupBox, 1, 0 ); pageLayout->addWidget( groupBox, 1, 0 );
groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page );
boxLayout = new TQGridLayout( groupBox->tqlayout(), 4, 2, spacingHint() ); boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() );
label = new TQLabel( i18n( "Vertical lines:" ), groupBox ); label = new TQLabel( i18n( "Vertical lines:" ), groupBox );
boxLayout->addWidget( label, 0, 0 ); boxLayout->addWidget( label, 0, 0 );

@ -241,7 +241,7 @@ void WorkSheet::cut()
if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) ) if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) )
return; return;
TQClipboard* clip = TQApplication::tqclipboard(); TQClipboard* clip = TQApplication::clipboard();
clip->setText( currentDisplayAsXML() ); clip->setText( currentDisplayAsXML() );
@ -253,7 +253,7 @@ void WorkSheet::copy()
if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) ) if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) )
return; return;
TQClipboard* clip = TQApplication::tqclipboard(); TQClipboard* clip = TQApplication::clipboard();
clip->setText( currentDisplayAsXML() ); clip->setText( currentDisplayAsXML() );
} }
@ -264,7 +264,7 @@ void WorkSheet::paste()
if ( !currentDisplay( &row, &column ) ) if ( !currentDisplay( &row, &column ) )
return; return;
TQClipboard* clip = TQApplication::tqclipboard(); TQClipboard* clip = TQApplication::clipboard();
TQDomDocument doc; TQDomDocument doc;
/* Get text from clipboard and check for a valid XML header and /* Get text from clipboard and check for a valid XML header and

@ -46,10 +46,10 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
group->tqlayout()->setMargin( marginHint() ); group->layout()->setMargin( marginHint() );
group->tqlayout()->setSpacing( spacingHint() ); group->layout()->setSpacing( spacingHint() );
TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 1, 1 ); TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 );
groupLayout->setAlignment( Qt::AlignTop ); groupLayout->setAlignment( Qt::AlignTop );
mSheetTitle = new KLineEdit( group ); mSheetTitle = new KLineEdit( group );
@ -58,10 +58,10 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
topLayout->addWidget( group ); topLayout->addWidget( group );
group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page ); group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page );
group->tqlayout()->setMargin( marginHint() ); group->layout()->setMargin( marginHint() );
group->tqlayout()->setSpacing( spacingHint() ); group->layout()->setSpacing( spacingHint() );
groupLayout = new TQGridLayout( group->tqlayout(), 3, 2 ); groupLayout = new TQGridLayout( group->layout(), 3, 2 );
groupLayout->setAlignment( Qt::AlignTop ); groupLayout->setAlignment( Qt::AlignTop );
TQLabel *label = new TQLabel( i18n( "Rows:" ), group ); TQLabel *label = new TQLabel( i18n( "Rows:" ), group );

@ -59,7 +59,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical, TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical,
i18n( "Connection Type" ), page ); i18n( "Connection Type" ), page );
TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 4, 4, TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4,
spacingHint() ); spacingHint() );
groupLayout->setAlignment( Qt::AlignTop ); groupLayout->setAlignment( Qt::AlignTop );

@ -570,7 +570,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
TQPainter p( widget() ); TQPainter p( widget() );
TQRect t = titleRect(); // titlebar->geometry(); TQRect t = titleRect(); // titlebar->geometry();
TQBrush fillBrush(widget()->colorGroup().tqbrush(TQColorGroup::Background).pixmap() ? TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ?
widget()->colorGroup().brush(TQColorGroup::Background) : widget()->colorGroup().brush(TQColorGroup::Background) :
options()->colorGroup(ColorFrame, isActive()). options()->colorGroup(ColorFrame, isActive()).
brush(TQColorGroup::Button)); brush(TQColorGroup::Button));

@ -54,7 +54,7 @@ ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name)
TQDataStream stream(data, IO_WriteOnly); TQDataStream stream(data, IO_WriteOnly);
stream << btn.name; stream << btn.name;
stream << btn.icon; stream << btn.icon;
stream << btn.type.tqunicode(); stream << btn.type.unicode();
stream << (int) btn.duplicate; stream << (int) btn.duplicate;
stream << (int) btn.supported; stream << (int) btn.supported;
setEncodedData( data ); setEncodedData( data );
@ -152,7 +152,7 @@ TQSize ButtonSource::sizeHint() const
TQSize s( header()->sizeHint() ); TQSize s( header()->sizeHint() );
if ( verticalScrollBar()->isVisible() ) if ( verticalScrollBar()->isVisible() )
s.setWidth( s.width() + tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent) ); s.setWidth( s.width() + style().pixelMetric(TQStyle::PM_ScrollBarExtent) );
s += TQSize(frameWidth()*2,frameWidth()*2); s += TQSize(frameWidth()*2,frameWidth()*2);
// size hint: 4 lines of text... // size hint: 4 lines of text...

@ -112,13 +112,13 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." )); TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." ));
lBorder->hide(); lBorder->hide();
cBorder->hide(); cBorder->hide();
TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->tqlayout() ); TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() );
borderSizeLayout->addWidget(lBorder); borderSizeLayout->addWidget(lBorder);
borderSizeLayout->addWidget(cBorder); borderSizeLayout->addWidget(cBorder);
borderSizeLayout->addStretch(); borderSizeLayout->addStretch();
pluginConfigWidget = new TQVBox(pluginSettingsGrp); pluginConfigWidget = new TQVBox(pluginSettingsGrp);
pluginSettingsGrp->tqlayout()->add( pluginConfigWidget ); pluginSettingsGrp->layout()->add( pluginConfigWidget );
// Page 2 (Button Selector) // Page 2 (Button Selector)
TQWidget* buttonPage = new TQWidget( tabWidget ); TQWidget* buttonPage = new TQWidget( tabWidget );

@ -124,7 +124,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
fcsBox = new TQButtonGroup(i18n("Focus"),this); fcsBox = new TQButtonGroup(i18n("Focus"),this);
fcsBox->setColumnLayout( 0, Qt::Horizontal ); fcsBox->setColumnLayout( 0, Qt::Horizontal );
TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->tqlayout(), TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(),
KDialog::spacingHint()); KDialog::spacingHint());
TQBoxLayout *cLay = new TQHBoxLayout(fLay); TQBoxLayout *cLay = new TQHBoxLayout(fLay);
@ -236,7 +236,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
kbdBox = new TQButtonGroup(i18n("Navigation"), this); kbdBox = new TQButtonGroup(i18n("Navigation"), this);
kbdBox->setColumnLayout( 0, Qt::Horizontal ); kbdBox->setColumnLayout( 0, Qt::Horizontal );
TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->tqlayout(), KDialog::spacingHint()); TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint());
altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox ); altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox );
kLay->addWidget( altTabPopup ); kLay->addWidget( altTabPopup );
@ -831,7 +831,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
windowsBox = new TQButtonGroup(i18n("Windows"), this); windowsBox = new TQButtonGroup(i18n("Windows"), this);
windowsBox->setColumnLayout( 0, Qt::Horizontal ); windowsBox->setColumnLayout( 0, Qt::Horizontal );
TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->tqlayout(), KDialog::spacingHint()); TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint());
TQBoxLayout *bLay = new TQVBoxLayout; TQBoxLayout *bLay = new TQVBoxLayout;
wLay->addLayout(bLay); wLay->addLayout(bLay);

@ -395,7 +395,7 @@ const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active)
return(*d->cg[idx]); return(*d->cg[idx]);
d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150), d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150),
d->colors[idx].dark(), d->colors[idx].dark(120), d->colors[idx].dark(), d->colors[idx].dark(120),
Qt::black, TQApplication::tqpalette().active(). Qt::black, TQApplication::palette().active().
base()); base());
return(*d->cg[idx]); return(*d->cg[idx]);
} }

@ -75,7 +75,7 @@ void PopupInfo::reset()
void PopupInfo::paintEvent( TQPaintEvent* ) void PopupInfo::paintEvent( TQPaintEvent* )
{ {
TQPainter p( this ); TQPainter p( this );
tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ),
colorGroup(), TQStyle::Style_Default ); colorGroup(), TQStyle::Style_Default );
paintContents(); paintContents();
} }

@ -1969,7 +1969,7 @@ void Workspace::slotGrabWindow()
} }
} }
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
cb->setPixmap( snapshot ); cb->setPixmap( snapshot );
} }
else else
@ -1982,7 +1982,7 @@ void Workspace::slotGrabWindow()
void Workspace::slotGrabDesktop() void Workspace::slotGrabDesktop()
{ {
TQPixmap p = TQPixmap::grabWindow( qt_xrootwin() ); TQPixmap p = TQPixmap::grabWindow( qt_xrootwin() );
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
cb->setPixmap( p ); cb->setPixmap( p );
} }

@ -48,9 +48,9 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
m_buttonGroup = new TQButtonGroup( i18n("Background"), page ); m_buttonGroup = new TQButtonGroup( i18n("Background"), page );
m_buttonGroup->setColumnLayout( 0, Qt::Vertical ); m_buttonGroup->setColumnLayout( 0, Qt::Vertical );
m_buttonGroup->tqlayout()->setMargin( KDialog::marginHint() ); m_buttonGroup->layout()->setMargin( KDialog::marginHint() );
m_buttonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() );
TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->tqlayout() ); TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() );
groupLayout->setAlignment( Qt::AlignTop ); groupLayout->setAlignment( Qt::AlignTop );
mainLayout->addWidget( m_buttonGroup ); mainLayout->addWidget( m_buttonGroup );

@ -133,7 +133,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
resetCount(); resetCount();
//m_bMultipleItemsSelected = false; //m_bMultipleItemsSelected = false;
connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
actionCollection()->setHighlightingEnabled( true ); actionCollection()->setHighlightingEnabled( true );
@ -418,7 +418,7 @@ void KonqDirPart::slotClipboardDataChanged()
// This is very related to KDIconView::slotClipboardDataChanged // This is very related to KDIconView::slotClipboardDataChanged
KURL::List lst; KURL::List lst;
TQMimeSource *data = TQApplication::tqclipboard()->data(); TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) ) if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) )
if ( KonqDrag::decodeIsCutSelection( data ) ) if ( KonqDrag::decodeIsCutSelection( data ) )
(void) KURLDrag::decode( data, lst ); (void) KURLDrag::decode( data, lst );

@ -1147,14 +1147,14 @@ void KonqIconViewWidget::cutSelection()
kdDebug(1203) << " -- KonqIconViewWidget::cutSelection() -- " << endl; kdDebug(1203) << " -- KonqIconViewWidget::cutSelection() -- " << endl;
KonqIconDrag * obj = konqDragObject( /* no parent ! */ ); KonqIconDrag * obj = konqDragObject( /* no parent ! */ );
obj->setMoveSelection( true ); obj->setMoveSelection( true );
TQApplication::tqclipboard()->setData( obj ); TQApplication::clipboard()->setData( obj );
} }
void KonqIconViewWidget::copySelection() void KonqIconViewWidget::copySelection()
{ {
kdDebug(1203) << " -- KonqIconViewWidget::copySelection() -- " << endl; kdDebug(1203) << " -- KonqIconViewWidget::copySelection() -- " << endl;
KonqIconDrag * obj = konqDragObject( /* no parent ! */ ); KonqIconDrag * obj = konqDragObject( /* no parent ! */ );
TQApplication::tqclipboard()->setData( obj ); TQApplication::clipboard()->setData( obj );
} }
void KonqIconViewWidget::pasteSelection() void KonqIconViewWidget::pasteSelection()

@ -124,7 +124,7 @@ void KonqOperations::doPaste( TQWidget * parent, const KURL & destURL, const TQP
{ {
// move or not move ? // move or not move ?
bool move = false; bool move = false;
TQMimeSource *data = TQApplication::tqclipboard()->data(); TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) { if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data ); move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1203) << "move (from clipboard data) = " << move << endl; kdDebug(1203) << "move (from clipboard data) = " << move << endl;

@ -580,7 +580,7 @@ struct JNINativeInterface_ {
(JNIEnv *env, jclass clazz, jfieldID fieldID, jdouble value); (JNIEnv *env, jclass clazz, jfieldID fieldID, jdouble value);
jstring (JNICALL *NewString) jstring (JNICALL *NewString)
(JNIEnv *env, const jchar *tqunicode, jsize len); (JNIEnv *env, const jchar *unicode, jsize len);
jsize (JNICALL *GetStringLength) jsize (JNICALL *GetStringLength)
(JNIEnv *env, jstring str); (JNIEnv *env, jstring str);
const jchar *(JNICALL *GetStringChars) const jchar *(JNICALL *GetStringChars)
@ -1508,8 +1508,8 @@ struct JNIEnv_ {
functions->SetStaticDoubleField(this,clazz,fieldID,value); functions->SetStaticDoubleField(this,clazz,fieldID,value);
} }
jstring NewString(const jchar *tqunicode, jsize len) { jstring NewString(const jchar *unicode, jsize len) {
return functions->NewString(this,tqunicode,len); return functions->NewString(this,unicode,len);
} }
jsize GetStringLength(jstring str) { jsize GetStringLength(jstring str) {
return functions->GetStringLength(this,str); return functions->GetStringLength(this,str);

@ -341,8 +341,8 @@ typedef const JRIEnvInterface* JRIEnv;
#define JRI_SetStaticFieldDouble(env, clazz, fieldID, value) \ #define JRI_SetStaticFieldDouble(env, clazz, fieldID, value) \
(((*(env))->SetStaticFieldDouble)(env, JRI_SetStaticFieldDouble_op, clazz, fieldID, value)) (((*(env))->SetStaticFieldDouble)(env, JRI_SetStaticFieldDouble_op, clazz, fieldID, value))
#define JRI_NewString(env, tqunicode, len) \ #define JRI_NewString(env, unicode, len) \
(((*(env))->NewString)(env, JRI_NewString_op, tqunicode, len)) (((*(env))->NewString)(env, JRI_NewString_op, unicode, len))
#define JRI_GetStringLength(env, string) \ #define JRI_GetStringLength(env, string) \
(((*(env))->GetStringLength)(env, JRI_GetStringLength_op, string)) (((*(env))->GetStringLength)(env, JRI_GetStringLength_op, string))

Loading…
Cancel
Save