Browse Source

Rename obsolete tq methods to standard names

(cherry picked from commit b492b550f3)
v3.5.13-sru
Timothy Pearson 11 years ago committed by Slávek Banko
parent
commit
0251b10c2e
  1. 16
      kcontrol/access/kcmaccess.cpp
  2. 2
      kcontrol/background/bghash.h
  3. 2
      kcontrol/bell/bell.cpp
  4. 6
      kcontrol/colors/widgetcanvas.cpp
  5. 2
      kcontrol/input/mouse.cpp
  6. 6
      kcontrol/kdm/kdm-appear.cpp
  7. 2
      kcontrol/kdm/kdm-users.cpp
  8. 2
      kcontrol/kfontinst/kfontinst/FontEngine.cpp
  9. 2
      kcontrol/kfontinst/lib/FcEngine.cpp
  10. 2
      kcontrol/kfontinst/viewpart/FontPreview.cpp
  11. 2
      kcontrol/kio/smbrodlg.cpp
  12. 2
      kcontrol/kio/uagentproviderdlg.cpp
  13. 2
      kcontrol/konqhtml/domainlistview.cpp
  14. 2
      kcontrol/konqhtml/htmlopts.cpp
  15. 2
      kcontrol/konqhtml/jspolicies.cpp
  16. 4
      kcontrol/konsole/schemaeditor.cpp
  17. 12
      kcontrol/launch/kcmlaunch.cpp
  18. 2
      kcontrol/locale/klocalesample.cpp
  19. 4
      kcontrol/screensaver/scrnsave.cpp
  20. 6
      kcontrol/style/kcmstyle.cpp
  21. 2
      kcontrol/usbview/kcmusb.cpp
  22. 2
      kdcop/kdcopwindow.cpp
  23. 4
      kdesktop/kdiconview.cc
  24. 4
      kdesktop/lock/lockdlg.cc
  25. 4
      kdm/kfrontend/kdmshutdown.cpp
  26. 2
      kdm/kfrontend/kgreeter.cpp
  27. 4
      kdm/kfrontend/kgverify.cpp
  28. 2
      kdm/kfrontend/themer/kdmlabel.cpp
  29. 2
      kfind/kfwin.cpp
  30. 4
      khelpcenter/view.cpp
  31. 22
      kicker/applets/clock/clock.cpp
  32. 24
      kicker/applets/clock/clockapplet.kcfg
  33. 2
      kicker/applets/media/mediumbutton.cpp
  34. 6
      kicker/applets/naughty/NaughtyProcessMonitor.cpp
  35. 10
      kicker/kicker/core/applethandle.cpp
  36. 8
      kicker/kicker/core/container_extension.cpp
  37. 2
      kicker/kicker/core/containerarea.cpp
  38. 2
      kicker/kicker/core/kicker.cpp
  39. 4
      kicker/kicker/ui/k_mnu.cpp
  40. 2
      kicker/kicker/ui/k_new_mnu.cpp
  41. 16
      kicker/kicker/ui/kickoff_bar.cpp
  42. 4
      kicker/kicker/ui/popupmenutitle.h
  43. 2
      kicker/libkicker/kickerSettings.kcfg
  44. 18
      kicker/libkicker/panelbutton.cpp
  45. 4
      kicker/libkicker/simplebutton.cpp
  46. 2
      kicker/menuext/tom/tom.cc
  47. 16
      kicker/taskbar/taskcontainer.cpp
  48. 2
      kicker/taskmanager/taskmanager.cpp
  49. 4
      kioslave/media/kfile-plugin/kfilemediaplugin.cpp
  50. 2
      kioslave/smtp/request.cc
  51. 12
      klipper/clipboardpoll.cpp
  52. 2
      klipper/popupproxy.cpp
  53. 2
      klipper/toplevel.cpp
  54. 2
      konqueror/about/konq_aboutpage.cc
  55. 2
      konqueror/about/specs.html
  56. 4
      konqueror/keditbookmarks/actionsimpl.cpp
  57. 4
      konqueror/keditbookmarks/toplevel.cpp
  58. 10
      konqueror/konq_combo.cc
  59. 2
      konqueror/konq_frame.cc
  60. 8
      konqueror/konq_mainwindow.cc
  61. 8
      konqueror/konq_tabs.cc
  62. 2
      konqueror/listview/konq_listview.cc
  63. 2
      konqueror/listview/konq_listviewwidget.cc
  64. 4
      konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
  65. 4
      konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
  66. 4
      konqueror/sidebar/trees/konq_sidebartree.cpp
  67. 4
      konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
  68. 4
      konqueror/sidebar/trees/konqsidebar_tree.cpp
  69. 2
      konsole/konsole/TEScreen.cpp
  70. 24
      konsole/konsole/TEWidget.cpp
  71. 2
      konsole/konsole/TEmuVt102.cpp
  72. 10
      konsole/konsole/TEmulation.cpp
  73. 2
      konsole/konsole/konsole_wcwidth.cpp
  74. 4
      konsole/konsole/schema.cpp
  75. 2
      ksmserver/shutdowndlg.cpp
  76. 8
      ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
  77. 10
      ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
  78. 6
      ksysguard/gui/WorkSheet.cc
  79. 12
      ksysguard/gui/WorkSheetSettings.cc
  80. 2
      ksysguard/gui/ksgrd/HostConnector.cc
  81. 2
      kwin/clients/modernsystem/modernsys.cpp
  82. 4
      kwin/kcmkwin/kwindecoration/buttons.cpp
  83. 4
      kwin/kcmkwin/kwindecoration/kwindecoration.cpp
  84. 6
      kwin/kcmkwin/kwinoptions/windows.cpp
  85. 2
      kwin/lib/kdecoration.cpp
  86. 2
      kwin/popupinfo.cpp
  87. 4
      kwin/workspace.cpp
  88. 6
      libkonq/konq_bgnddlg.cc
  89. 4
      libkonq/konq_dirpart.cc
  90. 4
      libkonq/konq_iconviewwidget.cc
  91. 2
      libkonq/konq_operations.cc
  92. 6
      nsplugins/sdk/jni.h
  93. 4
      nsplugins/sdk/jri.h

