diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdeui/kcursor.cpp | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/kcursor.cpp')
| -rw-r--r-- | kdeui/kcursor.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kdeui/kcursor.cpp b/kdeui/kcursor.cpp index f0df154d5..02f8723f5 100644 --- a/kdeui/kcursor.cpp +++ b/kdeui/kcursor.cpp @@ -49,7 +49,7 @@ TQCursor KCursor::handCursor() KConfig *config = KGlobal::config(); KConfigGroupSaver saver( config, "General" ); -#ifndef Q_WS_WIN // this tqmask doesn't work too well on win32 +#ifndef Q_WS_WIN // this mask doesn't work too well on win32 if ( config->readEntry("handCursorStyle", "Windows") == "Windows" ) { static const unsigned char HAND_BITS[] = { @@ -67,8 +67,8 @@ TQCursor KCursor::handCursor() 0x07, 0xf8, 0xff, 0x07, 0xf0, 0xff, 0x07, 0xf0, 0xff, 0x07, 0xe0, 0xff, 0x03, 0xc0, 0xff, 0x03, 0xc0, 0xff, 0x01, 0xc0, 0xff, 0x01}; TQBitmap hand_bitmap(22, 22, HAND_BITS, true); - TQBitmap hand_tqmask(22, 22, HAND_MASK_BITS, true); - hand_cursor = new TQCursor(hand_bitmap, hand_tqmask, 7, 0); + TQBitmap hand_mask(22, 22, HAND_MASK_BITS, true); + hand_cursor = new TQCursor(hand_bitmap, hand_mask, 7, 0); // Hack to force TQCursor to call XCreatePixmapCursor() immediately // so the bitmaps don't get pushed out of the Xcursor LRU cache. hand_cursor->handle(); @@ -294,7 +294,7 @@ void KCursorPrivateAutoHideEventFilter::unhideCursor() TQWidget* w = actualWidget(); - if ( w->cursor().tqshape() != Qt::BlankCursor ) // someone messed with the cursor already + if ( w->cursor().shape() != Qt::BlankCursor ) // someone messed with the cursor already return; if ( m_isOwnCursor ) @@ -370,9 +370,9 @@ KCursorPrivate::KCursorPrivate() hideCursorDelay = 5000; // 5s default value KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::tqfromLatin1("KDE") ); + KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") ); enabled = kc->readBoolEntry( - TQString::tqfromLatin1("Autohiding cursor enabled"), true ); + TQString::fromLatin1("Autohiding cursor enabled"), true ); } KCursorPrivate::~KCursorPrivate() @@ -386,7 +386,7 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve if ( enable ) { - if ( m_eventFilters.tqfind( w ) != NULL ) + if ( m_eventFilters.find( w ) != NULL ) return; KCursorPrivateAutoHideEventFilter* filter = new KCursorPrivateAutoHideEventFilter( w ); m_eventFilters.insert( w, filter ); @@ -412,7 +412,7 @@ bool KCursorPrivate::eventFilter( TQObject *o, TQEvent *e ) if ( !enabled ) return false; - KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.tqfind( o ); + KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.find( o ); Q_ASSERT( filter != NULL ); if ( filter == NULL ) |