diff options
Diffstat (limited to 'kpager')
| -rw-r--r-- | kpager/config.cpp | 2 | ||||
| -rw-r--r-- | kpager/desktop.cpp | 14 | ||||
| -rw-r--r-- | kpager/kpager.cpp | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/kpager/config.cpp b/kpager/config.cpp index 29d0470a0..5be814af7 100644 --- a/kpager/config.cpp +++ b/kpager/config.cpp @@ -146,7 +146,7 @@ void KPagerConfigDialog::loadConfiguration() void KPagerConfigDialog::initConfiguration(void) { - TDEConfig *cfg= kapp->config(); + TDEConfig *cfg= tdeApp->config(); cfg->setGroup("KPager"); m_windowDrawMode=cfg->readNumEntry("windowDrawMode", Desktop::c_defWindowDrawMode); diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index c731f5353..1e22ceb5f 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -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; diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index 68f73982a..3d6804974 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -67,7 +67,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) m_pPager = new KPager(this, 0); setCentralWidget(m_pPager); - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); cfg->setGroup("KPager"); // Update the last used geometry @@ -91,7 +91,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) // rect.pos.y+rect.size.height-m_pPager->height()); // antonio:The above lines don't work. I should look at them when I have // more time - move(kapp->desktop()->width()-m_pPager->sizeHint().width()-5,kapp->desktop()->height()-m_pPager->sizeHint().height()-25); + move(tdeApp->desktop()->width()-m_pPager->sizeHint().width()-5,tdeApp->desktop()->height()-m_pPager->sizeHint().height()-25); } // Set the wm flags to this window @@ -158,9 +158,9 @@ void KPagerMainWindow::showAt(int x, int y) // Just in case we lost the sticky bit... (as when a window is hidden) KWin::setOnAllDesktops( winId(), true); - if (x>kapp->desktop()->width()/2) // Right + if (x>tdeApp->desktop()->width()/2) // Right x-=m_pPager->width()+5; - if (y>kapp->desktop()->height()/2) // Bottom + if (y>tdeApp->desktop()->height()/2) // Bottom y-=m_pPager->height()+25; move(x,y); show(); @@ -195,7 +195,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) KPagerConfigDialog::initConfiguration(); - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); cfg->setGroup("KPager"); m_showStickyOption=cfg->readBoolEntry("ShowStickyOption",false); @@ -224,7 +224,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) TQ_SLOT( slotNumberOfDesktopsChanged(int) ) ); connect( m_winmodule, TQ_SIGNAL( currentDesktopChanged(int)), TQ_SLOT( slotCurrentDesktopChanged(int) ) ); - connect(kapp, TQ_SIGNAL(backgroundChanged(int)), + connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); TQFont defFont(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold); @@ -232,7 +232,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) setFont(defFont); m_prefs_action = KStdAction::preferences(this, TQ_SLOT(configureDialog()), parent->actionCollection()); - m_quit_action = KStdAction::quit(kapp, TQ_SLOT(quit()), parent->actionCollection()); + m_quit_action = KStdAction::quit(tdeApp, TQ_SLOT(quit()), parent->actionCollection()); updateLayout(); } |