summaryrefslogtreecommitdiffstats
path: root/kwin/group.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kwin/group.cpp
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin/group.cpp')
-rw-r--r--kwin/group.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/kwin/group.cpp b/kwin/group.cpp
index b8fc9acef..0d543dc4a 100644
--- a/kwin/group.cpp
+++ b/kwin/group.cpp
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
/*
- This file tqcontains things relevant to window grouping.
+ This file contains things relevant to window grouping.
*/
@@ -64,7 +64,7 @@ bool performTransiencyCheck()
kdDebug() << "TC: " << *it1 << " in not in a group" << endl;
ret = false;
}
- else if( !(*it1)->in_group->members().tqcontains( *it1 ))
+ else if( !(*it1)->in_group->members().contains( *it1 ))
{
kdDebug() << "TC: " << *it1 << " has a group " << (*it1)->in_group << " but group does not contain it" << endl;
ret = false;
@@ -85,15 +85,15 @@ bool performTransiencyCheck()
++it2 )
{
if( transiencyCheckNonExistent
- && !Workspace::self()->clients.tqcontains( *it2 )
- && !Workspace::self()->desktops.tqcontains( *it2 ))
+ && !Workspace::self()->clients.contains( *it2 )
+ && !Workspace::self()->desktops.contains( *it2 ))
{
kdDebug() << "TC:" << *it1 << " has non-existent main client " << endl;
kdDebug() << "TC2:" << *it2 << endl; // this may crash
ret = false;
continue;
}
- if( !(*it2)->transients_list.tqcontains( *it1 ))
+ if( !(*it2)->transients_list.contains( *it1 ))
{
kdDebug() << "TC:" << *it1 << " has main client " << *it2 << " but main client does not have it as a transient" << endl;
ret = false;
@@ -106,15 +106,15 @@ bool performTransiencyCheck()
++it2 )
{
if( transiencyCheckNonExistent
- && !Workspace::self()->clients.tqcontains( *it2 )
- && !Workspace::self()->desktops.tqcontains( *it2 ))
+ && !Workspace::self()->clients.contains( *it2 )
+ && !Workspace::self()->desktops.contains( *it2 ))
{
kdDebug() << "TC:" << *it1 << " has non-existent transient " << endl;
kdDebug() << "TC2:" << *it2 << endl; // this may crash
ret = false;
continue;
}
- if( !(*it2)->mainClients().tqcontains( *it1 ))
+ if( !(*it2)->mainClients().contains( *it1 ))
{
kdDebug() << "TC:" << *it1 << " has transient " << *it2 << " but transient does not have it as a main client" << endl;
ret = false;
@@ -133,7 +133,7 @@ bool performTransiencyCheck()
{
if( (*it2)->in_group != *it1 )
{
- kdDebug() << "TC: Group " << *it1 << " tqcontains client " << *it2 << " but client is not in that group" << endl;
+ kdDebug() << "TC: Group " << *it1 << " contains client " << *it2 << " but client is not in that group" << endl;
ret = false;
}
}
@@ -259,7 +259,7 @@ void Group::removeMember( Client* member_P )
TRANSIENCY_CHECK( member_P );
// kdDebug() << "GROUPREMOVE:" << this << ":" << member_P << endl;
// kdDebug() << kdBacktrace() << endl;
- Q_ASSERT( _members.tqcontains( member_P ));
+ Q_ASSERT( _members.contains( member_P ));
_members.remove( member_P );
// there are cases when automatic deleting of groups must be delayed,
// e.g. when removing a member and doing some operation on the possibly
@@ -294,7 +294,7 @@ void Group::gotLeader( Client* leader_P )
void Group::lostLeader()
{
- assert( !_members.tqcontains( leader_client ));
+ assert( !_members.contains( leader_client ));
leader_client = NULL;
if( _members.isEmpty())
{
@@ -430,8 +430,8 @@ void Workspace::checkTransients( Window w )
bool Client::resourceMatch( const Client* c1, const Client* c2 )
{
// xv has "xv" as resource name, and different strings starting with "XV" as resource class
- if( tqstrncmp( c1->resourceClass(), "xv", 2 ) == 0 && c1->resourceName() == "xv" )
- return tqstrncmp( c2->resourceClass(), "xv", 2 ) == 0 && c2->resourceName() == "xv";
+ if( qstrncmp( c1->resourceClass(), "xv", 2 ) == 0 && c1->resourceName() == "xv" )
+ return qstrncmp( c2->resourceClass(), "xv", 2 ) == 0 && c2->resourceName() == "xv";
// Mozilla has "Mozilla" as resource name, and different strings as resource class
if( c1->resourceName() == "mozilla" )
return c2->resourceName() == "mozilla";
@@ -835,7 +835,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined )
void Client::addTransient( Client* cl )
{
TRANSIENCY_CHECK( this );
- assert( !transients_list.tqcontains( cl ));
+ assert( !transients_list.contains( cl ));
// assert( !cl->hasTransient( this, true )); will be fixed in checkGroupTransients()
assert( cl != this );
transients_list.append( cl );
@@ -893,7 +893,7 @@ bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientL
return true;
if( !indirect )
return false;
- if( set.tqcontains( cl ))
+ if( set.contains( cl ))
return false;
set.append( cl );
return hasTransientInternal( cl->transientFor(), indirect, set );
@@ -903,11 +903,11 @@ bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientL
if( group() != cl->group())
return false;
// cl is group transient, search from top
- if( transients().tqcontains( const_cast< Client* >( cl )))
+ if( transients().contains( const_cast< Client* >( cl )))
return true;
if( !indirect )
return false;
- if( set.tqcontains( this ))
+ if( set.contains( this ))
return false;
set.append( this );
for( ClientList::ConstIterator it = transients().begin();