summaryrefslogtreecommitdiffstats
path: root/kstart/kstart.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kstart/kstart.cpp')
-rw-r--r--kstart/kstart.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp
index bcf915b07..69ec79158 100644
--- a/kstart/kstart.cpp
+++ b/kstart/kstart.cpp
@@ -17,7 +17,7 @@
#include <tqtimer.h>
#include <kdebug.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdelocale.h>
#include <twin.h>
#include <twinmodule.h>
@@ -43,7 +43,7 @@ static bool fullscreen = false;
static unsigned long state = 0;
static unsigned long mask = 0;
static NET::WindowType windowtype = NET::Unknown;
-static KWinModule* twinmodule;
+static TWinModule* twinmodule;
KStart::KStart()
:TQObject()
@@ -61,7 +61,7 @@ KStart::KStart()
}
// propagate the app startup notification info to the started app
TDEStartupInfoId id;
- id.initId( kapp->startupId());
+ id.initId( tdeApp->startupId());
id.setupStartupEnv();
//finally execute the comand
@@ -76,7 +76,7 @@ KStart::KStart()
else
TDEStartupInfo::sendFinish( id ); // failed to start
- TQTimer::singleShot( useRule ? 0 : 120 * 1000, kapp, TQ_SLOT( quit()));
+ TQTimer::singleShot( useRule ? 0 : 120 * 1000, tdeApp, TQ_SLOT( quit()));
}
void KStart::sendRule() {
@@ -126,7 +126,7 @@ void KStart::sendRule() {
}
msg.broadcastMessage( "_KDE_NET_WM_TEMPORARY_RULES", message, -1, false );
- kapp->flushX();
+ tdeApp->flushX();
}
const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET::DockMask
@@ -181,9 +181,9 @@ static bool wstate_withdrawn( WId winid )
unsigned long length, after;
unsigned char *data;
int r = XGetWindowProperty( tqt_xdisplay(), winid, tqt_wm_state, 0, 2,
- FALSE, AnyPropertyType, &type, &format,
+ false, AnyPropertyType, &type, &format,
&length, &after, &data );
- bool withdrawn = TRUE;
+ bool withdrawn = true;
if ( r == Success && data && format == 32 ) {
TQ_UINT32 *wstate = (TQ_UINT32*)data;
withdrawn = (*wstate == WithdrawnState );
@@ -312,7 +312,7 @@ int main( int argc, char *argv[] )
for(int i=0; i < args->count(); i++)
proc << args->arg(i);
- twinmodule = new KWinModule;
+ twinmodule = new TWinModule;
desktop = args->getOption( "desktop" ).toInt();
if ( args->isSet ( "alldesktops") )