diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:19:21 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:26:34 +0200 |
| commit | 0251b10c2e9a79e857e5729453d375d09fa8336e (patch) | |
| tree | 11223ad7a12c1bdbc81b9bb698618b0386a1ce5e /kdm | |
| parent | a5b44fbe44e58478ad74d819c5f4c36926d31872 (diff) | |
| download | tdebase-0251b10c2e9a79e857e5729453d375d09fa8336e.tar.gz tdebase-0251b10c2e9a79e857e5729453d375d09fa8336e.zip | |
Rename obsolete tq methods to standard names
(cherry picked from commit b492b550f35c84160958775c14ea7037c5b12181)
Diffstat (limited to 'kdm')
| -rw-r--r-- | kdm/kfrontend/kdmshutdown.cpp | 4 | ||||
| -rw-r--r-- | kdm/kfrontend/kgreeter.cpp | 2 | ||||
| -rw-r--r-- | kdm/kfrontend/kgverify.cpp | 4 | ||||
| -rw-r--r-- | kdm/kfrontend/themer/kdmlabel.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp index f34f7f668..a73a2a126 100644 --- a/kdm/kfrontend/kdmshutdown.cpp +++ b/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); diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp index 05945348a..9b974cc3a 100644 --- a/kdm/kfrontend/kgreeter.cpp +++ b/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; diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp index 05bd18962..73ec34456 100644 --- a/kdm/kfrontend/kgverify.cpp +++ b/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 ); diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp index 4959bec7b..0eab99c30 100644 --- a/kdm/kfrontend/themer/kdmlabel.cpp +++ b/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())); } } |