diff options
Diffstat (limited to 'kpager/desktop.cpp')
| -rw-r--r-- | kpager/desktop.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index 74ead587f..ba75663f9 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -58,7 +58,7 @@ Desktop::Desktop( int desk, TQString desktopName, TQWidget *parent, const char * m_bgPixmap = 0L; m_bgDirty=true; m_grabWindows=false; - setAcceptDrops(TRUE); + setAcceptDrops(true); setBackgroundMode(NoBackground); if (m_desk==1) Desktop::m_windowPixmaps.setAutoDelete(true); @@ -78,7 +78,7 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev ) { if ( !KPagerConfigDialog::m_windowDragging ) return; - if ( (ev->state() & Qt::LeftButton) == 0 ) + if ( (ev->state() & TQt::LeftButton) == 0 ) return; TQPoint p( ev->pos() - pressPos ); if ( p.manhattanLength() >= tqApp->startDragDistance() ) @@ -88,12 +88,12 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev ) void Desktop::mousePressEvent( TQMouseEvent * ev) { bool showWindows= KPagerConfigDialog::m_showWindows; - if (ev->button()==Qt::LeftButton){ + if (ev->button()==TQt::LeftButton){ pressPos = ev->pos(); } - else if ((ev->button()==Qt::MidButton)&&(showWindows)) + else if ((ev->button()==TQt::MidButton)&&(showWindows)) startDrag(ev->pos()); - else if (ev->button()==Qt::RightButton) { + else if (ev->button()==TQt::RightButton) { TQPoint pos; KWin::WindowInfo *info = windowAtPosition(ev->pos(), &pos); if ( info && showWindows ) @@ -107,7 +107,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev ) { /** Note that mouseReleaseEvent is not called when releasing the mouse to drop a window in this desktop */ - if (ev->button()==Qt::LeftButton) + if (ev->button()==TQt::LeftButton) { bool showWindows= KPagerConfigDialog::m_showWindows; TQPoint pos; @@ -160,16 +160,16 @@ KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalp void Desktop::convertRectS2P(TQRect &r) { TQRect tmp(r); - r.setRect(deskX()+tmp.x()*deskWidth()/kapp->desktop()->width(), - deskY()+tmp.y()*deskHeight()/kapp->desktop()->height(), - tmp.width()*deskWidth()/kapp->desktop()->width(), - tmp.height()*deskHeight()/kapp->desktop()->height()); + r.setRect(deskX()+tmp.x()*deskWidth()/tdeApp->desktop()->width(), + deskY()+tmp.y()*deskHeight()/tdeApp->desktop()->height(), + tmp.width()*deskWidth()/tdeApp->desktop()->width(), + tmp.height()*deskHeight()/tdeApp->desktop()->height()); } void Desktop::convertCoordP2S(int &x, int &y) { - x=(x-deskX())*(kapp->desktop()->width())/deskWidth(); - y=(y-deskY())*(kapp->desktop()->height())/deskHeight(); + x=(x-deskX())*(tdeApp->desktop()->width())/deskWidth(); + y=(y-deskY())*(tdeApp->desktop()->height())/deskHeight(); } TQPixmap scalePixmap(const TQPixmap &pixmap, int width, int height) @@ -201,7 +201,7 @@ void Desktop::loadBgPixmap(void) bool retval; // if (!m_bgDirty) return; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); TQByteArray data, data2, replyData; @@ -257,7 +257,7 @@ void Desktop::loadBgPixmap(void) if (!m_bgPixmap) { m_bgPixmap = new TDESharedPixmap; - connect(m_bgPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(backgroundLoaded(bool))); + connect(m_bgPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(backgroundLoaded(bool))); } retval = m_bgPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_isCommon?1:m_desk)); @@ -426,7 +426,7 @@ void Desktop::paintEvent( TQPaintEvent * ) p.begin(&pixmap); // p.setFont(font()); // p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark)); -// p.setPen(Qt::black); +// p.setPen(TQt::black); // p.drawRect(rect()); if (KPagerConfigDialog::m_showBackground ) @@ -447,7 +447,7 @@ void Desktop::paintEvent( TQPaintEvent * ) p.drawPixmap(0,0,tmp); } - else pixmap.fill(Qt::gray); + else pixmap.fill(TQt::gray); } else p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid)); @@ -528,7 +528,7 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool if ( m_transparentMode==AllWindows || (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) ) - brush.setStyle(Qt::Dense4Pattern); + brush.setStyle(TQt::Dense4Pattern); if ( isActive ) { |