Browse Source

Rename obsolete tq methods to standard names

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

+ 8
- 8
kcontrol/access/kcmaccess.cpp View File

@@ -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);


+ 1
- 1
kcontrol/background/bghash.h View File

@@ -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)))


+ 1
- 1
kcontrol/bell/bell.cpp View File

@@ -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);


+ 3
- 3
kcontrol/colors/widgetcanvas.cpp View File

@@ -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,


+ 1
- 1
kcontrol/input/mouse.cpp View File

@@ -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);


+ 3
- 3
kcontrol/kdm/kdm-appear.cpp View File

@@ -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;


+ 1
- 1
kcontrol/kdm/kdm-users.cpp View File

@@ -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()) );


+ 1
- 1
kcontrol/kfontinst/kfontinst/FontEngine.cpp View File

@@ -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();


+ 1
- 1
kcontrol/kfontinst/lib/FcEngine.cpp View File

@@ -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;
}


+ 1
- 1
kcontrol/kfontinst/viewpart/FontPreview.cpp View File

@@ -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"));
}
}


+ 1
- 1
kcontrol/kio/smbrodlg.cpp View File

@@ -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);


+ 1
- 1
kcontrol/kio/uagentproviderdlg.cpp View File

@@ -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;


+ 1
- 1
kcontrol/konqhtml/domainlistview.cpp View File

@@ -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());


+ 1
- 1
kcontrol/konqhtml/htmlopts.cpp View File

@@ -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, "


+ 1
- 1
kcontrol/konqhtml/jspolicies.cpp View File

@@ -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);


+ 2
- 2
kcontrol/konsole/schemaeditor.cpp View File

@@ -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;


+ 6
- 6
kcontrol/launch/kcmlaunch.cpp View File

@@ -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 );


+ 1
- 1
kcontrol/locale/klocalesample.cpp View File

@@ -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);



+ 2
- 2
kcontrol/screensaver/scrnsave.cpp View File

@@ -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(


+ 3
- 3
kcontrol/style/kcmstyle.cpp View File

@@ -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;
}


+ 1
- 1
kcontrol/usbview/kcmusb.cpp View File

@@ -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);


+ 1
- 1
kdcop/kdcopwindow.cpp View File

@@ -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)
{



+ 2
- 2
kdesktop/kdiconview.cc View File

@@ -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 );


+ 2
- 2
kdesktop/lock/lockdlg.cc View File

@@ -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();


+ 2
- 2
kdm/kfrontend/kdmshutdown.cpp View File

@@ -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);


+ 1
- 1
kdm/kfrontend/kgreeter.cpp View File

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


+ 2
- 2
kdm/kfrontend/kgverify.cpp View File

@@ -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 );


+ 1
- 1
kdm/kfrontend/themer/kdmlabel.cpp View File

@@ -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()));
}
}


+ 1
- 1
kfind/kfwin.cpp View File

@@ -178,7 +178,7 @@ void KfindWindow::copySelection()

if (drag_obj)
{
TQClipboard *cb = kapp->tqclipboard();
TQClipboard *cb = kapp->clipboard();
cb->setData(drag_obj);
}
}


+ 2
- 2
khelpcenter/view.cpp View File

@@ -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)


+ 11
- 11
kicker/applets/clock/clock.cpp View File

@@ -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()


+ 12
- 12
kicker/applets/clock/clockapplet.kcfg View File

@@ -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>


+ 1
- 1
kicker/applets/media/mediumbutton.cpp View File

@@ -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)


+ 3
- 3
kicker/applets/naughty/NaughtyProcessMonitor.cpp View File

@@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
}

// Now strip 'tdeinit:' 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 'tdeinit:' 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] == "tdeinit:" ? parts[1] : parts[0];



+ 5
- 5
kicker/kicker/core/applethandle.cpp View File

@@ -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)


+ 4
- 4
kicker/kicker/core/container_extension.cpp View File

@@ -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 );
}
}
}


+ 1
- 1
kicker/kicker/core/containerarea.cpp View File

@@ -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() );
}



+ 1
- 1
kicker/kicker/core/kicker.cpp View File

@@ -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();
}



+ 2
- 2
kicker/kicker/ui/k_mnu.cpp View File

@@ -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 ) );


+ 1
- 1
kicker/kicker/ui/k_new_mnu.cpp View File

@@ -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);


+ 8
- 8
kicker/kicker/ui/kickoff_bar.cpp View File

@@ -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;
}


+ 2
- 2
kicker/kicker/ui/popupmenutitle.h View File

@@ -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;
}



