From 73c08b592db45af554b9f21029bc549d70f683ab Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:46:05 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kicker/applets/clock/analog.ui | 8 +-- kicker/applets/clock/clock.cpp | 86 ++++++++++++------------ kicker/applets/clock/clockapplet.kcfg | 24 +++---- kicker/applets/clock/digital.ui | 6 +- kicker/applets/clock/fuzzy.ui | 6 +- kicker/applets/clock/init.cpp | 2 +- kicker/applets/clock/settings.ui | 12 ++-- kicker/applets/launcher/configdlgbase.ui | 10 +-- kicker/applets/launcher/quickbutton.cpp | 2 +- kicker/applets/launcher/quickbuttongroup.h | 6 +- kicker/applets/launcher/quicklauncher.cpp | 10 +-- kicker/applets/lockout/lockout.cpp | 16 ++--- kicker/applets/media/mediumbutton.cpp | 4 +- kicker/applets/menu/menuapplet.cpp | 4 +- kicker/applets/minipager/pagerapplet.cpp | 6 +- kicker/applets/minipager/pagerbutton.cpp | 42 ++++++------ kicker/applets/naughty/NaughtyApplet.cpp | 2 +- kicker/applets/naughty/NaughtyProcessMonitor.cpp | 8 +-- kicker/applets/run/runapplet.cpp | 12 ++-- kicker/applets/swallow/prefwidgetbase.ui | 2 +- kicker/applets/swallow/swallow.cpp | 2 +- kicker/applets/systemtray/systemtrayapplet.cpp | 20 +++--- kicker/applets/systemtray/systemtrayapplet.h | 2 +- kicker/applets/taskbar/taskbarapplet.cpp | 8 +-- 24 files changed, 150 insertions(+), 150 deletions(-) (limited to 'kicker/applets') diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui index ea0135ceb..024caaefe 100644 --- a/kicker/applets/clock/analog.ui +++ b/kicker/applets/clock/analog.ui @@ -75,7 +75,7 @@ Expanding - + 40 20 @@ -149,7 +149,7 @@ Expanding - + 16 20 @@ -241,7 +241,7 @@ Expanding - + 310 20 @@ -269,7 +269,7 @@ Expanding - + 20 50 diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 74e6a6c99..ba5f7eb26 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include @@ -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())); @@ -123,7 +123,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - addPage(settings, i18n("General"), TQString::tqfromLatin1("package_settings")); + addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); } void KConfigDialogSingle::updateSettings() @@ -242,7 +242,7 @@ void PlainClock::updateClock() void PlainClock::loadSettings() { setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame); - tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine); + setAlignment(AlignVCenter | AlignHCenter | SingleLine); setFont(_prefs->plainFont()); } @@ -353,9 +353,9 @@ void DigitalClock::updateClock() if (_force || newStr != _timeStr) { _timeStr = newStr; - tqsetUpdatesEnabled( FALSE ); + setUpdatesEnabled( FALSE ); display(_timeStr); - tqsetUpdatesEnabled( TRUE ); + setUpdatesEnabled( TRUE ); update(); } @@ -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()); } @@ -415,7 +415,7 @@ void DigitalClock::paintEvent(TQPaintEvent*) // but other colors would break the lcd-lock anyway void DigitalClock::drawContents( TQPainter * p) { - tqsetUpdatesEnabled( FALSE ); + setUpdatesEnabled( FALSE ); TQPalette pal = palette(); if (_prefs->digitalLCDStyle()) pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128)); @@ -430,7 +430,7 @@ void DigitalClock::drawContents( TQPainter * p) pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor()); setPalette( pal ); p->translate( -2, -2 ); - tqsetUpdatesEnabled( TRUE ); + setUpdatesEnabled( TRUE ); TQLCDNumber::drawContents( p ); p->translate( +1, +1 ); } @@ -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()); } @@ -827,7 +827,7 @@ void FuzzyClock::drawContents(TQPainter *p) } if (phStart >= 0) newTimeStr.replace(phStart, phLength, hourNames[realHour]); - newTimeStr.replace(0, 1, TQString(newTimeStr.tqat(0).upper())); + newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper())); } } else if (_prefs->fuzzyness() == 3) { newTimeStr = dayTime[_time.hour() / 3]; @@ -908,12 +908,12 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, setBackgroundOrigin(AncestorOrigin); _dayOfWeek = new TQLabel(this); - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); _dayOfWeek->setBackgroundOrigin(AncestorOrigin); _dayOfWeek->installEventFilter(this); // catch mouse clicks _date = new TQLabel(this); - _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); _date->setBackgroundOrigin(AncestorOrigin); _date->installEventFilter(this); // catch mouse clicks @@ -980,18 +980,18 @@ int ClockApplet::widthForHeight(int h) const bool mustShowDate = showDate || (zone->zoneIndex() != 0); if (mustShowDate) { - _date->tqsetAlignment(AlignVCenter | AlignHCenter); + _date->setAlignment(AlignVCenter | AlignHCenter); if (!dateToSide) { - shareDateHeight = _date->tqsizeHint().height(); + shareDateHeight = _date->sizeHint().height(); } } if (showDayOfWeek) { - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter); if (!dateToSide) { - shareDayOfWeekHeight = _dayOfWeek->tqsizeHint().height(); + shareDayOfWeekHeight = _dayOfWeek->sizeHint().height(); } } @@ -1007,8 +1007,8 @@ int ClockApplet::widthForHeight(int h) const } else { - int dateWidth = mustShowDate ? _date->tqsizeHint().width() + 4 : 0; - int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->tqsizeHint().width() + 4 : 0; + int dateWidth = mustShowDate ? _date->sizeHint().width() + 4 : 0; + int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->sizeHint().width() + 4 : 0; if (dateToSide) { @@ -1020,7 +1020,7 @@ int ClockApplet::widthForHeight(int h) const // if the date format STARTS with a year, assume it's in descending // order and should therefore PRECEED the date. TQString dateFormat = KGlobal::locale()->dateFormatShort(); - dateFirst = dateFormat.tqat(1) == 'y' || dateFormat.tqat(1) == 'Y'; + dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y'; } if (dateFirst) @@ -1064,13 +1064,13 @@ int ClockApplet::widthForHeight(int h) const _clock->widget()->move(0, 0); if (showDayOfWeek) { - _dayOfWeek->setFixedSize(w, _dayOfWeek->tqsizeHint().height()); + _dayOfWeek->setFixedSize(w, _dayOfWeek->sizeHint().height()); _dayOfWeek->move(0, _clock->widget()->height()); } if (mustShowDate) { - _date->setFixedSize(w, _date->tqsizeHint().height()); + _date->setFixedSize(w, _date->sizeHint().height()); _date->move(0, _clock->widget()->height() + shareDayOfWeekHeight); } } @@ -1094,16 +1094,16 @@ int ClockApplet::heightForWidth(int w) const // add 4 pixels in height for each of date+dayOfWeek, if visible if (showDayOfWeek) { - if (_dayOfWeek->tqminimumSizeHint().width() > w) + if (_dayOfWeek->minimumSizeHint().width() > w) { - _dayOfWeek->tqsetAlignment(AlignVCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | WordBreak); } else { - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); } - _dayOfWeek->setFixedSize(w, _dayOfWeek->tqminimumSizeHint().height()); + _dayOfWeek->setFixedSize(w, _dayOfWeek->minimumSizeHint().height()); _dayOfWeek->move(0, clockHeight); clockHeight += _dayOfWeek->height(); @@ -1116,7 +1116,7 @@ int ClockApplet::heightForWidth(int w) const // display on panel that is too narrow and then they made it wider const_cast(this)->updateDateLabel(false); - if (_date->tqminimumSizeHint().width() > w) + if (_date->minimumSizeHint().width() > w) { TQString dateStr = _date->text(); // if we're too wide to fit, replace the first non-digit from the end with a space @@ -1127,13 +1127,13 @@ int ClockApplet::heightForWidth(int w) const } } - if (_date->tqminimumSizeHint().width() > w) + if (_date->minimumSizeHint().width() > w) { - _date->tqsetAlignment(AlignVCenter | WordBreak); + _date->setAlignment(AlignVCenter | WordBreak); } else { - _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); } _date->setFixedSize(w, _date->heightForWidth(w)); _date->move(0, clockHeight); @@ -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()) @@ -1272,7 +1272,7 @@ void ClockApplet::reconfigure() _clock->widget()->installEventFilter(this); // catch mouse clicks _clock->widget()->show(); - _clock->forceUpdate(); /* force tqrepaint */ + _clock->forceUpdate(); /* force repaint */ if (showDayOfWeek) { @@ -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); @@ -1541,7 +1541,7 @@ void ClockApplet::aboutToShowContextMenu() menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); KPopupMenu *copyMenu = new KPopupMenu( menu ); @@ -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() @@ -1615,7 +1615,7 @@ TQTime ClockApplet::clockGetTime() TQDate ClockApplet::clockGetDate() { - return TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(TZoffset).date()); + return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date()); } void ClockApplet::showZone(int z) @@ -1623,7 +1623,7 @@ void ClockApplet::showZone(int z) zone->setZone(z); TZoffset = zone->calc_TZ_offset( zone->zone() ); updateDateLabel(); - _clock->forceUpdate(); /* force tqrepaint */ + _clock->forceUpdate(); /* force repaint */ } void ClockApplet::nextZone() @@ -1840,7 +1840,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) (m_clock->type() == Prefs::EnumType::Analog) ) { // show full time (incl. hour) as tooltip for Fuzzy clock - tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset))); + tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset))); } else { diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg index 6abd26ceb..04beba322 100644 --- a/kicker/applets/clock/clockapplet.kcfg +++ b/kicker/applets/clock/clockapplet.kcfg @@ -20,11 +20,11 @@ - KApplication::tqpalette().active().text() + KApplication::palette().active().text() - KApplication::tqpalette().active().background() + KApplication::palette().active().background() @@ -63,11 +63,11 @@ defFont.setBold(true); - KApplication::tqpalette().active().text() + KApplication::palette().active().text() - KApplication::tqpalette().active().background() + KApplication::palette().active().background() @@ -89,15 +89,15 @@ defFont.setBold(true); - KApplication::tqpalette().active().text() + KApplication::palette().active().text() - KApplication::tqpalette().active().background() + KApplication::palette().active().background() - KApplication::tqpalette().active().mid() + KApplication::palette().active().mid() @@ -127,15 +127,15 @@ defFont.setBold(true); - KApplication::tqpalette().active().text() + KApplication::palette().active().text() - KApplication::tqpalette().active().background() + KApplication::palette().active().background() - KApplication::tqpalette().active().mid() + KApplication::palette().active().mid() @@ -168,11 +168,11 @@ defFont=KGlobalSettings::generalFont(); - KApplication::tqpalette().active().text() + KApplication::palette().active().text() - KApplication::tqpalette().active().background() + KApplication::palette().active().background() diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui index fc2b66cac..1450e6f4f 100644 --- a/kicker/applets/clock/digital.ui +++ b/kicker/applets/clock/digital.ui @@ -83,7 +83,7 @@ Expanding - + 20 20 @@ -193,7 +193,7 @@ Expanding - + 110 20 @@ -226,7 +226,7 @@ Expanding - + 20 20 diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui index ebe6af9fc..6906808c7 100644 --- a/kicker/applets/clock/fuzzy.ui +++ b/kicker/applets/clock/fuzzy.ui @@ -79,7 +79,7 @@ Expanding - + 40 20 @@ -109,7 +109,7 @@ Expanding - + 20 30 @@ -153,7 +153,7 @@ Expanding - + 51 20 diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp index a21a62757..a5a7cac30 100644 --- a/kicker/applets/clock/init.cpp +++ b/kicker/applets/clock/init.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 6cf1d30f0..560ddcc7f 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -102,7 +102,7 @@ Expanding - + 20 20 @@ -188,7 +188,7 @@ Expanding - + 20 20 @@ -284,7 +284,7 @@ Expanding - + 230 20 @@ -306,7 +306,7 @@ Expanding - + 20 20 @@ -371,7 +371,7 @@ Expanding - + 343 20 @@ -421,7 +421,7 @@ Expanding - + 20 100 diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui index e551864b1..edfa6f02f 100644 --- a/kicker/applets/launcher/configdlgbase.ui +++ b/kicker/applets/launcher/configdlgbase.ui @@ -83,7 +83,7 @@ Expanding - + 332 20 @@ -138,7 +138,7 @@ Expanding - + 140 20 @@ -152,7 +152,7 @@ Short Term - + AlignCenter @@ -163,7 +163,7 @@ Long Term - + AlignCenter @@ -192,7 +192,7 @@ Expanding - + 50 20 diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 0c19e5326..248614811 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -163,7 +163,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, TQToolTip::add(this, _qurl->name()); resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM)); - TQBrush bgbrush(tqcolorGroup().brush(TQColorGroup::Background)); + TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background)); QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu( parent, this, _qurl->url()); diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h index 37d04ef9e..1c153d85c 100644 --- a/kicker/applets/launcher/quickbuttongroup.h +++ b/kicker/applets/launcher/quickbuttongroup.h @@ -24,15 +24,15 @@ public: void setDragging(bool drag); void setEnableDrag(bool enable); void deleteContents(); - void tqsetUpdatesEnabled(bool enable); + void setUpdatesEnabled(bool enable); }; QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc) { return findProperty(desc, std::mem_fun(&QuickButton::url));} -inline void QuickButtonGroup::tqsetUpdatesEnabled(bool enable) +inline void QuickButtonGroup::setUpdatesEnabled(bool enable) { for (QuickButtonGroup::iterator i=begin();i!=end();++i) { - (*i)->tqsetUpdatesEnabled(enable); + (*i)->setUpdatesEnabled(enable); if (enable) { (*i)->update();} } } diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 7ead9eced..30b125726 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -770,8 +770,8 @@ void QuickLauncher::refreshContents() unsigned index; TQPoint pos; - tqsetUpdatesEnabled(false); - m_buttons->tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); + m_buttons->setUpdatesEnabled(false); for (index = 0; index < m_buttons->size(); index++) { pos = m_manager->pos(index); @@ -791,9 +791,9 @@ void QuickLauncher::refreshContents() m_dragButtons->setDragging(true); } m_buttons->show(); - tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); update(); - m_buttons->tqsetUpdatesEnabled(true); + m_buttons->setUpdatesEnabled(true); updateGeometry(); emit updateLayout(); updateStickyHighlightLayer(); @@ -1097,7 +1097,7 @@ void QuickLauncher::updateStickyHighlightLayer() } } } - tqrepaint(); + repaint(); } void QuickLauncher::paintEvent(TQPaintEvent* e) diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index 882c8286b..98d0e1708 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include +#include #include #include #include @@ -94,8 +94,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name if (!kapp->authorize("logout")) logoutButton->hide(); - lockButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - logoutButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -113,7 +113,7 @@ Lockout::~Lockout() // direction and wasting a lot of space. void Lockout::checkLayout( int height ) const { - TQSize s = tqminimumSizeHint(); + TQSize s = minimumSizeHint(); TQBoxLayout::Direction direction = layout->direction(); if ( direction == TQBoxLayout::LeftToRight && @@ -131,13 +131,13 @@ void Lockout::checkLayout( int height ) const int Lockout::widthForHeight( int height ) const { checkLayout( height ); - return tqsizeHint().width(); + return sizeHint().width(); } int Lockout::heightForWidth( int width ) const { checkLayout( width ); - return tqsizeHint().height(); + return sizeHint().height(); } void Lockout::lock() @@ -177,9 +177,9 @@ void Lockout::mouseMoveEvent(TQMouseEvent* e) void Lockout::propagateMouseEvent(TQMouseEvent* e) { if ( !isTopLevel() ) { - TQMouseEvent me(e->type(), mapTo( tqtopLevelWidget(), e->pos() ), + TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( tqtopLevelWidget(), &me ); + TQApplication::sendEvent( topLevelWidget(), &me ); } } diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index 1e71fbd6f..da2b30564 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -20,7 +20,7 @@ #include "mediumbutton.h" #include -#include +#include #include #include #include @@ -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) diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index f0a86946f..df34a78ac 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "menuapplet.h" -#include +#include #include #include // avoid X11 #define's @@ -264,7 +264,7 @@ void Applet::positionChange( Position ) // Kicker's frame). void Applet::updateTopEdgeOffset() { - TQPoint p = tqtopLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); + TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); if( p.y() <= 2 ) // 2 = work also when running in appletproxy topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y(); else diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index a684aa6f8..3bb7f65d4 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include @@ -365,7 +365,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) if( m_desktopLayoutOwner == NULL ) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( qt_xdisplay()); - m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).tqarg( screen ).latin1(), + m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), screen, TQT_TQOBJECT(this) ); if( !m_desktopLayoutOwner->claim( false )) { @@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged() { TQString name = m_twin->desktopName(i); (*it)->setDesktopName(name); - (*it)->tqrepaint(); + (*it)->repaint(); TQToolTip::remove((*it)); TQToolTip::add((*it), name); } diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index e494d538d..1dfa5ee25 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include @@ -157,8 +157,8 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const TQRect r = mapGeometryToViewport(*info); if (!info->hasState(NET::Sticky) && - !TQApplication::desktop()->tqgeometry().contains(r.topLeft()) && - !TQApplication::desktop()->tqgeometry().contains(r.topRight())) + !TQApplication::desktop()->geometry().contains(r.topLeft()) && + !TQApplication::desktop()->geometry().contains(r.topRight())) return false; } @@ -404,16 +404,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // transparent windows get an 1 pixel frame... if (on) { - bp->setPen(tqcolorGroup().midlight()); + bp->setPen(colorGroup().midlight()); } else if (down) { - bp->setPen(KickerLib::blendColors(tqcolorGroup().mid(), - tqcolorGroup().midlight())); + bp->setPen(KickerLib::blendColors(colorGroup().mid(), + colorGroup().midlight())); } else { - bp->setPen(tqcolorGroup().dark()); + bp->setPen(colorGroup().dark()); } bp->drawRect(0, 0, w, h); @@ -424,16 +424,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (on) { - background = tqcolorGroup().brush(TQColorGroup::Midlight); + background = colorGroup().brush(TQColorGroup::Midlight); } else if (down) { - background = TQBrush(KickerLib::blendColors(tqcolorGroup().mid(), - tqcolorGroup().midlight())); + background = TQBrush(KickerLib::blendColors(colorGroup().mid(), + colorGroup().midlight())); } else { - background = tqcolorGroup().brush(TQColorGroup::Mid); + background = colorGroup().brush(TQColorGroup::Mid); } bp->fillRect(0, 0, w, h, background); @@ -462,12 +462,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (twin->activeWindow() == info->win()) { - TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight); - qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush); + TQBrush brush = colorGroup().brush(TQColorGroup::Highlight); + qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush); } else { - TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button); + TQBrush brush = colorGroup().brush(TQColorGroup::Button); if (on) { @@ -475,7 +475,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } bp->fillRect(r, brush); - qDrawShadeRect(bp, r, tqcolorGroup(), true, 1, 0); + qDrawShadeRect(bp, r, colorGroup(), true, 1, 0); } if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15) @@ -498,11 +498,11 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // makes it look a bit more finished. if (on) { - bp->setPen(tqcolorGroup().midlight()); + bp->setPen(colorGroup().midlight()); } else { - bp->setPen(tqcolorGroup().mid()); + bp->setPen(colorGroup().mid()); } bp->drawRect(0, 0, w, h); @@ -515,7 +515,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (transparent || liveBkgnd) { - bp->setPen(on ? tqcolorGroup().midlight() : tqcolorGroup().buttonText()); + bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText()); m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size()); } else @@ -523,7 +523,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } if (m_inside) - KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), tqcolorGroup().foreground()); + KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground()); } void KMiniPagerButton::mousePressEvent(TQMouseEvent * e) @@ -586,9 +586,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e) TQPixmap windowImage(ww, wh); TQPainter bp(&windowImage, this); - bp.setPen(tqcolorGroup().foreground()); + bp.setPen(colorGroup().foreground()); bp.drawRect(0, 0, ww, wh); - bp.fillRect(1, 1, ww - 2, wh - 2, tqcolorGroup().background()); + bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background()); Task::List tasklist; tasklist.append(m_currentWindow); diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 953bcacbd..bf1d96232 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index aaca4213e..4bff5f851 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -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]; diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index 8f441a397..fb7ac107b 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -121,14 +121,14 @@ void RunApplet::resizeEvent(TQResizeEvent*) _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); - if(height() >= _input->tqsizeHint().height() + _label->height()) + if(height() >= _input->sizeHint().height() + _label->height()) { - int inputVOffset = height() - _input->tqsizeHint().height() - 2; - int labelHeight = _label->tqsizeHint().height(); + int inputVOffset = height() - _input->sizeHint().height() - 2; + int labelHeight = _label->sizeHint().height(); _label->setGeometry(0, inputVOffset - labelHeight, width(), labelHeight); _input->setGeometry(0, inputVOffset, - width(), _input->tqsizeHint().height()); + width(), _input->sizeHint().height()); _label->show(); } else @@ -138,7 +138,7 @@ void RunApplet::resizeEvent(TQResizeEvent*) // make it as high as the combobox naturally wants to be // but no taller than the panel is! // don't forget to center it vertically either. - int newHeight = _input->tqsizeHint().height(); + int newHeight = _input->sizeHint().height(); if (newHeight > height()) newHeight = height(); _input->setGeometry(0, (height() - newHeight) / 2, @@ -184,7 +184,7 @@ void RunApplet::setButtonText() int RunApplet::widthForHeight(int ) const { - return _label->tqsizeHint().width(); + return _label->sizeHint().width(); } int RunApplet::heightForWidth(int ) const diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui index 1d3ef95bf..bd2673efa 100644 --- a/kicker/applets/swallow/prefwidgetbase.ui +++ b/kicker/applets/swallow/prefwidgetbase.ui @@ -110,7 +110,7 @@ Expanding - + 20 20 diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 03be831e3..f171b1099 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 570db2f92..3303135b3 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -388,7 +388,7 @@ void SystemTrayApplet::checkAutoRetract() return; } - if (!tqgeometry().contains(mapFromGlobal(TQCursor::pos()))) + if (!geometry().contains(mapFromGlobal(TQCursor::pos()))) { m_autoRetractTimer->stop(); if (m_autoRetract) @@ -427,12 +427,12 @@ void SystemTrayApplet::showExpandButton(bool show) if (orientation() == Qt::Vertical) { m_expandButton->setFixedSize(width() - 4, - m_expandButton->tqsizeHint() + m_expandButton->sizeHint() .height()); } else { - m_expandButton->setFixedSize(m_expandButton->tqsizeHint() + m_expandButton->setFixedSize(m_expandButton->sizeHint() .width(), height() - 4); } @@ -869,7 +869,7 @@ int SystemTrayApplet::widthForHeight(int h) const me->setFixedHeight(h); } - return tqsizeHint().width(); + return sizeHint().width(); } int SystemTrayApplet::heightForWidth(int w) const @@ -888,7 +888,7 @@ int SystemTrayApplet::heightForWidth(int w) const me->setFixedWidth(w); } - return tqsizeHint().height(); + return sizeHint().height(); } void SystemTrayApplet::moveEvent( TQMoveEvent* ) @@ -906,7 +906,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* ) void SystemTrayApplet::layoutTray() { - tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); int iconCount = m_shownWins.count(); @@ -927,11 +927,11 @@ void SystemTrayApplet::layoutTray() { if (orientation() == Qt::Vertical) { - m_expandButton->setFixedSize(width() - 4, m_expandButton->tqsizeHint().height()); + m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height()); } else { - m_expandButton->setFixedSize(m_expandButton->tqsizeHint().width(), height() - 4); + m_expandButton->setFixedSize(m_expandButton->sizeHint().width(), height() - 4); } } @@ -1102,7 +1102,7 @@ void SystemTrayApplet::layoutTray() } } - tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); updateGeometry(); setBackground(); @@ -1138,7 +1138,7 @@ TrayEmbed::TrayEmbed( bool kdeTray, TQWidget* parent ) void TrayEmbed::getIconSize(int defaultIconSize) { - TQSize minSize = tqminimumSizeHint(); + TQSize minSize = minimumSizeHint(); int width = minSize.width(); int height = minSize.height(); diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index 92aab7268..237921884 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index ebeec601f..f52fdc059 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include -#include +#include +#include #include #include @@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->tqsizeHint(d, TQSize(200, h)).width(); + return container->sizeHint(d, TQSize(200, h)).width(); } int TaskbarApplet::heightForWidth(int w) const @@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->tqsizeHint(d, TQSize(w, 200)).height(); + return container->sizeHint(d, TQSize(w, 200)).height(); } void TaskbarApplet::preferences() -- cgit v1.2.3