diff options
Diffstat (limited to 'kicker/kicker/core/extensionmanager.cpp')
-rw-r--r-- | kicker/kicker/core/extensionmanager.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index bec297eb9..e0f68ce8a 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -371,7 +371,7 @@ void ExtensionManager::updateMenubar() KMenuBar tmpmenu; tmpmenu.insertItem("KDE Rocks!"); m_menubarPanel->setSize(KPanelExtension::SizeCustom, - tmpmenu.tqsizeHint().height()); + tmpmenu.sizeHint().height()); m_menubarPanel->writeConfig(); emit desktopIconsAreaChanged(desktopIconsArea(m_menubarPanel->xineramaScreen()), @@ -403,7 +403,7 @@ void ExtensionManager::addExtension( const TQString& desktopFile ) { e->readConfig(); // as a new panel, the position will be set to the preferred position - // we just need to make sure this works with the rest of the panel tqlayout + // we just need to make sure this works with the rest of the panel layout e->setPosition(initialPanelPosition(e->position())); kdDebug(1210)<<"after e->readConfig(): pos="<<e->position()<<endl; addContainer(e); @@ -527,7 +527,7 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, // 1. Exclude panels not on our Xinerama screen // 2. Exclude panels on the same side of the screen as ourselves that are above us // 3. Exclude panels on the opposite side of the screen. Breaks down if the user - // dabbles in insane tqlayouts where a top/bottom or left/right pair overlap? + // dabbles in insane layouts where a top/bottom or left/right pair overlap? // 4. Exclude panels on adjacent sides of the screen that do not overlap with us if (exclude->winId() == extension->winId()) @@ -554,26 +554,26 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, { // Rule 2 Exclusion if (extension->position() == KPanelExtension::Bottom && - exclude->tqgeometry().bottom() == extension->tqgeometry().bottom() && - !exclude->tqgeometry().intersects(extension->tqgeometry())) + exclude->geometry().bottom() == extension->geometry().bottom() && + !exclude->geometry().intersects(extension->geometry())) { return false; } else if (extension->position() == KPanelExtension::Top && - exclude->tqgeometry().top() == extension->tqgeometry().top() && - !exclude->tqgeometry().intersects(extension->tqgeometry())) + exclude->geometry().top() == extension->geometry().top() && + !exclude->geometry().intersects(extension->geometry())) { return false; } else if (extension->position() == KPanelExtension::Left && - exclude->tqgeometry().left() == extension->tqgeometry().left() && - !exclude->tqgeometry().intersects(extension->tqgeometry())) + exclude->geometry().left() == extension->geometry().left() && + !exclude->geometry().intersects(extension->geometry())) { return false; } else if (extension->position() == KPanelExtension::Right && - exclude->tqgeometry().right() == extension->tqgeometry().right() && - !exclude->tqgeometry().intersects(extension->tqgeometry())) + exclude->geometry().right() == extension->geometry().right() && + !exclude->geometry().intersects(extension->geometry())) { return false; } @@ -591,28 +591,28 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, // Rule 4 exclusion if (extension->position() == KPanelExtension::Bottom) { - if (exclude->tqgeometry().bottom() > extension->tqgeometry().top()) + if (exclude->geometry().bottom() > extension->geometry().top()) { return lowerInStack; } } else if (extension->position() == KPanelExtension::Top) { - if (exclude->tqgeometry().top() < extension->tqgeometry().bottom()) + if (exclude->geometry().top() < extension->geometry().bottom()) { return lowerInStack; } } else if (extension->position() == KPanelExtension::Left) { - if (exclude->tqgeometry().left() < extension->tqgeometry().right()) + if (exclude->geometry().left() < extension->geometry().right()) { return lowerInStack; } } else /* if (extension->position() == KPanelExtension::Right) */ { - if (exclude->tqgeometry().right() > extension->tqgeometry().left()) + if (exclude->geometry().right() > extension->geometry().left()) { return lowerInStack; } @@ -702,7 +702,7 @@ void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extens return; } - TQRect geom = extension->initialGeometry(extension->position(), extension->tqalignment(), + TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(), extension->xineramaScreen()); // reduce given area (TQRect) to the space not covered by the given extension @@ -741,7 +741,7 @@ TQRect ExtensionManager::desktopIconsArea(int screen) const // This is pretty broken, mixes Xinerama and non-Xinerama multihead // and generally doesn't seem to be required anyway => ignore screen. // TQRect area = TQApplication::desktop()->screenGeometry(screen); - TQRect area = TQApplication::desktop()->tqgeometry(); + TQRect area = TQApplication::desktop()->geometry(); reduceArea(area, m_mainPanel); reduceArea(area, m_menubarPanel); |