16
kcontrol/access/kcmaccess.cpp

@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);
TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(),
TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
KDialogBase::spacingHint());
systemBell = new TQCheckBox(i18n("Use &system bell"), grp);
@ -291,7 +291,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
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);
vvbox->addWidget(visibleBell);
@ -353,7 +353,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
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);
vvbox->addWidget(stickyKeys);
@ -377,7 +377,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
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);
vvbox->addWidget(toggleKeysBeep);
@ -415,7 +415,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
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);
vvbox->addWidget(slowKeys);
@ -447,7 +447,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
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);
vvbox->addWidget(bounceKeys);
@ -491,7 +491,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
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);
vvbox->addWidget(gestures);
@ -521,7 +521,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
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);
vvbox->addWidget(accessxBeep);

2
kcontrol/background/bghash.h

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

2
kcontrol/bell/bell.cpp

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

6
kcontrol/colors/widgetcanvas.cpp

@ -435,7 +435,7 @@ void WidgetCanvas::drawSampleWidgets()
// Menu bar
//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);
paint.setFont( menuFont );
@ -443,7 +443,7 @@ void WidgetCanvas::drawSampleWidgets()
TQString file = i18n("File");
textLen = paint.fontMetrics().width( file );
//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);
paint.drawText( 35, 74, file );
@ -528,7 +528,7 @@ void WidgetCanvas::drawSampleWidgets()
cg2.setColor(TQColorGroup::Button, button);
cg2.setColor(TQColorGroup::Background, window);
//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);
paint.setPen(buttonTxt);
paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter,

2
kcontrol/input/mouse.cpp

@ -291,7 +291,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(),
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);
vvbox->addWidget(mouseKeys);

6
kcontrol/kdm/kdm-appear.cpp

@ -228,7 +228,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
loadLanguageList(langcombo);
connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
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->addWidget(label, 1, 0);
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 );
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->addWidget(sakbox, 1, 0);
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)
p = p.smoothScale(100, 100, TQ_ScaleMin);
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);
logopath = logo;
return true;

2
kcontrol/kdm/kdm-users.cpp

@ -168,7 +168,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
userbutton = new TQPushButton( hlpw );
userbutton->setAcceptDrops( true );
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 );
connect( userbutton, TQT_SIGNAL(clicked()),
TQT_SLOT(slotUserButtonClicked()) );

2
kcontrol/kfontinst/kfontinst/FontEngine.cpp

@ -163,7 +163,7 @@ static void removeSymbols(TQString &str)
TQChar space(' ');
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=str.simplifyWhiteSpace();

2
kcontrol/kfontinst/lib/FcEngine.cpp

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

2
kcontrol/kfontinst/viewpart/FontPreview.cpp

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

2
kcontrol/kio/smbrodlg.cpp

@ -140,7 +140,7 @@ void SMBRoOptions::save()
for (uint i=0; i<password.length(); 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 a2 = (num & 0x3E0) >> 5;
unsigned int a3 = (num & 0x1F);

2
kcontrol/kio/uagentproviderdlg.cpp

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

2
kcontrol/konqhtml/domainlistview.cpp

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

2
kcontrol/konqhtml/htmlopts.cpp

@ -82,7 +82,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa
// Tabbed Browsing
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 );
TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "

2
kcontrol/konqhtml/jspolicies.cpp

