summaryrefslogtreecommitdiffstats
path: root/kicker/applets/clock/clock.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
commitcc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 (patch)
tree2a29ccab4d3cea34b87bfcbc38e64a8e25d25bb0 /kicker/applets/clock/clock.cpp
parent107dd1f98367d07df7cbe2042786511e44706d3a (diff)
downloadtdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.tar.gz
tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.zip
Allow kdebase to (mostly) function correctly with TQt for Qt4
Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch) Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6) git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets/clock/clock.cpp')
-rw-r--r--kicker/applets/clock/clock.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 072bd6161..48cd1d2ae 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -364,9 +364,9 @@ void DigitalClock::updateClock()
if (_force || newStr != _timeStr)
{
_timeStr = newStr;
- setUpdatesEnabled( FALSE );
+ tqsetUpdatesEnabled( FALSE );
display(_timeStr);
- setUpdatesEnabled( TRUE );
+ tqsetUpdatesEnabled( TRUE );
update();
}
@@ -426,7 +426,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
// but other colors would break the lcd-lock anyway
void DigitalClock::drawContents( TQPainter * p)
{
- setUpdatesEnabled( FALSE );
+ tqsetUpdatesEnabled( FALSE );
TQPalette pal = palette();
if (_prefs->digitalLCDStyle())
pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128));
@@ -441,7 +441,7 @@ void DigitalClock::drawContents( TQPainter * p)
pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
setPalette( pal );
p->translate( -2, -2 );
- setUpdatesEnabled( TRUE );
+ tqsetUpdatesEnabled( TRUE );
TQLCDNumber::drawContents( p );
p->translate( +1, +1 );
}
@@ -1031,7 +1031,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.at(1) == 'y' || dateFormat.at(1) == 'Y';
+ dateFirst = dateFormat.tqat(1) == 'y' || dateFormat.tqat(1) == 'Y';
}
if (dateFirst)
@@ -1616,7 +1616,7 @@ void ClockApplet::slotCopyMenuActivated( int id )
{
TQPopupMenu *m = (TQPopupMenu *) sender();
TQString s = m->text(id);
- TQApplication::clipboard()->setText(s);
+ TQApplication::tqclipboard()->setText(s);
}
TQTime ClockApplet::clockGetTime()