summaryrefslogtreecommitdiffstats
path: root/kwin/sm.cpp
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 /kwin/sm.cpp
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 'kwin/sm.cpp')
-rw-r--r--kwin/sm.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kwin/sm.cpp b/kwin/sm.cpp
index 31cada7e0..045d4f924 100644
--- a/kwin/sm.cpp
+++ b/kwin/sm.cpp
@@ -259,13 +259,13 @@ bool Workspace::windowRoleMatch( const TQCString& role1, const TQCString& role2
{
if( role1.isEmpty() && role2.isEmpty())
return true;
- int pos1 = role1.find( '#' );
- int pos2 = role2.find( '#' );
+ int pos1 = role1.tqfind( '#' );
+ int pos2 = role2.tqfind( '#' );
bool ret;
if( pos1 < 0 || pos2 < 0 || pos1 != pos2 )
ret = role1 == role2;
else
- ret = qstrncmp( role1, role2, pos1 ) == 0;
+ ret = tqstrncmp( role1, role2, pos1 ) == 0;
kdDebug() << "WR:" << role1 << ":" << pos1 << ":" << role2 << ":" << pos2 << ":::" << ret << endl;
return ret;
}
@@ -402,7 +402,7 @@ SessionSaveDoneHelper::SessionSaveDoneHelper()
props[ 2 ].num_vals = 1;
props[ 2 ].vals = &propvalue[ 2 ];
propvalue[ 3 ].length = 0;
- propvalue[ 3 ].value = qApp->argv()[ 0 ];
+ propvalue[ 3 ].value = tqApp->argv()[ 0 ];
props[ 3 ].name = const_cast< char* >( SmProgram );
props[ 3 ].type = const_cast< char* >( SmARRAY8 );
props[ 3 ].num_vals = 1;
@@ -416,7 +416,7 @@ SessionSaveDoneHelper::SessionSaveDoneHelper()
SmProp* p[ 5 ] = { &props[ 0 ], &props[ 1 ], &props[ 2 ], &props[ 3 ], &props[ 4 ] };
SmcSetProperties( conn, 5, p );
notifier = new TQSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )),
- TQSocketNotifier::Read, this );
+ TQSocketNotifier::Read, TQT_TQOBJECT(this) );
connect( notifier, TQT_SIGNAL( activated( int )), TQT_SLOT( processData()));
}