summaryrefslogtreecommitdiffstats
path: root/kstart
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 /kstart
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 'kstart')
-rw-r--r--kstart/kstart.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp
index 3c0f61c1..f3be8e60 100644
--- a/kstart/kstart.cpp
+++ b/kstart/kstart.cpp
@@ -41,7 +41,7 @@ static bool iconify = false;
static bool toSysTray = false;
static bool fullscreen = false;
static unsigned long state = 0;
-static unsigned long tqmask = 0;
+static unsigned long mask = 0;
static NET::WindowType windowtype = NET::Unknown;
static KWinModule* kwinmodule;
@@ -87,8 +87,8 @@ void KStart::sendRule() {
if( windowclass )
message += "wmclass=" + windowclass + "\nwmclassmatch=1\n" // 1 = exact match
+ "wmclasscomplete="
- // if windowclass tqcontains a space (i.e. 2 words, use whole WM_CLASS)
- + ( windowclass.tqcontains( ' ' ) ? "true" : "false" ) + "\n";
+ // if windowclass contains a space (i.e. 2 words, use whole WM_CLASS)
+ + ( windowclass.contains( ' ' ) ? "true" : "false" ) + "\n";
if( windowtitle || windowclass ) {
// always ignore these window types
message += "types=" + TQCString().setNum( -1U &
@@ -153,7 +153,7 @@ void KStart::windowAdded(WId w){
XClassHint hint;
if( !XGetClassHint( qt_xdisplay(), w, &hint ))
return;
- TQCString cls = windowclass.tqcontains( ' ' )
+ TQCString cls = windowclass.contains( ' ' )
? TQCString( hint.res_name ) + ' ' + hint.res_class : TQCString( hint.res_class );
cls = cls.lower();
XFree( hint.res_name );
@@ -185,7 +185,7 @@ static bool wstate_withdrawn( WId winid )
&length, &after, &data );
bool withdrawn = TRUE;
if ( r == Success && data && format == 32 ) {
- TQ_UINT32 *wstate = (TQ_UINT32*)data;
+ Q_UINT32 *wstate = (Q_UINT32*)data;
withdrawn = (*wstate == WithdrawnState );
XFree( (char *)data );
}
@@ -225,7 +225,7 @@ void KStart::applyStyle(WId w ) {
}
if ( state )
- info.setState( state, tqmask );
+ info.setState( state, mask );
if ( toSysTray ) {
TQApplication::beep();
@@ -233,7 +233,7 @@ void KStart::applyStyle(WId w ) {
}
if ( fullscreen ) {
- TQRect r = TQApplication::desktop()->tqgeometry();
+ TQRect r = TQApplication::desktop()->geometry();
XMoveResizeWindow( qt_xdisplay(), w, r.x(), r.y(), r.width(), r.height() );
}
@@ -351,35 +351,35 @@ int main( int argc, char *argv[] )
if ( args->isSet( "keepabove" ) ) {
state |= NET::KeepAbove;
- tqmask |= NET::KeepAbove;
+ mask |= NET::KeepAbove;
} else if ( args->isSet( "keepbelow" ) ) {
state |= NET::KeepBelow;
- tqmask |= NET::KeepBelow;
+ mask |= NET::KeepBelow;
}
if ( args->isSet( "skiptaskbar" ) ) {
state |= NET::SkipTaskbar;
- tqmask |= NET::SkipTaskbar;
+ mask |= NET::SkipTaskbar;
}
if ( args->isSet( "skippager" ) ) {
state |= NET::SkipPager;
- tqmask |= NET::SkipPager;
+ mask |= NET::SkipPager;
}
activate = args->isSet("activate");
if ( args->isSet("maximize") ) {
state |= NET::Max;
- tqmask |= NET::Max;
+ mask |= NET::Max;
}
if ( args->isSet("maximize-vertically") ) {
state |= NET::MaxVert;
- tqmask |= NET::MaxVert;
+ mask |= NET::MaxVert;
}
if ( args->isSet("maximize-horizontally") ) {
state |= NET::MaxHoriz;
- tqmask |= NET::MaxHoriz;
+ mask |= NET::MaxHoriz;
}
iconify = args->isSet("iconify");
@@ -388,7 +388,7 @@ int main( int argc, char *argv[] )
NETRootInfo i( qt_xdisplay(), NET::Supported );
if( i.isSupported( NET::FullScreen )) {
state |= NET::FullScreen;
- tqmask |= NET::FullScreen;
+ mask |= NET::FullScreen;
} else {
windowtype = NET::Override;
fullscreen = true;