+ 1
- 1
kicker/libkicker/kickerSettings.kcfg View File

@@ -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>



+ 9
- 9
kicker/libkicker/panelbutton.cpp View File

@@ -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);
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());
}
}
@@ -581,7 +581,7 @@ void PanelButton::drawDeepButton(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())
{
@@ -595,10 +595,10 @@ void PanelButton::drawDeepButton(TQPainter *p)

TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2);
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 {
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);
@@ -608,7 +608,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
int 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);
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
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)
{
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);

switch (m_arrowDirection)
@@ -762,7 +762,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
{
flags |= TQStyle::Style_Down;
}
tqstyle().tqdrawPrimitive(e, p, r, colorGroup(), flags);
style().tqdrawPrimitive(e, p, r, colorGroup(), flags);
}
}



+ 2
- 2
kicker/libkicker/simplebutton.cpp View File

@@ -99,7 +99,7 @@ void SimpleButton::drawButton( TQPainter *p )
if (m_highlight || isDown() || isOn()) {
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
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;
if (isDown() || isOn()) flags |= TQStyle::Style_Down;
tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);

if (m_forceStandardCursor) {
SimpleButton::drawButton(p);


+ 1
- 1
kicker/menuext/tom/tom.cc View File

@@ -755,7 +755,7 @@ void TOM::paintEvent(TQPaintEvent * e)

TQPainter p(this);

tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
TQRect( 0, 0, width(), height() ),
colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0 ) );


+ 8
- 8
kicker/taskbar/taskcontainer.cpp View File

@@ -314,7 +314,7 @@ TQSizePolicy TaskContainer::sizePolicy() const
void TaskContainer::resizeEvent( TQResizeEvent * )
{
// 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 );
}

@@ -533,7 +533,7 @@ void TaskContainer::drawButton(TQPainter *p)

font.setBold(active);

TQColorGroup colors = tqpalette().active();
TQColorGroup colors = palette().active();
if (TaskBarSettings::useCustomColors())
{
@@ -582,20 +582,20 @@ void TaskContainer::drawButton(TQPainter *p)

bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate));
bool reverse = TQApplication::reverseLayout();
TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this));
TQPoint shift = TQPoint(tqstyle().pixelMetric(TQStyle::PM_ButtonShiftHorizontal),
tqstyle().pixelMetric(TQStyle::PM_ButtonShiftVertical));
TQRect br(style().subRect(TQStyle::SR_PushButtonContents, this));
TQPoint shift = TQPoint(style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal),
style().pixelMetric(TQStyle::PM_ButtonShiftVertical));

// draw button background
if (drawButton)
{
if (KickerSettings::showDeepButtons()) {
tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p,
style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p,
TQRect(1, 1, width()-3, height()-2),
colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised);
}
else {
tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p,
style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p,
TQRect(1, 1, width()-2, height()-2),
colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised);
}
@@ -794,7 +794,7 @@ void TaskContainer::drawButton(TQPainter *p)
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


+ 1
- 1
kicker/taskmanager/taskmanager.cpp View File

@@ -1375,7 +1375,7 @@ TQPixmap Task::thumbnail(int maxDimension)
int thumbnailHeight = (int)(winAttr.height * factor);

TQPixmap thumbnail(thumbnailWidth, thumbnailHeight);
thumbnail.fill(TQApplication::tqpalette().active().background());
thumbnail.fill(TQApplication::palette().active().background());

#if 0 // TQImage::smoothScale() scaling
TQPixmap full(winAttr.width, winAttr.height);


+ 2
- 2
kioslave/media/kfile-plugin/kfilemediaplugin.cpp View File

@@ -148,9 +148,9 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
p.fillRect(0, 0, length, 20, Qt::red);
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,
TQStyle::Style_Sunken);



+ 1
- 1
kioslave/smtp/request.cc View File

@@ -93,7 +93,7 @@ namespace KioSMTP {

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



+ 6
- 6
klipper/clipboardpoll.cpp View File

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


+ 1
- 1
klipper/popupproxy.cpp View File

@@ -109,7 +109,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
Q_ASSERT( id != -1 ); // Be sure that the item was inserted.
TQMenuItem* mi = proxy_for_menu->findItem( id );
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,
TQSize( 0, fontheight ),
TQStyleOption(mi,10,0) ).height();


+ 1
- 1
klipper/toplevel.cpp View File

@@ -142,7 +142,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config )

updateTimestamp(); // read initial X user time
setBackgroundMode( X11ParentRelative );
clip = kapp->tqclipboard();
clip = kapp->clipboard();

connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow()));
m_overflowClearTimer.start( 1000 );


+ 1
- 1
konqueror/about/konq_aboutpage.cc View File

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


+ 1
- 1
konqueror/about/specs.html View File

@@ -121,7 +121,7 @@
<td valign="top"><a href="http://www.openssl.org">%1<!--OpenSSL--></a></td>
</tr>
<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">%1<!--built-in--></td>
</tr>


+ 2
- 2
konqueror/keditbookmarks/actionsimpl.cpp View File

@@ -345,7 +345,7 @@ void ActionsImpl::slotCopy() {
TQValueList<KBookmark> bookmarks
= ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */);
kapp->tqclipboard()->setData(data, TQClipboard::Clipboard);
kapp->clipboard()->setData(data, TQClipboard::Clipboard);
}

void ActionsImpl::slotPaste() {
@@ -353,7 +353,7 @@ void ActionsImpl::slotPaste() {
KEBMacroCommand *mcmd =
CmdGen::insertMimeSource(
i18n("Paste"),
kapp->tqclipboard()->data(TQClipboard::Clipboard),
kapp->clipboard()->data(TQClipboard::Clipboard),
ListView::self()->userAddress());
CmdHistory::self()->didCommand(mcmd);
}


+ 2
- 2
konqueror/keditbookmarks/toplevel.cpp View File

@@ -247,7 +247,7 @@ KEBApp::KEBApp(

m_dcopIface = new KBookmarkEditorIface();

connect(kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ),
connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ),
TQT_SLOT( slotClipboardDataChanged() ));

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


+ 5
- 5
konqueror/konq_combo.cc View File

@@ -540,7 +540,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) {
// check if the pixmap was clicked
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() ) {
m_dragStart = e->pos();
@@ -551,7 +551,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
// check if the lock icon was clicked
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 )
emit showPageSecurity();

@@ -604,7 +604,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
TQComboBox::paintEvent( pe );

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);
if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) {
@@ -723,8 +723,8 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
pmWidth = pm->width() + 5;
}

int entryWidth = listBox()->width() - listBox()->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) -
2 * listBox()->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth );
int entryWidth = listBox()->width() - listBox()->style().pixelMetric( TQStyle::PM_ScrollBarExtent ) -
2 * listBox()->style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
int titleWidth = ( entryWidth / 3 ) - 1;
int urlWidth = entryWidth - titleWidth - pmWidth - 2;



+ 1
- 1
konqueror/konq_frame.cc View File

@@ -274,7 +274,7 @@ void KonqFrameStatusBar::updateActiveStatus()

bool hasFocus = m_pParentKonqFrame->isActivePart();

const TQColorGroup& activeCg = kapp->tqpalette().active();
const TQColorGroup& activeCg = kapp->palette().active();
setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() );

static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) );


+ 4
- 4
konqueror/konq_mainwindow.cc View File

@@ -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_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
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(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_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
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(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );

@@ -3563,7 +3563,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
void KonqMainWindow::slotClipboardDataChanged()
{
//kdDebug(1202) << "KonqMainWindow::slotClipboardDataChanged()" << endl;
TQMimeSource *data = TQApplication::tqclipboard()->data();
TQMimeSource *data = TQApplication::clipboard()->data();
m_paPaste->setEnabled( data->provides( "text/plain" ) );
slotCheckComboSelection();
}
@@ -3583,7 +3583,7 @@ void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, TQt::Butto
m_combo->clearTemporary();
focusLocationBar();
if ( state & Qt::MidButton )
m_combo->setURL( TQApplication::tqclipboard()->text( TQClipboard::Selection ) );
m_combo->setURL( TQApplication::clipboard()->text( TQClipboard::Selection ) );
}

void KonqMainWindow::slotForceSaveMainWindowSettings()


+ 4
- 4
konqueror/konq_tabs.cc View File

@@ -440,8 +440,8 @@ void KonqFrameTabs::slotSubPopupMenuTabActivated( int _id)

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


+ 1
- 1
konqueror/listview/konq_listview.cc View File

@@ -144,7 +144,7 @@ void ListViewBrowserExtension::updateActions()
void ListViewBrowserExtension::copySelection( bool 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()


+ 1
- 1
konqueror/listview/konq_listviewwidget.cc View File

@@ -551,7 +551,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )

TQPoint pt( m_rubber->x(), m_rubber->y() );
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() ),
colorGroup(), TQStyle::Style_Default, colorGroup().base() );


+ 2
- 2
konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp View File

@@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation()

if ( !bookmark.isGroup() )
{
kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Selection );
kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Clipboard );
}
}


