From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab. --- kicker/taskmanager/tasklmbmenu.cpp | 6 +++--- kicker/taskmanager/tasklmbmenu.h | 2 +- kicker/taskmanager/taskmanager.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kicker/taskmanager') diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 4eab82bc1..af7f6e854 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -75,7 +75,7 @@ void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg, p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); } -TQSize TaskMenuItem::sizeHint() +TQSize TaskMenuItem::tqsizeHint() { TQFont font = TQFont(); if (m_isActive) @@ -213,7 +213,7 @@ void TaskLMBMenu::dragMoveEvent( TQDragMoveEvent* e ) void TaskLMBMenu::dragSwitch() { bool ok = false; - Task::Ptr t = m_tasks.at(indexOf(m_lastDragId), &ok); + Task::Ptr t = m_tasks.tqat(indexOf(m_lastDragId), &ok); if (ok) { t->activate(); @@ -264,7 +264,7 @@ void TaskLMBMenu::mouseMoveEvent(TQMouseEvent* e) if (index != -1) { bool ok = false; - Task::Ptr task = m_tasks.at(index, &ok); + Task::Ptr task = m_tasks.tqat(index, &ok); if (ok) { Task::List tasks; diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index 7eedc115b..973cf666f 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -38,7 +38,7 @@ public: ~TaskMenuItem(); void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); - TQSize sizeHint(); + TQSize tqsizeHint(); void setAttentionState(bool state) { m_attentionState = state; } private: diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 6f84efae4..f6cff4248 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -1356,7 +1356,7 @@ TQPixmap Task::thumbnail(int maxDimension) Picture picture = XRenderCreatePicture(dpy, m_windowPixmap, format, CPSubwindowMode, &picAttr); - // Get shaped windows handled correctly. + // Get tqshaped windows handled correctly. XserverRegion region = XFixesCreateRegionFromWindow(dpy, m_frameId, WindowRegionBounding); XFixesSetPictureClipRegion(dpy, picture, 0, 0, region); @@ -1375,7 +1375,7 @@ TQPixmap Task::thumbnail(int maxDimension) int thumbnailHeight = (int)(winAttr.height * factor); TQPixmap thumbnail(thumbnailWidth, thumbnailHeight); - thumbnail.fill(TQApplication::palette().active().background()); + thumbnail.fill(TQApplication::tqpalette().active().background()); #if 0 // TQImage::smoothScale() scaling TQPixmap full(winAttr.width, winAttr.height); @@ -1499,7 +1499,7 @@ bool TaskDrag::canDecode(const TQMimeSource* e) Task::List TaskDrag::decode( const TQMimeSource* e ) { - TQByteArray data(e->encodedData("taskbar/task")); + TQByteArray data(e->tqencodedData("taskbar/task")); Task::List tasks; if (data.size()) -- cgit v1.2.1