diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 21:49:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 21:49:59 -0600 |
| commit | 93943a849d1abc2003ceefe294dc419b9927f7d0 (patch) | |
| tree | a6c2696cdd5c3b5339f2b6f821062a32cf46ae53 /konqueror/client/kfmclient.cc | |
| parent | 01c60a267846a8712bca34218ecf7da57566c049 (diff) | |
| download | tdebase-93943a849d1abc2003ceefe294dc419b9927f7d0.tar.gz tdebase-93943a849d1abc2003ceefe294dc419b9927f7d0.zip | |
Rename KStartup for enhanced compatibility with KDE4
Diffstat (limited to 'konqueror/client/kfmclient.cc')
| -rw-r--r-- | konqueror/client/kfmclient.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 6e8ccc2ac..899d27f84 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -281,16 +281,16 @@ static bool krun_has_error = false; void clientApp::sendASNChange() { - KStartupInfoId id; + TDEStartupInfoId id; id.initId( startup_id_str ); - KStartupInfoData data; + TDEStartupInfoData data; data.addPid( 0 ); // say there's another process for this ASN with unknown PID data.setHostname(); // ( no need to bother to get this konqy's PID ) Display* dpy = tqt_xdisplay(); if( dpy == NULL ) // we may be running without TQApplication here dpy = XOpenDisplay( NULL ); if( dpy != NULL ) - KStartupInfo::sendChangeX( dpy, id, data ); + TDEStartupInfo::sendChangeX( dpy, id, data ); if( dpy != NULL && dpy != tqt_xdisplay()) XCloseDisplay( dpy ); } @@ -320,7 +320,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co if (!config.readEntry("BrowserApplication").isEmpty()) { clientApp app; - KStartupInfo::appStarted(); + TDEStartupInfo::appStarted(); KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor] TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); @@ -367,7 +367,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; */ // pass kfmclient's startup id to konqueror using kshell - KStartupInfoId id; + TDEStartupInfoId id; id.initId( startup_id_str ); id.setupStartupEnv(); TDEProcess proc; @@ -378,7 +378,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co proc << "-tempfile"; proc << url.url(); proc.start( TDEProcess::DontCare ); - KStartupInfo::resetStartupEnv(); + TDEStartupInfo::resetStartupEnv(); kdDebug( 1202 ) << "clientApp::createNewWindow TDEProcess started" << endl; //} } @@ -455,7 +455,7 @@ bool clientApp::doIt() TQCString command = args->arg(0); // read ASN env. variable for non-KApp cases - startup_id_str = KStartupInfo::currentStartupIdEnv().id(); + startup_id_str = TDEStartupInfo::currentStartupIdEnv().id(); if ( command == "openURL" || command == "newTab" ) { |