diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:33:34 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:33:34 +0000 |
commit | c663b6440964f6ac48027143ac9e63298991f9d0 (patch) | |
tree | 6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /kicker/taskmanager | |
parent | a061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff) | |
download | tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/taskmanager')
-rw-r--r-- | kicker/taskmanager/tasklmbmenu.cpp | 72 | ||||
-rw-r--r-- | kicker/taskmanager/tasklmbmenu.h | 34 | ||||
-rw-r--r-- | kicker/taskmanager/taskmanager.cpp | 166 | ||||
-rw-r--r-- | kicker/taskmanager/taskmanager.h | 124 | ||||
-rw-r--r-- | kicker/taskmanager/taskrmbmenu.cpp | 66 | ||||
-rw-r--r-- | kicker/taskmanager/taskrmbmenu.h | 12 |
6 files changed, 237 insertions, 237 deletions
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 03278c0fe..864d10f5d 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -25,17 +25,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "tasklmbmenu.h" #include "tasklmbmenu.moc" -#include <qpainter.h> -#include <qstyle.h> +#include <tqpainter.h> +#include <tqstyle.h> #include <kdebug.h> #include <kglobalsettings.h> #include "global.h" -TaskMenuItem::TaskMenuItem(const QString &text, +TaskMenuItem::TaskMenuItem(const TQString &text, bool active, bool minimized, bool attention) - : QCustomMenuItem(), + : TQCustomMenuItem(), m_text(text), m_isActive(active), m_isMinimized(minimized), @@ -48,13 +48,13 @@ TaskMenuItem::~TaskMenuItem() { } -void TaskMenuItem::paint(QPainter *p, const QColorGroup &cg, +void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg, bool highlighted, bool /*enabled*/, int x, int y, int w, int h ) { if (m_isActive) { - QFont font = p->font(); + TQFont font = p->font(); font.setBold(true); p->setFont(font); } @@ -65,7 +65,7 @@ void TaskMenuItem::paint(QPainter *p, const QColorGroup &cg, } else if (m_isMinimized) { - p->setPen(QPen(KickerLib::blendColors(cg.background(), cg.text()))); + p->setPen(TQPen(KickerLib::blendColors(cg.background(), cg.text()))); } else if (m_demandsAttention && !m_attentionState) { @@ -75,21 +75,21 @@ void TaskMenuItem::paint(QPainter *p, const QColorGroup &cg, p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); } -QSize TaskMenuItem::sizeHint() +TQSize TaskMenuItem::sizeHint() { - QFont font = QFont(); + TQFont font = TQFont(); if (m_isActive) { font.setBold(true); } - return QFontMetrics(font).size(AlignAuto|AlignVCenter|DontClip|ShowPrefix, + return TQFontMetrics(font).size(AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); } /*****************************************************************************/ -TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, QWidget *parent, const char *name) - : QPopupMenu(parent, name), +TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, TQWidget *parent, const char *name) + : TQPopupMenu(parent, name), m_tasks(tasks), m_lastDragId(-1), m_attentionState(false) @@ -98,8 +98,8 @@ TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, QWidget *parent, const char *n setAcceptDrops(true); // Always enabled to activate task during drag&drop. - m_dragSwitchTimer = new QTimer(this, "DragSwitchTimer"); - connect(m_dragSwitchTimer, SIGNAL(timeout()), SLOT(dragSwitch())); + m_dragSwitchTimer = new TQTimer(this, "DragSwitchTimer"); + connect(m_dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); } void TaskLMBMenu::fillMenu() @@ -111,14 +111,14 @@ void TaskLMBMenu::fillMenu() { Task::Ptr t = (*it); - QString text = t->visibleName().replace("&", "&&"); + TQString text = t->visibleName().replace("&", "&&"); TaskMenuItem *menuItem = new TaskMenuItem(text, t->isActive(), t->isIconified(), t->demandsAttention()); - int id = insertItem(QIconSet(t->pixmap()), menuItem); - connectItem(id, t, SLOT(activateRaiseOrIconify())); + int id = insertItem(TQIconSet(t->pixmap()), menuItem); + connectItem(id, t, TQT_SLOT(activateRaiseOrIconify())); setItemChecked(id, t->isActive()); if (t->demandsAttention()) @@ -130,8 +130,8 @@ void TaskLMBMenu::fillMenu() if (m_attentionState) { - m_attentionTimer = new QTimer(this, "AttentionTimer"); - connect(m_attentionTimer, SIGNAL(timeout()), SLOT(attentionTimeout())); + m_attentionTimer = new TQTimer(this, "AttentionTimer"); + connect(m_attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimeout())); m_attentionTimer->start(500, true); } } @@ -140,7 +140,7 @@ void TaskLMBMenu::attentionTimeout() { m_attentionState = !m_attentionState; - for (QValueList<TaskMenuItem*>::const_iterator it = m_attentionMap.constBegin(); + for (TQValueList<TaskMenuItem*>::const_iterator it = m_attentionMap.constBegin(); it != m_attentionMap.constEnd(); ++it) { @@ -152,7 +152,7 @@ void TaskLMBMenu::attentionTimeout() m_attentionTimer->start(500, true); } -void TaskLMBMenu::dragEnterEvent( QDragEnterEvent* e ) +void TaskLMBMenu::dragEnterEvent( TQDragEnterEvent* e ) { // ignore task drags if (TaskDrag::canDecode(e)) @@ -173,20 +173,20 @@ void TaskLMBMenu::dragEnterEvent( QDragEnterEvent* e ) m_dragSwitchTimer->start(1000, true); } - QPopupMenu::dragEnterEvent( e ); + TQPopupMenu::dragEnterEvent( e ); } -void TaskLMBMenu::dragLeaveEvent( QDragLeaveEvent* e ) +void TaskLMBMenu::dragLeaveEvent( TQDragLeaveEvent* e ) { m_dragSwitchTimer->stop(); m_lastDragId = -1; - QPopupMenu::dragLeaveEvent(e); + TQPopupMenu::dragLeaveEvent(e); hide(); } -void TaskLMBMenu::dragMoveEvent( QDragMoveEvent* e ) +void TaskLMBMenu::dragMoveEvent( TQDragMoveEvent* e ) { // ignore task drags if (TaskDrag::canDecode(e)) @@ -207,7 +207,7 @@ void TaskLMBMenu::dragMoveEvent( QDragMoveEvent* e ) m_dragSwitchTimer->start(1000, true); } - QPopupMenu::dragMoveEvent(e); + TQPopupMenu::dragMoveEvent(e); } void TaskLMBMenu::dragSwitch() @@ -227,7 +227,7 @@ void TaskLMBMenu::dragSwitch() } } -void TaskLMBMenu::mousePressEvent( QMouseEvent* e ) +void TaskLMBMenu::mousePressEvent( TQMouseEvent* e ) { if (e->button() == LeftButton) { @@ -235,28 +235,28 @@ void TaskLMBMenu::mousePressEvent( QMouseEvent* e ) } else { - m_dragStartPos = QPoint(); + m_dragStartPos = TQPoint(); } - QPopupMenu::mousePressEvent(e); + TQPopupMenu::mousePressEvent(e); } -void TaskLMBMenu::mouseReleaseEvent(QMouseEvent* e) +void TaskLMBMenu::mouseReleaseEvent(TQMouseEvent* e) { - m_dragStartPos = QPoint(); - QPopupMenu::mouseReleaseEvent(e); + m_dragStartPos = TQPoint(); + TQPopupMenu::mouseReleaseEvent(e); } -void TaskLMBMenu::mouseMoveEvent(QMouseEvent* e) +void TaskLMBMenu::mouseMoveEvent(TQMouseEvent* e) { if (m_dragStartPos.isNull()) { - QPopupMenu::mouseMoveEvent(e); + TQPopupMenu::mouseMoveEvent(e); return; } int delay = KGlobalSettings::dndEventDelay(); - QPoint newPos(e->pos()); + TQPoint newPos(e->pos()); if ((m_dragStartPos - newPos).manhattanLength() > delay) { @@ -276,6 +276,6 @@ void TaskLMBMenu::mouseMoveEvent(QMouseEvent* e) } } - QPopupMenu::mouseMoveEvent(e); + TQPopupMenu::mouseMoveEvent(e); } diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index 945c3e649..d11091d82 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -25,24 +25,24 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __tasklmbmenu_h__ #define __tasklmbmenu_h__ -#include <qpopupmenu.h> -#include <qtimer.h> +#include <tqpopupmenu.h> +#include <tqtimer.h> #include "taskmanager.h" class TaskMenuItem : public QCustomMenuItem { public: - TaskMenuItem(const QString &text, + TaskMenuItem(const TQString &text, bool active, bool minimized, bool attention); ~TaskMenuItem(); - void paint(QPainter*, const QColorGroup&, bool, bool, int, int, int, int); - QSize sizeHint(); + void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); + TQSize sizeHint(); void setAttentionState(bool state) { m_attentionState = state; } private: - QString m_text; + TQString m_text; bool m_isActive; bool m_isMinimized; bool m_demandsAttention; @@ -56,19 +56,19 @@ class KDE_EXPORT TaskLMBMenu : public QPopupMenu Q_OBJECT public: - TaskLMBMenu(const Task::List& list, QWidget *parent = 0, const char *name = 0); + TaskLMBMenu(const Task::List& list, TQWidget *parent = 0, const char *name = 0); protected slots: void dragSwitch(); void attentionTimeout(); protected: - void dragEnterEvent(QDragEnterEvent*); - void dragLeaveEvent(QDragLeaveEvent*); - void dragMoveEvent(QDragMoveEvent*); - void mousePressEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); + void dragEnterEvent(TQDragEnterEvent*); + void dragLeaveEvent(TQDragLeaveEvent*); + void dragMoveEvent(TQDragMoveEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); private: void fillMenu(); @@ -76,10 +76,10 @@ private: Task::List m_tasks; int m_lastDragId; bool m_attentionState; - QTimer* m_attentionTimer; - QTimer* m_dragSwitchTimer; - QPoint m_dragStartPos; - QValueList<TaskMenuItem*> m_attentionMap; + TQTimer* m_attentionTimer; + TQTimer* m_dragSwitchTimer; + TQPoint m_dragStartPos; + TQValueList<TaskMenuItem*> m_attentionMap; }; #endif diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index dd9364c0e..9a912e6fd 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -21,10 +21,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qapplication.h> -#include <qcursor.h> -#include <qimage.h> -#include <qtimer.h> +#include <tqapplication.h> +#include <tqcursor.h> +#include <tqimage.h> +#include <tqtimer.h> #include <kconfig.h> #include <kdebug.h> @@ -54,28 +54,28 @@ TaskManager* TaskManager::the() } TaskManager::TaskManager() - : QObject(), + : TQObject(), _active(0), _startup_info(0), m_winModule(new KWinModule()), m_trackGeometry(false) { KGlobal::locale()->insertCatalogue("libtaskmanager"); - connect(m_winModule, SIGNAL(windowAdded(WId)), - this, SLOT(windowAdded(WId))); - connect(m_winModule, SIGNAL(windowRemoved(WId)), - this, SLOT(windowRemoved(WId))); - connect(m_winModule, SIGNAL(activeWindowChanged(WId)), - this, SLOT(activeWindowChanged(WId))); - connect(m_winModule, SIGNAL(currentDesktopChanged(int)), - this, SLOT(currentDesktopChanged(int))); - connect(m_winModule, SIGNAL(windowChanged(WId,unsigned int)), - this, SLOT(windowChanged(WId,unsigned int))); + connect(m_winModule, TQT_SIGNAL(windowAdded(WId)), + this, TQT_SLOT(windowAdded(WId))); + connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)), + this, TQT_SLOT(windowRemoved(WId))); + connect(m_winModule, TQT_SIGNAL(activeWindowChanged(WId)), + this, TQT_SLOT(activeWindowChanged(WId))); + connect(m_winModule, TQT_SIGNAL(currentDesktopChanged(int)), + this, TQT_SLOT(currentDesktopChanged(int))); + connect(m_winModule, TQT_SIGNAL(windowChanged(WId,unsigned int)), + this, TQT_SLOT(windowChanged(WId,unsigned int))); // register existing windows - const QValueList<WId> windows = m_winModule->windows(); - QValueList<WId>::ConstIterator end(windows.end()); - for (QValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it) + const TQValueList<WId> windows = m_winModule->windows(); + TQValueList<WId>::ConstIterator end(windows.end()); + for (TQValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it) { windowAdded(*it); } @@ -99,14 +99,14 @@ void TaskManager::configure_startup() return; _startup_info = new KStartupInfo( KStartupInfo::CleanOnCantDetect, this ); connect( _startup_info, - SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )), - SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& ))); + TQT_SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )), + TQT_SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& ))); connect( _startup_info, - SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )), - SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& ))); + TQT_SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )), + TQT_SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& ))); connect( _startup_info, - SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )), - SLOT( killStartup( const KStartupInfoId& ))); + TQT_SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )), + TQT_SLOT( killStartup( const KStartupInfoId& ))); c.setGroup( "TaskbarButtonSettings" ); _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 )); } @@ -114,7 +114,7 @@ void TaskManager::configure_startup() #ifdef THUMBNAILING_POSSIBLE void TaskManager::setXCompositeEnabled(bool state) { - Display *dpy = QPaintDevice::x11AppDisplay(); + Display *dpy = TQPaintDevice::x11AppDisplay(); if (!state) { @@ -227,9 +227,9 @@ Task::Ptr TaskManager::findTask(WId w) return 0; } -Task::Ptr TaskManager::findTask(int desktop, const QPoint& p) +Task::Ptr TaskManager::findTask(int desktop, const TQPoint& p) { - QValueList<WId> list = winModule()->stackingOrder(); + TQValueList<WId> list = winModule()->stackingOrder(); Task::Ptr task = 0; int currentIndex = -1; @@ -544,7 +544,7 @@ void TaskManager::killStartup(Startup::Ptr s) emit startupRemoved(s); } -QString TaskManager::desktopName(int desk) const +TQString TaskManager::desktopName(int desk) const { return m_winModule->desktopName(desk); } @@ -561,8 +561,8 @@ bool TaskManager::isOnTop(const Task* task) return false; } - QValueList<WId>::ConstIterator begin(m_winModule->stackingOrder().constBegin()); - QValueList<WId>::ConstIterator it = m_winModule->stackingOrder().fromLast(); + TQValueList<WId>::ConstIterator begin(m_winModule->stackingOrder().constBegin()); + TQValueList<WId>::ConstIterator it = m_winModule->stackingOrder().fromLast(); do { Task::Dict::iterator taskItEnd = m_tasksByWId.end(); @@ -602,14 +602,14 @@ bool TaskManager::isOnScreen(int screen, const WId wid) // for window decos that fudge a bit and claim to extend beyond the // edge of the screen, we just contract a bit. - QRect window = wi.frameGeometry(); - QRect desktop = QApplication::desktop()->screenGeometry(screen); + TQRect window = wi.frameGeometry(); + TQRect desktop = TQApplication::desktop()->screenGeometry(screen); desktop.addCoords(5, 5, -5, -5); return window.intersects(desktop); } -Task::Task(WId win, QObject *parent, const char *name) - : QObject(parent, name), +Task::Task(WId win, TQObject *parent, const char *name) + : TQObject(parent, name), _active(false), _win(win), m_frameId(win), @@ -657,7 +657,7 @@ Task::~Task() #ifdef THUMBNAILING_POSSIBLE if (m_windowPixmap) { - XFreePixmap(QPaintDevice::x11AppDisplay(), m_windowPixmap); + XFreePixmap(TQPaintDevice::x11AppDisplay(), m_windowPixmap); } #endif // THUMBNAILING_POSSIBLE } @@ -676,7 +676,7 @@ void Task::findWindowFrameId() target_win = _win; for (;;) { - if (!XQueryTree(QPaintDevice::x11AppDisplay(), target_win, &root, + if (!XQueryTree(TQPaintDevice::x11AppDisplay(), target_win, &root, &parent, &children, &nchildren)) { break; @@ -728,7 +728,7 @@ void Task::refreshIcon() void Task::refresh(unsigned int dirty) { - QString name = visibleName(); + TQString name = visibleName(); _info = KWin::windowInfo(_win, 0, NET::WM2AllowedActions); if (dirty != NET::WMName || name != visibleName()) @@ -804,9 +804,9 @@ bool Task::isOnTop() const bool Task::isModified() const { - static QString modStr = QString::fromUtf8("[") + + static TQString modStr = TQString::fromUtf8("[") + i18n("modified") + - QString::fromUtf8("]"); + TQString::fromUtf8("]"); int modStrPos = _info.visibleName().find(modStr); return ( modStrPos != -1 ); @@ -859,31 +859,31 @@ void Task::removeTransient(WId w) _transients_demanding_attention.remove(w); } -QString Task::className() +TQString Task::className() { XClassHint hint; if(XGetClassHint(qt_xdisplay(), _win, &hint)) { - QString nh( hint.res_name ); + TQString nh( hint.res_name ); XFree( hint.res_name ); XFree( hint.res_class ); return nh; } - return QString::null; + return TQString::null; } -QString Task::classClass() +TQString Task::classClass() { XClassHint hint; if(XGetClassHint(qt_xdisplay(), _win, &hint)) { - QString ch( hint.res_class ); + TQString ch( hint.res_class ); XFree( hint.res_name ); XFree( hint.res_class ); return ch; } - return QString::null; + return TQString::null; } -QPixmap Task::icon( int width, int height, bool allowResize ) +TQPixmap Task::icon( int width, int height, bool allowResize ) { if ( (width == _lastWidth) && (height == _lastHeight) @@ -891,7 +891,7 @@ QPixmap Task::icon( int width, int height, bool allowResize ) && (!_lastIcon.isNull()) ) return _lastIcon; - QPixmap newIcon = KWin::icon( _win, width, height, allowResize ); + TQPixmap newIcon = KWin::icon( _win, width, height, allowResize ); if ( !newIcon.isNull() ) { _lastIcon = newIcon; _lastWidth = width; @@ -902,9 +902,9 @@ QPixmap Task::icon( int width, int height, bool allowResize ) return newIcon; } -QPixmap Task::bestIcon( int size, bool &isStaticIcon ) +TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) { - QPixmap pixmap; + TQPixmap pixmap; isStaticIcon = false; switch( size ) { @@ -979,7 +979,7 @@ QPixmap Task::bestIcon( int size, bool &isStaticIcon ) return pixmap; } -bool Task::idMatch( const QString& id1, const QString& id2 ) +bool Task::idMatch( const TQString& id1, const TQString& id2 ) { if ( id1.isEmpty() || id2.isEmpty() ) return false; @@ -1009,8 +1009,8 @@ void Task::move() KWin::deIconifyWindow(_win); } - QRect geom = _info.geometry(); - QCursor::setPos(geom.center()); + TQRect geom = _info.geometry(); + TQCursor::setPos(geom.center()); NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize); ri.moveResizeRequest(_win, geom.center().x(), @@ -1032,8 +1032,8 @@ void Task::resize() KWin::deIconifyWindow(_win); } - QRect geom = _info.geometry(); - QCursor::setPos(geom.bottomRight()); + TQRect geom = _info.geometry(); + TQCursor::setPos(geom.bottomRight()); NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize); ri.moveResizeRequest(_win, geom.bottomRight().x(), @@ -1269,7 +1269,7 @@ void Task::toggleShaded() setShaded( !isShaded() ); } -void Task::publishIconGeometry(QRect rect) +void Task::publishIconGeometry(TQRect rect) { if (rect == m_iconGeometry) { @@ -1305,15 +1305,15 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - QWidget *rootWin = qApp->desktop(); - QRect geom = _info.geometry(); - _grab = QPixmap::grabWindow(rootWin->winId(), + TQWidget *rootWin = qApp->desktop(); + TQRect geom = _info.geometry(); + _grab = TQPixmap::grabWindow(rootWin->winId(), geom.x(), geom.y(), geom.width(), geom.height()); if (!_grab.isNull()) { - QTimer::singleShot(200, this, SLOT(generateThumbnail())); + TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail())); } } @@ -1322,7 +1322,7 @@ void Task::generateThumbnail() if ( _grab.isNull() ) return; - QImage img = _grab.convertToImage(); + TQImage img = _grab.convertToImage(); double width = img.width(); double height = img.height(); @@ -1337,14 +1337,14 @@ void Task::generateThumbnail() } #ifdef THUMBNAILING_POSSIBLE -QPixmap Task::thumbnail(int maxDimension) +TQPixmap Task::thumbnail(int maxDimension) { if (!TaskManager::xCompositeEnabled() || !m_windowPixmap) { - return QPixmap(); + return TQPixmap(); } - Display *dpy = QPaintDevice::x11AppDisplay(); + Display *dpy = TQPaintDevice::x11AppDisplay(); XWindowAttributes winAttr; XGetWindowAttributes(dpy, m_frameId, &winAttr); @@ -1374,12 +1374,12 @@ QPixmap Task::thumbnail(int maxDimension) int thumbnailWidth = (int)(winAttr.width * factor); int thumbnailHeight = (int)(winAttr.height * factor); - QPixmap thumbnail(thumbnailWidth, thumbnailHeight); - thumbnail.fill(QApplication::palette().active().background()); + TQPixmap thumbnail(thumbnailWidth, thumbnailHeight); + thumbnail.fill(TQApplication::palette().active().background()); -#if 0 // QImage::smoothScale() scaling - QPixmap full(winAttr.width, winAttr.height); - full.fill(QApplication::palette().active().background()); +#if 0 // TQImage::smoothScale() scaling + TQPixmap full(winAttr.width, winAttr.height); + full.fill(TQApplication::palette().active().background()); bool hasAlpha = format->type == PictTypeDirect && format->direct.alphaMask; @@ -1394,7 +1394,7 @@ QPixmap Task::thumbnail(int maxDimension) winAttr.width, winAttr.height); KPixmapIO io; - QImage image = io.convertToImage(full); + TQImage image = io.convertToImage(full); thumbnail = io.convertToPixmap(image.smoothScale(thumbnailWidth, thumbnailHeight)); #else // XRENDER scaling @@ -1408,7 +1408,7 @@ QPixmap Task::thumbnail(int maxDimension) XRenderSetPictureTransform(dpy, picture, &transformation); XRenderSetPictureFilter(dpy, picture, FilterBest, 0, 0); - XRenderComposite(QPaintDevice::x11AppDisplay(), + XRenderComposite(TQPaintDevice::x11AppDisplay(), PictOpOver, // we're filtering, alpha values are probable picture, // src None, // mask @@ -1423,9 +1423,9 @@ QPixmap Task::thumbnail(int maxDimension) return thumbnail; } #else // THUMBNAILING_POSSIBLE -QPixmap Task::thumbnail(int /* maxDimension */) +TQPixmap Task::thumbnail(int /* maxDimension */) { - return QPixmap(); + return TQPixmap(); } #endif // THUMBNAILING_POSSIBLE @@ -1438,7 +1438,7 @@ void Task::updateWindowPixmap() return; } - Display *dpy = QPaintDevice::x11AppDisplay(); + Display *dpy = TQPaintDevice::x11AppDisplay(); if (m_windowPixmap) { @@ -1453,8 +1453,8 @@ void Task::updateWindowPixmap() } Startup::Startup(const KStartupInfoId& id, const KStartupInfoData& data, - QObject * parent, const char *name) - : QObject(parent, name), _id(id), _data(data) + TQObject * parent, const char *name) + : TQObject(parent, name), _id(id), _data(data) { } @@ -1473,11 +1473,11 @@ int TaskManager::currentDesktop() const return m_winModule->currentDesktop(); } -TaskDrag::TaskDrag(const Task::List& tasks, QWidget* source, const char* name) - : QStoredDrag("taskbar/task", source, name) +TaskDrag::TaskDrag(const Task::List& tasks, TQWidget* source, const char* name) + : TQStoredDrag("taskbar/task", source, name) { - QByteArray data; - QDataStream stream(data, IO_WriteOnly); + TQByteArray data; + TQDataStream stream(data, IO_WriteOnly); Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -1492,19 +1492,19 @@ TaskDrag::~TaskDrag() { } -bool TaskDrag::canDecode(const QMimeSource* e) +bool TaskDrag::canDecode(const TQMimeSource* e) { return e->provides("taskbar/task"); } -Task::List TaskDrag::decode( const QMimeSource* e ) +Task::List TaskDrag::decode( const TQMimeSource* e ) { - QByteArray data(e->encodedData("taskbar/task")); + TQByteArray data(e->encodedData("taskbar/task")); Task::List tasks; if (data.size()) { - QDataStream stream(data, IO_ReadOnly); + TQDataStream stream(data, IO_ReadOnly); while (!stream.atEnd()) { WId id; diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index 5885569d9..8f5876360 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -27,15 +27,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <sys/types.h> -#include <qobject.h> -#include <qpixmap.h> -#include <qpoint.h> -#include <qptrlist.h> -#include <qpixmap.h> -#include <qdragobject.h> -#include <qrect.h> -#include <qvaluelist.h> -#include <qvaluevector.h> +#include <tqobject.h> +#include <tqpixmap.h> +#include <tqpoint.h> +#include <tqptrlist.h> +#include <tqpixmap.h> +#include <tqdragobject.h> +#include <tqrect.h> +#include <tqvaluelist.h> +#include <tqvaluevector.h> #include <ksharedptr.h> #include <kstartupinfo.h> @@ -60,7 +60,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KWinModule; class TaskManager; -typedef QValueList<WId> WindowList; +typedef TQValueList<WId> WindowList; /** * A dynamic interface to a task (main window). @@ -68,16 +68,16 @@ typedef QValueList<WId> WindowList; * @see TaskManager * @see KWinModule */ -class KDE_EXPORT Task: public QObject, public KShared +class KDE_EXPORT Task: public TQObject, public KShared { Q_OBJECT - Q_PROPERTY( QString visibleIconicName READ visibleIconicName ) - Q_PROPERTY( QString iconicName READ iconicName ) - Q_PROPERTY( QString visibleIconicNameWithState READ visibleIconicNameWithState ) - Q_PROPERTY( QString visibleName READ visibleName ) - Q_PROPERTY( QString name READ name ) - Q_PROPERTY( QString visibleNameWithState READ visibleNameWithState ) - Q_PROPERTY( QPixmap pixmap READ pixmap ) + Q_PROPERTY( TQString visibleIconicName READ visibleIconicName ) + Q_PROPERTY( TQString iconicName READ iconicName ) + Q_PROPERTY( TQString visibleIconicNameWithState READ visibleIconicNameWithState ) + Q_PROPERTY( TQString visibleName READ visibleName ) + Q_PROPERTY( TQString name READ name ) + Q_PROPERTY( TQString visibleNameWithState READ visibleNameWithState ) + Q_PROPERTY( TQPixmap pixmap READ pixmap ) Q_PROPERTY( bool maximized READ isMaximized ) Q_PROPERTY( bool minimized READ isMinimized ) // KDE4 deprecated @@ -92,33 +92,33 @@ class KDE_EXPORT Task: public QObject, public KShared Q_PROPERTY( int desktop READ desktop ) Q_PROPERTY( double thumbnailSize READ thumbnailSize WRITE setThumbnailSize ) Q_PROPERTY( bool hasThumbnail READ hasThumbnail ) - Q_PROPERTY( QPixmap thumbnail READ thumbnail ) + Q_PROPERTY( TQPixmap thumbnail READ thumbnail ) public: typedef KSharedPtr<Task> Ptr; - typedef QValueVector<Task::Ptr> List; - typedef QMap<WId, Task::Ptr> Dict; + typedef TQValueVector<Task::Ptr> List; + typedef TQMap<WId, Task::Ptr> Dict; - Task(WId win, QObject *parent, const char *name = 0); + Task(WId win, TQObject *parent, const char *name = 0); virtual ~Task(); WId window() const { return _win; } KWin::WindowInfo info() const { return _info; } #if 0 // this would use (_NET_)WM_ICON_NAME, which is shorter, but can be different from window name - QString visibleIconicName() const { return _info.visibleIconName(); } - QString visibleIconicNameWithState() const { return _info.visibleIconNameWithState(); } - QString iconicName() const { return _info.iconName(); } + TQString visibleIconicName() const { return _info.visibleIconName(); } + TQString visibleIconicNameWithState() const { return _info.visibleIconNameWithState(); } + TQString iconicName() const { return _info.iconName(); } #else - QString visibleIconicName() const { return _info.visibleName(); } - QString visibleIconicNameWithState() const { return _info.visibleNameWithState(); } - QString iconicName() const { return _info.name(); } + TQString visibleIconicName() const { return _info.visibleName(); } + TQString visibleIconicNameWithState() const { return _info.visibleNameWithState(); } + TQString iconicName() const { return _info.name(); } #endif - QString visibleName() const { return _info.visibleName(); } - QString visibleNameWithState() const { return _info.visibleNameWithState(); } - QString name() const { return _info.name(); } - QString className(); - QString classClass(); + TQString visibleName() const { return _info.visibleName(); } + TQString visibleNameWithState() const { return _info.visibleNameWithState(); } + TQString name() const { return _info.name(); } + TQString className(); + TQString classClass(); /** * A list of the window ids of all transient windows (dialogs) associated @@ -131,7 +131,7 @@ public: * only fall back to a static icon if there is no icon of any size in * the WM hints. */ - QPixmap pixmap() const { return _pixmap; } + TQPixmap pixmap() const { return _pixmap; } /** * Returns the best icon for any of the KIcon::StdSizes. If there is no @@ -140,14 +140,14 @@ public: * * <pre> * bool gotStaticIcon; - * QPixmap icon = myTask->icon( KIcon::SizeMedium, gotStaticIcon ); + * TQPixmap icon = myTask->icon( KIcon::SizeMedium, gotStaticIcon ); * </pre> * * @param size Any of the constants in KIcon::StdSizes. * @param isStaticIcon Set to true if KIconLoader was used, false otherwise. * @see KIcon */ - QPixmap bestIcon( int size, bool &isStaticIcon ); + TQPixmap bestIcon( int size, bool &isStaticIcon ); /** * Tries to find an icon for the task with the specified size. If there @@ -158,13 +158,13 @@ public: * parameters will only query the NET properties if the icon has changed or * none was found. */ - QPixmap icon( int width, int height, bool allowResize = false ); + TQPixmap icon( int width, int height, bool allowResize = false ); /** * Returns true iff the windows with the specified ids should be grouped * together in the task list. */ - static bool idMatch(const QString &, const QString &); + static bool idMatch(const TQString &, const TQString &); // state @@ -264,12 +264,12 @@ public: /** * Returns the geometry for this window */ - QRect geometry() const { return _info.geometry(); } + TQRect geometry() const { return _info.geometry(); } /** * Returns the geometry for the from of this window */ - QRect frameGeometry() const { return _info.frameGeometry(); } + TQRect frameGeometry() const { return _info.frameGeometry(); } // internal @@ -312,9 +312,9 @@ public: * Returns the thumbnail for this task (or a null image if there is * none). */ - const QPixmap &thumbnail() const { return _thumb; } + const TQPixmap &thumbnail() const { return _thumb; } - QPixmap thumbnail(int maxDimension); + TQPixmap thumbnail(int maxDimension); void updateWindowPixmap(); @@ -415,7 +415,7 @@ public slots: * task will be displayed when iconised. It is used, for example by the * KWin inconify animation. */ - void publishIconGeometry(QRect); + void publishIconGeometry(TQRect); /** * Tells the task to generate a new thumbnail. When the thumbnail is @@ -460,7 +460,7 @@ private: bool _active; WId _win; WId m_frameId; - QPixmap _pixmap; + TQPixmap _pixmap; KWin::WindowInfo _info; WindowList _transients; WindowList _transients_demanding_attention; @@ -468,12 +468,12 @@ private: int _lastWidth; int _lastHeight; bool _lastResize; - QPixmap _lastIcon; + TQPixmap _lastIcon; double _thumbSize; - QPixmap _thumb; - QPixmap _grab; - QRect m_iconGeometry; + TQPixmap _thumb; + TQPixmap _grab; + TQRect m_iconGeometry; #ifdef THUMBNAILING_POSSIBLE Pixmap m_windowPixmap; #endif // THUMBNAILING_POSSIBLE @@ -489,20 +489,20 @@ public: /** * Constructs a task drag object for a task list. */ - TaskDrag(const Task::List& tasks, QWidget* source = 0, + TaskDrag(const Task::List& tasks, TQWidget* source = 0, const char* name = 0); ~TaskDrag(); /** * Returns true if the mime source can be decoded to a TaskDrag. */ - static bool canDecode( const QMimeSource* e ); + static bool canDecode( const TQMimeSource* e ); /** * Decodes the tasks from the mime source and returns them if successful. * Otherwise an empty task list is returned. */ - static Task::List decode( const QMimeSource* e ); + static Task::List decode( const TQMimeSource* e ); }; @@ -511,35 +511,35 @@ public: * * @see TaskManager */ -class KDE_EXPORT Startup: public QObject, public KShared +class KDE_EXPORT Startup: public TQObject, public KShared { Q_OBJECT - Q_PROPERTY( QString text READ text ) - Q_PROPERTY( QString bin READ bin ) - Q_PROPERTY( QString icon READ icon ) + Q_PROPERTY( TQString text READ text ) + Q_PROPERTY( TQString bin READ bin ) + Q_PROPERTY( TQString icon READ icon ) public: typedef KSharedPtr<Startup> Ptr; - typedef QValueVector<Startup::Ptr> List; + typedef TQValueVector<Startup::Ptr> List; - Startup( const KStartupInfoId& id, const KStartupInfoData& data, QObject * parent, + Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * parent, const char *name = 0); virtual ~Startup(); /** * The name of the starting task (if known). */ - QString text() const { return _data.findName(); } + TQString text() const { return _data.findName(); } /** * The name of the executable of the starting task. */ - QString bin() const { return _data.bin(); } + TQString bin() const { return _data.bin(); } /** * The name of the icon to be used for the starting task. */ - QString icon() const { return _data.findIcon(); } + TQString icon() const { return _data.findIcon(); } void update( const KStartupInfoData& data ); const KStartupInfoId& id() const { return _id; } @@ -583,7 +583,7 @@ public: /** * Returns the task for a given location, or 0 if there is no such task. */ - Task::Ptr findTask(int desktop, const QPoint& p); + Task::Ptr findTask(int desktop, const TQPoint& p); /** * Returns a list of all current tasks. @@ -598,7 +598,7 @@ public: /** * Returns the name of the nth desktop. */ - QString desktopName(int n) const; + TQString desktopName(int n) const; /** * Returns the number of virtual desktops. diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index 47260687f..fb4c9ae87 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -38,8 +38,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskrmbmenu.h" #include "taskrmbmenu.moc" -TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, QWidget *parent, const char *name) - : QPopupMenu( parent, name ) +TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, TQWidget *parent, const char *name) + : TQPopupMenu( parent, name ) , tasks( theTasks ) , showAll( show ) { @@ -54,8 +54,8 @@ TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, QWidget *parent, } } -TaskRMBMenu::TaskRMBMenu(Task::Ptr task, bool show, QWidget *parent, const char *name) - : QPopupMenu( parent, name ) +TaskRMBMenu::TaskRMBMenu(Task::Ptr task, bool show, TQWidget *parent, const char *name) + : TQPopupMenu( parent, name ) , showAll( show ) { fillMenu(task); @@ -76,7 +76,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) if (showAll) { id = insertItem(i18n("&To Current Desktop"), - t, SLOT(toCurrentDesktop())); + t, TQT_SLOT(toCurrentDesktop())); setItemEnabled( id, !t->isOnCurrentDesktop() ); } @@ -86,27 +86,27 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) } } - id = insertItem(SmallIconSet("move"), i18n("&Move"), t, SLOT(move())); + id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQT_SLOT(move())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMove)); - id = insertItem(i18n("Re&size"), t, SLOT(resize())); + id = insertItem(i18n("Re&size"), t, TQT_SLOT(resize())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionResize)); - id = insertItem(i18n("Mi&nimize"), t, SLOT(toggleIconified())); + id = insertItem(i18n("Mi&nimize"), t, TQT_SLOT(toggleIconified())); setItemChecked(id, t->isIconified()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMinimize)); - id = insertItem(i18n("Ma&ximize"), t, SLOT(toggleMaximized())); + id = insertItem(i18n("Ma&ximize"), t, TQT_SLOT(toggleMaximized())); setItemChecked(id, t->isMaximized()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMax)); - id = insertItem(i18n("&Shade"), t, SLOT(toggleShaded())); + id = insertItem(i18n("&Shade"), t, TQT_SLOT(toggleShaded())); setItemChecked(id, t->isShaded()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionShade)); insertSeparator(); - id = insertItem(SmallIcon("fileclose"), i18n("&Close"), t, SLOT(close())); + id = insertItem(SmallIcon("fileclose"), i18n("&Close"), t, TQT_SLOT(close())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose)); } @@ -120,11 +120,11 @@ void TaskRMBMenu::fillMenu() { Task::Ptr t = (*it); - id = insertItem( QIconSet( t->pixmap() ), + id = insertItem( TQIconSet( t->pixmap() ), t->visibleNameWithState(), new TaskRMBMenu(t, this) ); setItemChecked( id, t->isActive() ); - connectItem( id, t, SLOT( activateRaiseOrIconify() ) ); + connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) ); } insertSeparator(); @@ -135,7 +135,7 @@ void TaskRMBMenu::fillMenu() { id = insertItem(i18n("All to &Desktop"), makeDesktopsMenu()); - id = insertItem(i18n("All &to Current Desktop"), this, SLOT(slotAllToCurrentDesktop())); + id = insertItem(i18n("All &to Current Desktop"), this, TQT_SLOT(slotAllToCurrentDesktop())); Task::List::iterator itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -150,7 +150,7 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "Mi&nimize All" ), this, SLOT( slotMinimizeAll() ) ); + id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -163,7 +163,7 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "Ma&ximize All" ), this, SLOT( slotMaximizeAll() ) ); + id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -176,7 +176,7 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "&Restore All" ), this, SLOT( slotRestoreAll() ) ); + id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -191,29 +191,29 @@ void TaskRMBMenu::fillMenu() enable = false; - insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, SLOT( slotCloseAll() ) ); + insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) ); } -QPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) +TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) { int id; - QPopupMenu* menu = new QPopupMenu(this); + TQPopupMenu* menu = new TQPopupMenu(this); menu->setCheckable(true); id = menu->insertItem(SmallIconSet("up"), i18n("Keep &Above Others"), - t, SLOT(toggleAlwaysOnTop())); + t, TQT_SLOT(toggleAlwaysOnTop())); menu->setItemChecked(id, t->isAlwaysOnTop()); id = menu->insertItem(SmallIconSet("down"), i18n("Keep &Below Others"), - t, SLOT(toggleKeptBelowOthers())); + t, TQT_SLOT(toggleKeptBelowOthers())); menu->setItemChecked(id, t->isKeptBelowOthers()); id = menu->insertItem(SmallIconSet("window_fullscreen"), i18n("&Fullscreen"), - t, SLOT(toggleFullScreen())); + t, TQT_SLOT(toggleFullScreen())); menu->setItemChecked(id, t->isFullScreen()); if (KWin::allowedActionsSupported()) @@ -224,20 +224,20 @@ QPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) return menu; } -QPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) +TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) { - QPopupMenu* m = new QPopupMenu( this ); + TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), t, SLOT( toDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), t, TQT_SLOT( toDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->setItemChecked( id, t->isOnAllDesktops() ); m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { - QString name = QString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); - id = m->insertItem( name, t, SLOT( toDesktop(int) ) ); + TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); + id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) ); m->setItemParameter( id, i ); m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i ); } @@ -245,19 +245,19 @@ QPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) return m; } -QPopupMenu* TaskRMBMenu::makeDesktopsMenu() +TQPopupMenu* TaskRMBMenu::makeDesktopsMenu() { - QPopupMenu* m = new QPopupMenu( this ); + TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), this, SLOT( slotAllToDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), this, TQT_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { - QString name = QString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); - id = m->insertItem( name, this, SLOT( slotAllToDesktop(int) ) ); + TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); + id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, i ); } diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h index a167d6665..6657bf909 100644 --- a/kicker/taskmanager/taskrmbmenu.h +++ b/kicker/taskmanager/taskrmbmenu.h @@ -25,22 +25,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __taskrmbmenu_h__ #define __taskrmbmenu_h__ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> class KDE_EXPORT TaskRMBMenu : public QPopupMenu { Q_OBJECT public: - TaskRMBMenu(const Task::List&, bool showAll = true, QWidget *parent = 0, const char *name = 0); - TaskRMBMenu(Task::Ptr, bool showAll = true, QWidget *parent = 0, const char *name = 0); + TaskRMBMenu(const Task::List&, bool showAll = true, TQWidget *parent = 0, const char *name = 0); + TaskRMBMenu(Task::Ptr, bool showAll = true, TQWidget *parent = 0, const char *name = 0); private: void fillMenu(Task::Ptr); void fillMenu(); - QPopupMenu* makeAdvancedMenu(Task::Ptr); - QPopupMenu* makeDesktopsMenu(Task::Ptr); - QPopupMenu* makeDesktopsMenu(); + TQPopupMenu* makeAdvancedMenu(Task::Ptr); + TQPopupMenu* makeDesktopsMenu(Task::Ptr); + TQPopupMenu* makeDesktopsMenu(); private slots: void slotMinimizeAll(); |