From e8a1cdc01d38125bea12d5494db977ae6429919a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:29:58 -0600 Subject: Rename additional global TQt functions --- twin/client.cpp | 22 +++++++++++----------- twin/kcmtwin/twinoptions/mouse.cpp | 2 +- twin/plugins.cpp | 2 +- twin/workspace.cpp | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'twin') diff --git a/twin/client.cpp b/twin/client.cpp index e6bb2b720..8a8745664 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -2763,7 +2763,7 @@ void Client::setOpacity(bool translucent, uint opacity) { if (isDesktop()) return; // xcompmgr does not like non solid desktops and the user could set it accidently by mouse scrolling -// qWarning("setting opacity for %d",qt_xdisplay()); +// tqWarning("setting opacity for %d",qt_xdisplay()); //rule out activated translulcency with 100% opacity if (!translucent || opacity == 0xFFFFFFFF) { @@ -2814,15 +2814,15 @@ void Client::updateOpacity() if ((*it) != this && (*it)->isBMP()) // potential "to activate" client found { -// qWarning("client found"); +// tqWarning("client found"); if ((*it)->touches(this)) // first test, if the new client touches the just activated one { -// qWarning("found client touches me"); +// tqWarning("found client touches me"); if( ruleOpacityActive() ) (*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active); else (*it)->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity); -// qWarning("activated, search restarted (1)"); +// tqWarning("activated, search restarted (1)"); (*it)->setShadowSize(options->activeWindowShadowSize); activeGroupMembers.append(*it); tmpGroupMembers.remove(it); @@ -2836,7 +2836,7 @@ void Client::updateOpacity() { if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2)) { -// qWarning("found client touches other active client"); +// tqWarning("found client touches other active client"); if( ruleOpacityActive() ) (*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active); else @@ -2846,7 +2846,7 @@ void Client::updateOpacity() tmpGroupMembers.remove(it); it = tmpGroupMembers.begin(); // reset potential client search found = true; -// qWarning("activated, search restarted (2)"); +// tqWarning("activated, search restarted (2)"); break; // skip this loop } } @@ -2891,16 +2891,16 @@ void Client::updateOpacity() if ((*it) != this && (*it)->isBMP()) // potential "to activate" client found { -// qWarning("client found"); +// tqWarning("client found"); if ((*it)->touches(this)) // first test, if the new client touches the just activated one { -// qWarning("found client touches me"); +// tqWarning("found client touches me"); if( (*it)->ruleOpacityInactive() ) (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive()); else (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity); (*it)->setShadowSize(options->inactiveWindowShadowSize); -// qWarning("deactivated, search restarted (1)"); +// tqWarning("deactivated, search restarted (1)"); inactiveGroupMembers.append(*it); tmpGroupMembers.remove(it); it = tmpGroupMembers.begin(); // restart, search next client @@ -2913,13 +2913,13 @@ void Client::updateOpacity() { if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2)) { -// qWarning("found client touches other inactive client"); +// tqWarning("found client touches other inactive client"); if( (*it)->ruleOpacityInactive() ) (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive()); else (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity); (*it)->setShadowSize(options->inactiveWindowShadowSize); -// qWarning("deactivated, search restarted (2)"); +// tqWarning("deactivated, search restarted (2)"); inactiveGroupMembers.append(*it); tmpGroupMembers.remove(it); it = tmpGroupMembers.begin(); // reset potential client search diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 873331ce6..4f04764ac 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -476,7 +476,7 @@ static int tbl_txt_lookup( const char* const arr[], const char* txt ) arr[ i ][ 0 ] != '\0'; ++i ) { - if( qstricmp( txt, arr[ i ] ) == 0 ) + if( tqstricmp( txt, arr[ i ] ) == 0 ) return pos; ++pos; } diff --git a/twin/plugins.cpp b/twin/plugins.cpp index c1c1a4d40..d514c0963 100644 --- a/twin/plugins.cpp +++ b/twin/plugins.cpp @@ -29,7 +29,7 @@ PluginMgr::PluginMgr() void PluginMgr::error( const TQString &error_msg ) { - qWarning( "%s", (i18n("KWin: ") + error_msg + + tqWarning( "%s", (i18n("KWin: ") + error_msg + i18n("\nKWin will now exit...")).local8Bit().data() ); exit(1); } diff --git a/twin/workspace.cpp b/twin/workspace.cpp index e6e18e1aa..b46697d99 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -561,7 +561,7 @@ Client* Workspace::createClient( Window w, bool is_mapped ) void Workspace::addClient( Client* c, allowed_t ) { // waited with trans settings until window figured out if active or not ;) -// qWarning("%s", (const char*)(c->resourceClass())); +// tqWarning("%s", (const char*)(c->resourceClass())); c->setBMP(c->resourceName() == "beep-media-player" || c->decorationId() == None); // first check if the window has it's own opinion of it's translucency ;) c->getWindowOpacity(); -- cgit v1.2.3