summaryrefslogtreecommitdiffstats
path: root/kdesktop/pixmapserver.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kdesktop/pixmapserver.cc
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop/pixmapserver.cc')
-rw-r--r--kdesktop/pixmapserver.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc
index bc869d341..17c1ee04e 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cc
@@ -58,7 +58,7 @@ KPixmapServer::~KPixmapServer()
void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
{
- if (m_Names.contains(name))
+ if (m_Names.tqcontains(name))
{
if (overwrite)
remove(name);
@@ -77,7 +77,7 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
si.handle = pm->handle();
m_Selections[sel] = si;
- DataIterator it = m_Data.find(pm->handle());
+ DataIterator it = m_Data.tqfind(pm->handle());
if (it == m_Data.end())
{
KPixmapData data;
@@ -95,20 +95,20 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
void KPixmapServer::remove(TQString name)
{
// Remove the name
- NameIterator it = m_Names.find(name);
+ NameIterator it = m_Names.tqfind(name);
if (it == m_Names.end())
return;
KPixmapInode pi = it.data();
m_Names.remove(it);
// Remove and disown the selection
- SelectionIterator it2 = m_Selections.find(pi.selection);
+ SelectionIterator it2 = m_Selections.tqfind(pi.selection);
assert(it2 != m_Selections.end());
m_Selections.remove(it2);
XSetSelectionOwner(qt_xdisplay(), pi.selection, None, CurrentTime);
// Decrease refcount on data
- DataIterator it3 = m_Data.find(pi.handle);
+ DataIterator it3 = m_Data.tqfind(pi.handle);
assert(it3 != m_Data.end());
it3.data().refcount--;
if (!it3.data().refcount && !it3.data().usecount)
@@ -131,7 +131,7 @@ TQStringList KPixmapServer::list()
void KPixmapServer::setOwner(TQString name)
{
- NameIterator it = m_Names.find(name);
+ NameIterator it = m_Names.tqfind(name);
if (it == m_Names.end())
return;
@@ -160,7 +160,7 @@ bool KPixmapServer::x11Event(XEvent *event)
// Check if we know about this selection
Atom sel = ev->selection;
- SelectionIterator it = m_Selections.find(sel);
+ SelectionIterator it = m_Selections.tqfind(sel);
if (it == m_Selections.end())
return false;
KSelectionInode si = it.data();
@@ -174,7 +174,7 @@ bool KPixmapServer::x11Event(XEvent *event)
}
// Check if there is no transaction in progress to the same property
- if (m_Active.contains(ev->property))
+ if (m_Active.tqcontains(ev->property))
{
kdDebug(1204) << ID << "selection is busy.\n";
XSendEvent(qt_xdisplay(), ev->requestor, false, 0, &reply);
@@ -182,7 +182,7 @@ bool KPixmapServer::x11Event(XEvent *event)
}
// Check if the selection was not deleted
- DataIterator it2 = m_Data.find(si.handle);
+ DataIterator it2 = m_Data.tqfind(si.handle);
if (it2 == m_Data.end())
{
kdDebug(1204) << ID << "selection has been deleted.\n";
@@ -216,13 +216,13 @@ bool KPixmapServer::x11Event(XEvent *event)
{
XPropertyEvent *ev = &event->xproperty;
- AtomIterator it = m_Active.find(ev->atom);
+ AtomIterator it = m_Active.tqfind(ev->atom);
if (it == m_Active.end())
return false;
HANDLE handle = it.data();
m_Active.remove(it);
- DataIterator it2 = m_Data.find(handle);
+ DataIterator it2 = m_Data.tqfind(handle);
assert(it2 != m_Data.end());
it2.data().usecount--;
if (!it2.data().usecount && !it2.data().refcount)
@@ -239,7 +239,7 @@ bool KPixmapServer::x11Event(XEvent *event)
{
XSelectionClearEvent *ev = &event->xselectionclear;
- SelectionIterator it = m_Selections.find(ev->selection);
+ SelectionIterator it = m_Selections.tqfind(ev->selection);
if (it == m_Selections.end())
return false;