diff options
Diffstat (limited to 'kpager/desktop.cpp')
| -rw-r--r-- | kpager/desktop.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index dc7b27f05..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); @@ -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)); |