diff options
Diffstat (limited to 'konqueror/KonquerorIface.cpp')
| -rw-r--r-- | konqueror/KonquerorIface.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/konqueror/KonquerorIface.cpp b/konqueror/KonquerorIface.cpp index 6a164b160..a449a0488 100644 --- a/konqueror/KonquerorIface.cpp +++ b/konqueror/KonquerorIface.cpp @@ -51,7 +51,7 @@ KonquerorIface::~KonquerorIface() DCOPRef KonquerorIface::openBrowserWindow( const TQString &url ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KonqMainWindow *res = KonqMisc::createSimpleWindow( KURL(url) ); if ( !res ) return DCOPRef(); @@ -60,7 +60,7 @@ DCOPRef KonquerorIface::openBrowserWindow( const TQString &url ) DCOPRef KonquerorIface::openBrowserWindowASN( const TQString &url, const TQCString& startup_id ) { - kapp->setStartupId( startup_id ); + tdeApp->setStartupId( startup_id ); return openBrowserWindow( url ); } @@ -71,13 +71,13 @@ DCOPRef KonquerorIface::createNewWindow( const TQString &url ) DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString& startup_id, bool tempFile ) { - kapp->setStartupId( startup_id ); + tdeApp->setStartupId( startup_id ); return createNewWindow( url, TQString::null, tempFile ); } DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStringList filesToSelect ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KonqMainWindow *res = KonqMisc::createNewWindow( KURL(url), KParts::URLArgs(), false, filesToSelect ); if ( !res ) return DCOPRef(); @@ -86,13 +86,13 @@ DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStr DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQStringList filesToSelect, const TQCString &startup_id ) { - kapp->setStartupId( startup_id ); + tdeApp->setStartupId( startup_id ); return createNewWindowWithSelection( url, filesToSelect ); } DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mimetype, bool tempFile ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KParts::URLArgs args; args.serviceType = mimetype; // Filter the URL, so that "kfmclient openURL gg:foo" works also when konq is already running @@ -106,13 +106,13 @@ DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mi DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString &mimetype, const TQCString& startup_id, bool tempFile ) { - kapp->setStartupId( startup_id ); + tdeApp->setStartupId( startup_id ); return createNewWindow( url, mimetype, tempFile ); } DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) " << endl; kdDebug(1202) << path << endl; KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, TQString::null ); @@ -123,13 +123,13 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQCString& startup_id ) { - kapp->setStartupId( startup_id ); + tdeApp->setStartupId( startup_id ); return createBrowserWindowFromProfile( path ); } DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, const TQString &filename ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( path, filename ) " << endl; kdDebug(1202) << path << "," << filename << endl; KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename ); @@ -141,13 +141,13 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, c DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQString &filename, const TQCString& startup_id ) { - kapp->setStartupId( startup_id ); + tdeApp->setStartupId( startup_id ); return createBrowserWindowFromProfile( path, filename ); } DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & path, const TQString &filename, const TQString &url ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url) ); if ( !res ) return DCOPRef(); @@ -157,13 +157,13 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & p DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url, const TQCString& startup_id ) { - kapp->setStartupId( startup_id ); + tdeApp->setStartupId( startup_id ); return createBrowserWindowFromProfileAndURL( path, filename, url ); } DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype ) { - SET_QT_X_USER_TIME(0); + set_tqt_x_user_time(0); KParts::URLArgs args; args.serviceType = mimetype; KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url), args ); @@ -175,7 +175,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &pa DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url, const TQString &mimetype, const TQCString& startup_id ) { - kapp->setStartupId( startup_id ); + tdeApp->setStartupId( startup_id ); return createBrowserWindowFromProfileAndURL( path, filename, url, mimetype ); } @@ -218,7 +218,7 @@ TQValueList<DCOPRef> KonquerorIface::getWindows() { TQPtrListIterator<KonqMainWindow> it( *mainWindows ); for (; it.current(); ++it ) - lst.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) ); + lst.append( DCOPRef( tdeApp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) ); } return lst; } @@ -290,5 +290,5 @@ bool KonquerorIface::processCanBeReused( int screen ) void KonquerorIface::terminatePreloaded() { if( KonqMainWindow::isPreloaded()) - kapp->exit(); + tdeApp->exit(); } |