+ 2
- 2
konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp View File

@@ -162,7 +162,7 @@ void KonqSidebarDirTreeItem::itemSelected()
if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() )
bInTrash = true;

TQMimeSource *data = TQApplication::tqclipboard()->data();
TQMimeSource *data = TQApplication::clipboard()->data();
bool paste = ( data->encodedData( data->format() ).size() != 0 );

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


+ 2
- 2
konqueror/sidebar/trees/konq_sidebartree.cpp View File

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

///////////////////////////////////////////////////////////////////


+ 2
- 2
konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp View File

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


+ 2
- 2
konqueror/sidebar/trees/konqsidebar_tree.cpp View File

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

void KonqSidebar_Tree::copy()
{
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L );
if (drag)
TQApplication::tqclipboard()->setData( drag );
TQApplication::clipboard()->setData( drag );
}

void KonqSidebar_Tree::paste()


+ 1
- 1
konsole/konsole/TEScreen.cpp View File

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

// Region commands -------------------------------------------------------------


+ 12
- 12
konsole/konsole/TEWidget.cpp View File

@@ -193,10 +193,10 @@ void TEWidget::setColorTable(const ColorEntry table[])
xterm fonts have these at 0x00..0x1f.

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
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.
*/

@@ -215,7 +215,7 @@ unsigned short vt100_graphics[32] =
/*
static TQChar vt100extended(TQChar c)
{
switch (c.tqunicode())
switch (c.unicode())
{
case 0x25c6 : return 1;
case 0x2592 : return 2;
@@ -391,7 +391,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
// konsole in opaque mode.
bY = bX = 1;

cb = TQApplication::tqclipboard();
cb = TQApplication::clipboard();
TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()),
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.
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.
@@ -578,7 +578,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y,
}

//Check for line-drawing char
if (isLineChar(drawstr[0].tqunicode()))
if (isLineChar(drawstr[0].unicode()))
{
uchar code = drawstr[0].cell();
if (LineChars[code])
@@ -1803,8 +1803,8 @@ void TEWidget::emitText(TQString text)
void TEWidget::emitSelection(bool useXselection,bool appendReturn)
// Paste Clipboard by simulating keypress events
{
TQApplication::tqclipboard()->setSelectionMode( useXselection );
TQString text = TQApplication::tqclipboard()->text();
TQApplication::clipboard()->setSelectionMode( useXselection );
TQString text = TQApplication::clipboard()->text();
if(appendReturn)
text.append("\r");
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 clearSelectionSignal();
}
TQApplication::tqclipboard()->setSelectionMode( false );
TQApplication::clipboard()->setSelectionMode( false );
}

void TEWidget::setSelection(const TQString& t)
{
// Disconnect signal while WE set the clipboard
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT(onClearSelection()) );

@@ -2104,7 +2104,7 @@ void TEWidget::clearImage()

void TEWidget::calcGeometry()
{
scrollbar->resize(TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent),
scrollbar->resize(TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent),
contentsRect().height());
switch(scrollLoc)
{
@@ -2268,7 +2268,7 @@ void TEWidget::dropEvent(TQDropEvent* event)
void TEWidget::doDrag()
{
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();
// Don't delete the TQTextDrag object. Qt will delete it when it's done with it.
}


+ 1
- 1
konsole/konsole/TEmuVt102.cpp View File

@@ -307,7 +307,7 @@ void TEmuVt102::initTokenizer()
#define ESC 27
#define CNTL(c) ((c)-'@')

// process an incoming tqunicode character
// process an incoming unicode character

void TEmuVt102::onRcvChar(int cc)
{ int i;


+ 5
- 5
konsole/konsole/TEmulation.cpp View File

@@ -251,7 +251,7 @@ int TEmulation::keymapNo()
*/

void TEmulation::onRcvChar(int c)
// process application tqunicode input to terminal
// process application unicode input to terminal
// this is a trivial scanner
{
c &= 0xff;
@@ -284,7 +284,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev )
scr->setHistCursor(scr->getHistLines());
if (!ev->text().isEmpty())
{ // 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
// routine will never be used, we simply emit plain ascii.
emit sndBlock(TQString(ev->text()).ascii(),ev->text().length());
@@ -299,7 +299,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev )
// 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)
@@ -345,7 +345,7 @@ void TEmulation::onRcvBlock(const char *s, int len)
if (r[j].category() == TQChar::Mark_NonSpacing)
scr->compose(r.mid(j,1));
else
onRcvChar(r[j].tqunicode());
onRcvChar(r[j].unicode());
}