@ -135,7 +135,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
setColumnLayout(0, Qt::Vertical);
layout()->setSpacing(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->setSpacing(3);
this_layout->setMargin(11);

4
kcontrol/konsole/schemaeditor.cpp

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

12
kcontrol/launch/kcmlaunch.cpp

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

2
kcontrol/locale/klocalesample.cpp

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

4
kcontrol/screensaver/scrnsave.cpp

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

6
kcontrol/style/kcmstyle.cpp

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

2
kcontrol/usbview/kcmusb.cpp

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

2
kdcop/kdcopwindow.cpp

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

4
kdesktop/kdiconview.cc

@ -159,7 +159,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
// Initialize media handler
mMediaListView = new TQListView();
connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()),
connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()),
this, TQT_SLOT(slotClipboardDataChanged()) );
setURL( desktopURL() ); // sets m_url
@ -1327,7 +1327,7 @@ void KDIconView::slotClipboardDataChanged()
// This is very related to KonqDirPart::slotClipboardDataChanged
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 ( KonqDrag::decodeIsCutSelection( data ) )
(void) KURLDrag::decode( data, lst );

4
kdesktop/lock/lockdlg.cc

@ -268,7 +268,7 @@ void PasswordDlg::setLayoutText( const TQString &txt )
{
mLayoutButton->setText( 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 );
}
@ -790,7 +790,7 @@ void PasswordDlg::slotSwitchUser()
int fw = lv->frameWidth() * 2;
TQSize hds( lv->header()->sizeHint() );
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() +
itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) );
lv->header()->adjustHeaderSize();

4
kdm/kfrontend/kdmshutdown.cpp

@ -276,7 +276,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
freeStrArr( tlist );
targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget );
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();
hb->addSpacing( spc );
hb->addWidget( targets );
@ -484,7 +484,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
lfrm->setFrameStyle( TQFrame::NoFrame );
else
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
// gets too small if there all options are not available
lfrm->setMinimumSize(300,120);

2
kdm/kfrontend/kgreeter.cpp

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

4
kdm/kfrontend/kgverify.cpp

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

2
kdm/kfrontend/themer/kdmlabel.cpp

@ -116,7 +116,7 @@ KdmLabel::setTextInt( const TQString &txt)
if (cAccel != -1) {
cText.remove('&');
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()));
}
}

2
kfind/kfwin.cpp

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

4
khelpcenter/view.cpp

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

22
kicker/applets/clock/clock.cpp

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

24
kicker/applets/clock/clockapplet.kcfg

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

2
kicker/applets/media/mediumbutton.cpp

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

6
kicker/applets/naughty/NaughtyProcessMonitor.cpp

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

10
kicker/kicker/core/applethandle.cpp

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

8
kicker/kicker/core/container_extension.cpp

@ -1408,11 +1408,11 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e)
// KPanelExtension::Left/Right don't seem to draw the separators at all!
if (position() == KPanelExtension::Left) {
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) {
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) {
// 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);
TQColorGroup darkcg = colorGroup();
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);
}
else {
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 );
}
}
}

2
kicker/kicker/core/containerarea.cpp

@ -1958,7 +1958,7 @@ void DragIndicator::paintEvent(TQPaintEvent*)
{
TQPainter painter(this);
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() );
}

2
kicker/kicker/core/kicker.cpp

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

4
kicker/kicker/ui/k_mnu.cpp

@ -421,7 +421,7 @@ void PanelKMenu::repairDisplay(void) {
// Now do a nasty hack to prevent search bar merging into the side image
// This forces a layout/repaint of the qpopupmenu
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
}
}
@ -624,7 +624,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e)
TQPainter p(this);
p.setClipRegion(e->region());
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
TQRect( 0, 0, width(), height() ),
colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0 ) );

2
kicker/kicker/ui/k_new_mnu.cpp

@ -522,7 +522,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
m_sloppySourceClicked = true;
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)
timeout = 3000;
m_sloppyTimer.start(timeout);

16
kicker/kicker/ui/kickoff_bar.cpp

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

4
kicker/kicker/ui/popupmenutitle.h

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

2
kicker/libkicker/kickerSettings.kcfg

@ -81,7 +81,7 @@
<entry name="TintColor" type="Color" >
<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>
</entry>

18
kicker/libkicker/panelbutton.cpp

@ -539,7 +539,7 @@ void PanelButton::drawButton(TQPainter *p)
if (m_tileColor.isValid())
{
p->fillRect(rect(), m_tileColor);
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
}
else if (paletteBackgroundPixmap())
{
@ -559,7 +559,7 @@ void PanelButton::drawButton(TQPainter *p)
else if (isDown() || isOn())
{
// 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);
@ -569,7 +569,7 @@ void PanelButton::drawButton(TQPainter *p)
int x1, y1, x2, y2;
TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);