summaryrefslogtreecommitdiffstats
path: root/kicker/kicker/core
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/kicker/core')
-rw-r--r--kicker/kicker/core/applethandle.cpp4
-rw-r--r--kicker/kicker/core/container_extension.cpp4
-rw-r--r--kicker/kicker/core/containerarea.cpp8
-rw-r--r--kicker/kicker/core/containerarealayout.cpp4
-rw-r--r--kicker/kicker/core/extensionmanager.cpp8
-rw-r--r--kicker/kicker/core/main.cpp2
-rw-r--r--kicker/kicker/core/pluginmanager.cpp4
7 files changed, 17 insertions, 17 deletions
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index 621038002..382779648 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
// a hack for applets that have out-of-process
// elements (e.g the systray) so that the handle
// doesn't flicker when moving over those elements
- if (TQT_TQRECT_OBJECT(w->rect()).tqcontains(w->mapFromGlobal(TQCursor::pos())))
+ if (TQT_TQRECT_OBJECT(w->rect()).contains(w->mapFromGlobal(TQCursor::pos())))
{
nowDrawIt = true;
}
@@ -269,7 +269,7 @@ void AppletHandle::checkHandleHover()
{
if (!m_handleHoverTimer ||
(m_menuButton && m_menuButton->isOn()) ||
- m_applet->tqgeometry().tqcontains(m_applet->mapToParent(
+ m_applet->tqgeometry().contains(m_applet->mapToParent(
m_applet->mapFromGlobal(TQCursor::pos()))))
{
return;
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index a4e9f0634..c2023b7df 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -680,7 +680,7 @@ void ExtensionContainer::unhideTriggered(UnhideTrigger::Trigger tr, int Xinerama
// Otherwise hide mode is automatic. The code below is slightly
// complex so as to keep the same behavior as it has always had:
// only unhide when the cursor position is within the widget geometry.
- // We can't just do geometry().tqcontains(TQCursor::pos()) because
+ // We can't just do geometry().contains(TQCursor::pos()) because
// now we hide the panel completely off screen.
int x = TQCursor::pos().x();
@@ -754,7 +754,7 @@ void ExtensionContainer::autoHideTimeout()
TQRect r = geometry();
TQPoint p = TQCursor::pos();
- if (!r.tqcontains(p) &&
+ if (!r.contains(p) &&
(m_settings.unhideLocation() == UnhideTrigger::None ||
!shouldUnhideForTrigger(m_unhideTriggeredAt)))
{
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 412eeec1e..e4e78fd3d 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -314,7 +314,7 @@ void ContainerArea::loadContainers(const TQStringList& containers)
BaseContainer* a = 0;
- int sep = appletId.tqfindRev('_');
+ int sep = appletId.findRev('_');
Q_ASSERT(sep != -1);
TQString appletType = appletId.left(sep);
@@ -962,7 +962,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
return;
}
- if (ev->state() == Qt::LeftButton && !TQT_TQRECT_OBJECT(rect()).tqcontains(ev->pos()))
+ if (ev->state() == Qt::LeftButton && !TQT_TQRECT_OBJECT(rect()).contains(ev->pos()))
{
// leaveEvent() doesn't work, while grabbing the mouse
_autoScrollTimer.stop();
@@ -1542,7 +1542,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a)
if (a)
{
- BaseContainer::Iterator it = m_containers.tqfind(a);
+ BaseContainer::Iterator it = m_containers.find(a);
if (it != m_containers.end() &&
++it != m_containers.end())
{
@@ -1784,7 +1784,7 @@ void ContainerArea::updateContainersBackground()
// properly, so just cache the geometry and update background only when
// the geometry changes or when the background really changes (in which
// case the cached is cleared).
- if( !m_cachedGeometry.tqcontains( *it ))
+ if( !m_cachedGeometry.contains( *it ))
{
m_cachedGeometry[ *it ] = TQRect();
connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry()));
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp
index 4853b8d88..ae4cca873 100644
--- a/kicker/kicker/core/containerarealayout.cpp
+++ b/kicker/kicker/core/containerarealayout.cpp
@@ -350,7 +350,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio
if (current)
{
m_items.erase(m_items.fromLast());
- ItemList::iterator insertIt = m_items.tqfind(current);
+ ItemList::iterator insertIt = m_items.find(current);
if (insertIt == m_items.begin())
{
@@ -625,7 +625,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
: kMin(newPos, last->leftR() - moving->widthR());
// Move 'moving' to its new position in the container list.
- ItemList::iterator itMoving = m_items.tqfind(moving);
+ ItemList::iterator itMoving = m_items.find(moving);
if (itMoving != m_items.end())
{
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 7921c636d..03e039ee0 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -140,7 +140,7 @@ void ExtensionManager::initialize()
TQString extensionId(*it);
// create a matching applet container
- if (extensionId.tqfind("Extension") == -1)
+ if (extensionId.find("Extension") == -1)
{
continue;
}
@@ -259,7 +259,7 @@ void ExtensionManager::migrateMenubar()
{
TQString extensionId(*it);
- if (extensionId.tqfind("Extension") == -1)
+ if (extensionId.find("Extension") == -1)
{
continue;
}
@@ -291,12 +291,12 @@ void ExtensionManager::migrateMenubar()
}
KConfigGroup group(&extensionConfig, appletId.latin1());
- TQString appletType = appletId.left(appletId.tqfindRev('_'));
+ TQString appletType = appletId.left(appletId.findRev('_'));
if (appletType == "Applet")
{
TQString appletFile = group.readPathEntry("DesktopFile");
- if (appletFile.tqfind("menuapplet.desktop") != -1)
+ if (appletFile.find("menuapplet.desktop") != -1)
{
TQString menubarConfig = locate("config", extension);
KIO::NetAccess::copy(menubarConfig,
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 44d891f1e..76e94a0e3 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -73,7 +73,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
XCloseDisplay(dpy);
dpy = 0;
- if ((pos = display_name.tqfindRev('.')) != -1)
+ if ((pos = display_name.findRev('.')) != -1)
display_name.remove(pos, 10);
TQCString env;
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index 86270db62..d1706ada9 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -272,7 +272,7 @@ AppletContainer* PluginManager::createAppletContainer(
return 0;
}
- bool untrusted = m_untrustedApplets.tqfind(desktopFile) != m_untrustedApplets.end();
+ bool untrusted = m_untrustedApplets.find(desktopFile) != m_untrustedApplets.end();
if (isStartup && untrusted)
{
// don't load extensions that bombed on us previously!
@@ -325,7 +325,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk
if (!internal)
{
- bool untrusted = m_untrustedExtensions.tqfind(desktopFile) != m_untrustedExtensions.end();
+ bool untrusted = m_untrustedExtensions.find(desktopFile) != m_untrustedExtensions.end();
if (isStartup && untrusted)
{
// don't load extensions that bombed on us previously!
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 20:07:14 +0000