diff options
Diffstat (limited to 'kicker-applets/kbinaryclock/kbinaryclock.cpp')
| -rw-r--r-- | kicker-applets/kbinaryclock/kbinaryclock.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index ebf7d59..698fa1c 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -36,7 +36,7 @@ #include <kprocess.h> #include <kstandarddirs.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kled.h> extern "C" @@ -68,7 +68,7 @@ SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Setting * Update the preview */ void SettingsImp::updatePreview(){ - int tqshape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular; + int shape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular; int look = KLed::Raised; look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look; look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look; @@ -84,12 +84,12 @@ void SettingsImp::updatePreview(){ kLed5->setBackgroundColor(backgroundColor); kLed6->setBackgroundColor(backgroundColor); - kLed1->setShape((KLed::Shape)tqshape); - kLed2->setShape((KLed::Shape)tqshape); - kLed3->setShape((KLed::Shape)tqshape); - kLed4->setShape((KLed::Shape)tqshape); - kLed5->setShape((KLed::Shape)tqshape); - kLed6->setShape((KLed::Shape)tqshape); + kLed1->setShape((KLed::Shape)shape); + kLed2->setShape((KLed::Shape)shape); + kLed3->setShape((KLed::Shape)shape); + kLed4->setShape((KLed::Shape)shape); + kLed5->setShape((KLed::Shape)shape); + kLed6->setShape((KLed::Shape)shape); kLed1->setColor(color); kLed2->setColor(color); @@ -173,14 +173,14 @@ void KBinaryClock::resizeEvent( TQResizeEvent *e ) { * Load the settings for the clock. */ void KBinaryClock::loadSettings(){ - int tqshape = prefs->shape(); + int shape = prefs->shape(); int look = prefs->look(); TQColor color = prefs->color(); int darkFactor = prefs->darkFactor(); TQColor backgroundColor = prefs->background(); bool modifyBackground = false; - if(backgroundColor != KApplication::tqpalette().active().background()){ + if(backgroundColor != KApplication::palette().active().background()){ setPaletteBackgroundColor(backgroundColor); modifyBackground = true; } @@ -197,7 +197,7 @@ void KBinaryClock::loadSettings(){ } for(int i=0; i < 4; i++){ for(int j=0; j < ledWidth;j++){ - ledMatrix[j][i]->setShape((KLed::Shape)tqshape); + ledMatrix[j][i]->setShape((KLed::Shape)shape); ledMatrix[j][i]->setColor(color); ledMatrix[j][i]->setLook((KLed::Look)look); ledMatrix[j][i]->setDarkFactor(darkFactor); @@ -290,7 +290,7 @@ void KBinaryClock::openContextMenu() { menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); KPopupMenu *copyMenu = new KPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); @@ -329,8 +329,8 @@ void KBinaryClock::openContextMenu() { proc << locate("exe", "tdesu"); proc << "--nonewdcop"; proc << TQString("%1 clock --lang %2") - .tqarg(locate("exe", "kcmshell")) - .tqarg(KGlobal::locale()->language()); + .arg(locate("exe", "kcmshell")) + .arg(KGlobal::locale()->language()); proc.start(KProcess::DontCare); break; case 104: @@ -348,7 +348,7 @@ void KBinaryClock::openContextMenu() { void KBinaryClock::slotCopyMenuActivated( int id ) { TQPopupMenu *m = (TQPopupMenu *) sender(); TQString s = m->text(id); - TQApplication::tqclipboard()->setText(s); + TQApplication::clipboard()->setText(s); } void KBinaryClock::toggleCalendar() @@ -361,15 +361,15 @@ void KBinaryClock::toggleCalendar() if (_calendar || _disableCalendar){ return; } - _calendar = new DatePicker(this, TQDateTime::tqcurrentDateTime().date()); + _calendar = new DatePicker(this, TQDateTime::currentDateTime().date()); connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() )); // some extra spacing is included if aligned on a desktop edge TQPoint c = mapToGlobal(TQPoint(0,0)); - int w = _calendar->tqsizeHint().width() + 28; + int w = _calendar->sizeHint().width() + 28; // Added 28 px. to size poperly as said in API - int h = _calendar->tqsizeHint().height(); + int h = _calendar->sizeHint().height(); switch (position()) { case KPanelApplet::pLeft: c.setX(c.x()+width()+2); break; @@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) { - tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::tqcurrentDateTime().date(), false)); + tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); } #include "kbinaryclock.moc" |