diff options
Diffstat (limited to 'tdeio')
38 files changed, 99 insertions, 99 deletions
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cpp b/tdeio/bookmarks/kbookmarkimporter_crash.cpp index 44c591ef4..b2185d46e 100644 --- a/tdeio/bookmarks/kbookmarkimporter_crash.cpp +++ b/tdeio/bookmarks/kbookmarkimporter_crash.cpp @@ -95,7 +95,7 @@ TQStringList TDECrashBookmarkImporterImpl::getCrashLogs() { TQMap<TQString, bool> activeLogs; - DCOPClient* dcop = kapp->dcopClient(); + DCOPClient* dcop = tdeApp->dcopClient(); QCStringList apps = dcop->registeredApplications(); for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it ) diff --git a/tdeio/bookmarks/kbookmarkmenu.cpp b/tdeio/bookmarks/kbookmarkmenu.cpp index 070912eb5..6eedb2ca0 100644 --- a/tdeio/bookmarks/kbookmarkmenu.cpp +++ b/tdeio/bookmarks/kbookmarkmenu.cpp @@ -401,9 +401,9 @@ void RMB::slotRMBActionCopyLocation( int val ) if ( !bookmark.isGroup() ) { - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), TQClipboard::Selection ); - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), TQClipboard::Clipboard ); } } @@ -478,7 +478,7 @@ void KBookmarkMenu::refill() void KBookmarkMenu::addAddBookmarksList() { - if (!kapp->authorizeTDEAction("bookmarks")) + if (!tdeApp->authorizeTDEAction("bookmarks")) return; TQString title = i18n( "Bookmark Tabs as Folder..." ); @@ -498,7 +498,7 @@ void KBookmarkMenu::addAddBookmarksList() void KBookmarkMenu::addAddBookmark() { - if (!kapp->authorizeTDEAction("bookmarks")) + if (!tdeApp->authorizeTDEAction("bookmarks")) return; TQString title = i18n( "Add Bookmark" ); @@ -518,7 +518,7 @@ void KBookmarkMenu::addAddBookmark() void KBookmarkMenu::addEditBookmarks() { - if (!kapp->authorizeTDEAction("bookmarks")) + if (!tdeApp->authorizeTDEAction("bookmarks")) return; TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQ_SLOT( slotEditBookmarks() ), @@ -530,7 +530,7 @@ void KBookmarkMenu::addEditBookmarks() void KBookmarkMenu::addNewFolder() { - if (!kapp->authorizeTDEAction("bookmarks")) + if (!tdeApp->authorizeTDEAction("bookmarks")) return; TQString title = i18n( "&New Bookmark Folder..." ); @@ -553,7 +553,7 @@ void KBookmarkMenu::addNewFolder() void KBookmarkMenu::fillBookmarkMenu() { - if (!kapp->authorizeTDEAction("bookmarks")) + if (!tdeApp->authorizeTDEAction("bookmarks")) return; if ( m_bIsRoot ) diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp index 2bee1af83..4a578db0e 100644 --- a/tdeio/kpasswdserver/kpasswdserver.cpp +++ b/tdeio/kpasswdserver/kpasswdserver.cpp @@ -187,7 +187,7 @@ KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId, unsigned long kdDebug(130) << "KPasswdServer::checkAuthInfo: User= " << info.username << ", WindowId = " << windowId << endl; if( usertime != 0 ) - kapp->updateUserTimestamp( usertime ); + tdeApp->updateUserTimestamp( usertime ); TQString key = createCacheKey(info); @@ -256,7 +256,7 @@ KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windo if ( !info.password.isEmpty() ) // should we really allow the caller to pre-fill the password? kdDebug(130) << "password was set by caller" << endl; if( usertime != 0 ) - kapp->updateUserTimestamp( usertime ); + tdeApp->updateUserTimestamp( usertime ); TQString key = createCacheKey(info); Request *request = new Request; diff --git a/tdeio/kssl/ksslinfodlg.cpp b/tdeio/kssl/ksslinfodlg.cpp index 2c502ce5a..d7fb0e936 100644 --- a/tdeio/kssl/ksslinfodlg.cpp +++ b/tdeio/kssl/ksslinfodlg.cpp @@ -465,11 +465,11 @@ TQScrollView *KSSLInfoDlg::buildCertInfo(const TQString &certName) { } void KSSLInfoDlg::urlClicked(const TQString &url) { - kapp->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void KSSLInfoDlg::mailClicked(const TQString &url) { - kapp->invokeMailer(url, TQString::null); + tdeApp->invokeMailer(url, TQString::null); } #include "ksslinfodlg.moc" diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp index 1d2cf8f87..76722c8d4 100644 --- a/tdeio/misc/kpac/proxyscout.cpp +++ b/tdeio/misc/kpac/proxyscout.cpp @@ -34,7 +34,7 @@ namespace KPAC { ProxyScout::QueuedRequest::QueuedRequest( const KURL& u ) - : transaction( kapp->dcopClient()->beginTransaction() ), + : transaction( tdeApp->dcopClient()->beginTransaction() ), url( u ) { } @@ -135,7 +135,7 @@ namespace KPAC TQDataStream ds( data, IO_WriteOnly ); if ( success ) ds << handleRequest( ( *it ).url ); else ds << TQString( "DIRECT" ); - kapp->dcopClient()->endTransaction( ( *it ).transaction, type, data ); + tdeApp->dcopClient()->endTransaction( ( *it ).transaction, type, data ); } m_requestQueue.clear(); m_downloader->deleteLater(); diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp index 009ea348b..6c8f722d7 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.cpp +++ b/tdeio/misc/tdewalletd/tdewalletd.cpp @@ -283,7 +283,7 @@ void TDEWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, kdWarning() << "Application '" << appid << "' using tdewallet without parent window!" << endl; // allow dialog activation even if it interrupts, better than trying hacks // with keeping the dialog on top or on all desktops - kapp->updateUserTimestamp(); + tdeApp->updateUserTimestamp(); } if( modal ) KWin::setState( dialog->winId(), NET::Modal ); @@ -301,7 +301,7 @@ void TDEWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, void TDEWalletD::checkActiveDialog() { if( !activeDialog || !activeDialog->isShown()) return; - kapp->updateUserTimestamp(); + tdeApp->updateUserTimestamp(); KWin::setState( activeDialog->winId(), NET::KeepAbove ); KWin::setOnAllDesktops( activeDialog->winId(), true ); KWin::forceActiveWindow( activeDialog->winId()); diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index b675ee4de..40e26ed43 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -1037,7 +1037,7 @@ void UIServer::slotJobCanceled( ProgressItem *item ) { void UIServer::slotQuit() { m_shuttingDown = true; - kapp->quit(); + tdeApp->quit(); } void UIServer::slotUpdate() { @@ -1360,7 +1360,7 @@ void UIServer::resizeEvent(TQResizeEvent* e) bool UIServer::queryClose() { - if (( !m_shuttingDown ) && !kapp->sessionSaving()) { + if (( !m_shuttingDown ) && !tdeApp->sessionSaving()) { hide(); return false; } diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp index ab8e64d92..11a6f6512 100644 --- a/tdeio/tdefile/kdirselectdialog.cpp +++ b/tdeio/tdefile/kdirselectdialog.cpp @@ -73,10 +73,10 @@ static KURL rootUrl(const KURL &url) KURL root = url; root.setPath( "/" ); - if (!kapp->authorizeURLAction("list", KURL(), root)) + if (!tdeApp->authorizeURLAction("list", KURL(), root)) { root = KURL::fromPathOrURL( TQDir::homeDirPath() ); - if (!kapp->authorizeURLAction("list", KURL(), root)) + if (!tdeApp->authorizeURLAction("list", KURL(), root)) { root = url; } diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp index ba54383a0..a73f34915 100644 --- a/tdeio/tdefile/kicondialog.cpp +++ b/tdeio/tdefile/kicondialog.cpp @@ -135,7 +135,7 @@ void TDEIconCanvas::slotLoadFiles() TQStringList::ConstIterator end(mFiles.end()); for (it=mFiles.begin(), i=0; it!=end; ++it, i++) { - // Calling kapp->processEvents() makes the iconview flicker like hell + // Calling tdeApp->processEvents() makes the iconview flicker like hell // (it's being repainted once for every new item), so we don't do this. // Instead, we directly repaint the progress bar without going through // the event-loop. We do that just once for every 10th item so that @@ -146,7 +146,7 @@ void TDEIconCanvas::slotLoadFiles() } emitProgress++; -// kapp->processEvents(); +// tdeApp->processEvents(); if ( !d->m_bLoading ) // user clicked on a button that will load another set of icons break; TQImage img; diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp index b4f4d9c7d..24e1227ab 100644 --- a/tdeio/tdefile/knotifydialog.cpp +++ b/tdeio/tdefile/knotifydialog.cpp @@ -816,11 +816,11 @@ void KNotifyWidget::save() ++it; } - if ( kapp ) + if ( tdeApp ) { - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); } emit changed( false ); diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp index 527f53b51..b1fdbaacc 100644 --- a/tdeio/tdefile/kopenwith.cpp +++ b/tdeio/tdefile/kopenwith.cpp @@ -388,7 +388,7 @@ void KOpenWithDlg::setServiceType( const KURL::List& _urls ) void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) { d = new KOpenWithDlgPrivate; - bool bReadOnly = kapp && !kapp->authorize("shell_access"); + bool bReadOnly = tdeApp && !tdeApp->authorize("shell_access"); m_terminaldirty = false; m_pTree = 0L; m_pService = 0L; diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp index 21bfb378b..aa25ac10f 100644 --- a/tdeio/tdefile/kpropertiesdialog.cpp +++ b/tdeio/tdefile/kpropertiesdialog.cpp @@ -498,7 +498,7 @@ void KPropertiesDialog::insertPages() insertPlugin (p); } - if ( kapp->authorizeTDEAction("sharefile") && + if ( tdeApp->authorizeTDEAction("sharefile") && KFileSharePropsPlugin::supports( m_items ) ) { KPropsDlgPlugin *p = new KFileSharePropsPlugin( this ); @@ -971,7 +971,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFileType() )); - if (!kapp->authorizeTDEAction("editfiletype")) + if (!tdeApp->authorizeTDEAction("editfiletype")) button->hide(); #endif @@ -3628,7 +3628,7 @@ bool KDesktopPropsPlugin::supports( KFileItemList _items ) return false; // open file and check type KDesktopFile config( item->url().path(), true /* readonly */ ); - return config.hasApplicationType() && kapp->authorize("run_desktop_files") && kapp->authorize("shell_access"); + return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access"); } void KPropertiesDialog::virtual_hook( int id, void* data ) @@ -3906,7 +3906,7 @@ bool KExecPropsPlugin::supports( KFileItemList _items ) return false; // open file and check type KDesktopFile config( item->url().path(), true /* readonly */ ); - return config.hasApplicationType() && kapp->authorize("run_desktop_files") && kapp->authorize("shell_access"); + return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access"); } void KExecPropsPlugin::applyChanges() diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index cf5d97692..e1e911400 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -529,7 +529,7 @@ void KFileDialog::slotOk() return; } - if (!kapp->authorizeURLAction("open", KURL(), d->url)) + if (!tdeApp->authorizeURLAction("open", KURL(), d->url)) { TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, d->url.prettyURL()); KMessageBox::error( d->mainWidget, msg); @@ -547,7 +547,7 @@ void KFileDialog::slotOk() for ( KURL::List::ConstIterator it = list.begin(); it != list.end(); ++it ) { - if (!kapp->authorizeURLAction("open", KURL(), *it)) + if (!tdeApp->authorizeURLAction("open", KURL(), *it)) { TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, (*it).prettyURL()); KMessageBox::error( d->mainWidget, msg); diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp index 5943ae402..5bdea2fd8 100644 --- a/tdeio/tdeio/job.cpp +++ b/tdeio/tdeio/job.cpp @@ -149,19 +149,19 @@ Job::Job(bool showProgressInfo) : TQObject(__getJobRoot(), "job"), m_error(0), m Observer::self(), TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); } // Don't exit while this job is running - if (kapp) - kapp->ref(); - if (kapp) - updateUserTimestamp( kapp->userTimestamp()); + if (tdeApp) + tdeApp->ref(); + if (tdeApp) + updateUserTimestamp( tdeApp->userTimestamp()); } Job::~Job() { delete m_speedTimer; delete d; - if (kapp) + if (tdeApp) { - kapp->deref(); + tdeApp->deref(); } } @@ -315,7 +315,7 @@ void Job::slotSpeedTimeout() void Job::showErrorDialog( TQWidget * parent ) { //kdDebug(7007) << "Job::showErrorDialog parent=" << parent << endl; - kapp->enableStyles(); + tdeApp->enableStyles(); // Show a message box, except for "user canceled" or "no content" if ( (m_error != ERR_USER_CANCELED) && (m_error != ERR_NO_CONTENT) ) { //old plain error message @@ -736,7 +736,7 @@ void MkdirJob::start(Slave *slave) void MkdirJob::slotRedirection( const KURL &url) { kdDebug(7007) << "MkdirJob::slotRedirection(" << url << ")" << endl; - if (!kapp->authorizeURLAction("redirect", m_url, url)) + if (!tdeApp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "MkdirJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl; m_error = ERR_ACCESS_DENIED; @@ -906,7 +906,7 @@ void StatJob::slotStatEntry( const TDEIO::UDSEntry & entry ) void StatJob::slotRedirection( const KURL &url) { kdDebug(7007) << "StatJob::slotRedirection(" << url << ")" << endl; - if (!kapp->authorizeURLAction("redirect", m_url, url)) + if (!tdeApp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "StatJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl; m_error = ERR_ACCESS_DENIED; @@ -1001,7 +1001,7 @@ void TransferJob::slotData( const TQByteArray &_data) void TransferJob::slotRedirection( const KURL &url) { kdDebug(7007) << "TransferJob::slotRedirection(" << url << ")" << endl; - if (!kapp->authorizeURLAction("redirect", m_url, url)) + if (!tdeApp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "TransferJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl; return; @@ -1408,7 +1408,7 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo _url.setPath("/"); } - if (!_error && !kapp->authorizeURLAction("open", KURL(), _url)) + if (!_error && !tdeApp->authorizeURLAction("open", KURL(), _url)) _error = TDEIO::ERR_ACCESS_DENIED; // if request is not valid, return an invalid transfer job @@ -2162,7 +2162,7 @@ void ListJob::slotResult( TDEIO::Job * job ) void ListJob::slotRedirection( const KURL & url ) { - if (!kapp->authorizeURLAction("redirect", m_url, url)) + if (!tdeApp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "ListJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl; return; @@ -2235,7 +2235,7 @@ void ListJob::setUnrestricted(bool unrestricted) void ListJob::start(Slave *slave) { - if (kapp && !kapp->authorizeURLAction("list", m_url, m_url) && !(extraFlags() & EF_ListJobUnrestricted)) + if (tdeApp && !tdeApp->authorizeURLAction("list", m_url, m_url) && !(extraFlags() & EF_ListJobUnrestricted)) { m_error = ERR_ACCESS_DENIED; m_errorText = m_url.url(); @@ -3431,7 +3431,7 @@ void CopyJob::copyNextFile() TQDataStream streamout(param,IO_WriteOnly); streamout<<(*it).uSource; streamout<<(*it).uDest; - if ( kapp && kapp->dcopClient()->call( "kded", + if ( tdeApp && tdeApp->dcopClient()->call( "kded", "mountwatcher", "createLink(KURL, KURL)", param,retType,data,false ) ) { TQDataStream streamin(data,IO_ReadOnly); @@ -4561,7 +4561,7 @@ bool MultiGetJob::findCurrentEntry() void MultiGetJob::slotRedirection( const KURL &url) { if (!findCurrentEntry()) return; // Error - if (kapp && !kapp->authorizeURLAction("redirect", m_url, url)) + if (tdeApp && !tdeApp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "MultiGetJob: Redirection from " << m_currentEntry->url << " to " << url << " REJECTED!" << endl; return; diff --git a/tdeio/tdeio/kdcopservicestarter.cpp b/tdeio/tdeio/kdcopservicestarter.cpp index 8a7a67632..28edba63b 100644 --- a/tdeio/tdeio/kdcopservicestarter.cpp +++ b/tdeio/tdeio/kdcopservicestarter.cpp @@ -68,7 +68,7 @@ int KDCOPServiceStarter::findServiceFor( const TQString& serviceType, KService::Ptr ptr = offers.first(); TQCString dcopService = ptr->property("X-DCOP-ServiceName").toString().latin1(); - if ( !kapp->dcopClient()->isApplicationRegistered( dcopService ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( dcopService ) ) { TQString error; if ( startServiceFor( serviceType, constraint, preferences, &error, &dcopService, flags ) != 0 ) @@ -93,5 +93,5 @@ int KDCOPServiceStarter::startServiceFor( const TQString& serviceType, return -1; KService::Ptr ptr = offers.first(); kdDebug() << "KDCOPServiceStarter: starting " << ptr->desktopEntryPath() << endl; - return kapp->startServiceByDesktopPath( ptr->desktopEntryPath(), TQStringList(), error, dcopService ); + return tdeApp->startServiceByDesktopPath( ptr->desktopEntryPath(), TQStringList(), error, dcopService ); } diff --git a/tdeio/tdeio/kdcopservicestarter.h b/tdeio/tdeio/kdcopservicestarter.h index 04f8d7ee2..21699dc9a 100644 --- a/tdeio/tdeio/kdcopservicestarter.h +++ b/tdeio/tdeio/kdcopservicestarter.h @@ -68,7 +68,7 @@ public: * Find an implementation of the given @p serviceType, * and start it, to use its DCOP interface. * The default implementation uses TDETrader to find the preferred Application, - * and then starts it using kapp->startService... + * and then starts it using tdeApp->startService... * * However applications (like kontact) can reimplement this method, to provide * an in-process way of loading the implementation for this service type. diff --git a/tdeio/tdeio/kmessageboxwrapper.h b/tdeio/tdeio/kmessageboxwrapper.h index 50bbc6678..5e9296752 100644 --- a/tdeio/tdeio/kmessageboxwrapper.h +++ b/tdeio/tdeio/kmessageboxwrapper.h @@ -35,7 +35,7 @@ public: const TQString &caption = TQString::null) { if (TDEApplication::guiEnabled()) { - kapp->enableStyles(); + tdeApp->enableStyles(); KMessageBox::error( parent, text, caption ); } else kdWarning() << text << endl; @@ -46,7 +46,7 @@ public: const TQString &caption = TQString::null) { if (TDEApplication::guiEnabled()) { - kapp->enableStyles(); + tdeApp->enableStyles(); KMessageBox::sorry( parent, text, caption ); } else kdWarning() << text << endl; diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp index d85d7c541..0555e2285 100644 --- a/tdeio/tdeio/kmimetype.cpp +++ b/tdeio/tdeio/kmimetype.cpp @@ -1015,7 +1015,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices if(!function.endsWith("(KURL::List)")) { kdWarning() << "Desktop file " << path << " contains an invalid X-TDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl; } else { - if(kapp->dcopClient()->call( app, object, + if(tdeApp->dcopClient()->call( app, object, function.utf8(), dataToSend, replyType, replyData, true, -1) && replyType == "TQStringList" ) { diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp index 46fc8b535..3dda0cc19 100644 --- a/tdeio/tdeio/krun.cpp +++ b/tdeio/tdeio/krun.cpp @@ -143,7 +143,7 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window, { if ( u.isLocalFile() && runExecutables) { - if (kapp->authorize("shell_access")) + if (tdeApp->authorize("shell_access")) { TQString path = u.path(); shellQuote( path ); @@ -165,7 +165,7 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window, if (!runExecutables) noRun = true; - if (!kapp->authorize("shell_access")) + if (!tdeApp->authorize("shell_access")) noAuth = true; } @@ -213,7 +213,7 @@ bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles ) bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles, const TQString& suggestedFileName ) { - if (kapp && !kapp->authorizeTDEAction("openwith")) + if (tdeApp && !tdeApp->authorizeTDEAction("openwith")) { // TODO: Better message, i18n freeze :-( KMessageBox::sorry(0L, i18n("You are not authorized to open this file.")); @@ -922,7 +922,7 @@ void KRun::init ( const KURL& url, TQWidget* window, const TQCString& asn, mode_ m_timer.start( 0, true ); kdDebug(7010) << " new KRun " << this << " " << url.prettyURL() << " timer=" << &m_timer << endl; - kapp->ref(); + tdeApp->ref(); } void KRun::init() @@ -989,7 +989,7 @@ void KRun::init() m_timer.start( 0, true ); return; } - if ( !kapp->authorizeURLAction( "open", KURL(), m_strURL)) + if ( !tdeApp->authorizeURLAction( "open", KURL(), m_strURL)) { TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, m_strURL.prettyURL()); d->m_showingError = true; @@ -1120,7 +1120,7 @@ KRun::~KRun() kdDebug(7010) << "KRun::~KRun() " << this << endl; m_timer.stop(); killJob(); - kapp->deref(); + tdeApp->deref(); kdDebug(7010) << "KRun::~KRun() done " << this << endl; delete d; } @@ -1540,9 +1540,9 @@ TDEProcessRunner::slotProcessExited(TDEProcess * p) // relatively to current directory, and then in the PATH. if ( !TQFile( binName ).exists() && TDEStandardDirs::findExe( binName ).isEmpty() ) { - kapp->ref(); + tdeApp->ref(); KMessageBox::sorry( 0L, i18n("Could not find the program '%1'").arg( binName ) ); - kapp->deref(); + tdeApp->deref(); } } #ifdef TQ_WS_X11 diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index 74df1a6b1..c69c982fb 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -786,7 +786,7 @@ bool KService::noDisplay() const { #endif } - if (!kapp->authorizeControlModule(d->menuId)) + if (!tdeApp->authorizeControlModule(d->menuId)) return true; return false; @@ -924,7 +924,7 @@ void KService::rebuildKSycoca(TQWidget *parent) i18n("Updating system configuration.")); TQByteArray data; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); int result = client->callAsync("kded", "tdebuildsycoca", "recreate()", data, &dlg, TQ_SLOT(slotFinished())); diff --git a/tdeio/tdeio/kshred.cpp b/tdeio/tdeio/kshred.cpp index b013e2059..f5c44c702 100644 --- a/tdeio/tdeio/kshred.cpp +++ b/tdeio/tdeio/kshred.cpp @@ -133,7 +133,7 @@ KShred::fillrandom() // assumes that 4096 is a multipe of sizeof(long int) int limit = (n + sizeof(long int) - 1) / sizeof(long int); for (int i = 0; i < limit; i++) - buff[i] = kapp->random(); + buff[i] = tdeApp->random(); if (!writeData((unsigned char *) buff, n)) return false; diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp index 7c79d48f3..2ea5d03fc 100644 --- a/tdeio/tdeio/kurlcompletion.cpp +++ b/tdeio/tdeio/kurlcompletion.cpp @@ -113,7 +113,7 @@ protected: void done() { if ( !m_terminationRequested ) - kapp->postEvent( m_receiver, new CompletionMatchEvent( this ) ); + tdeApp->postEvent( m_receiver, new CompletionMatchEvent( this ) ); else delete this; } @@ -1162,7 +1162,7 @@ TQString KURLCompletion::listDirectories( { KURL url; url.setPath(*it); - if ( kapp->authorizeURLAction( "list", KURL(), url ) ) + if ( tdeApp->authorizeURLAction( "list", KURL(), url ) ) dirs.append( *it ); } diff --git a/tdeio/tdeio/observer.cpp b/tdeio/tdeio/observer.cpp index 2309c2142..41bd7dbc6 100644 --- a/tdeio/tdeio/observer.cpp +++ b/tdeio/tdeio/observer.cpp @@ -52,12 +52,12 @@ const int KDEBUG_OBSERVER = 7007; // Should be 7028 Observer::Observer() : DCOPObject("TDEIO::Observer") { // Register app as able to receive DCOP messages - if (kapp && !kapp->dcopClient()->isAttached()) + if (tdeApp && !tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } - if ( !kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) { kdDebug(KDEBUG_OBSERVER) << "Starting tdeio_uiserver" << endl; TQString error; @@ -70,7 +70,7 @@ Observer::Observer() : DCOPObject("TDEIO::Observer") kdDebug(KDEBUG_OBSERVER) << "startServiceByDesktopPath returned " << ret << endl; } - if ( !kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) kdDebug(KDEBUG_OBSERVER) << "The application tdeio_uiserver is STILL NOT REGISTERED" << endl; else kdDebug(KDEBUG_OBSERVER) << "tdeio_uiserver registered" << endl; @@ -82,7 +82,7 @@ int Observer::newJob( TDEIO::Job * job, bool showProgress ) { // Tell the UI Server about this new job, and give it the application id // at the same time - int progressId = m_uiserver->newJob( kapp->dcopClient()->appId(), showProgress ); + int progressId = m_uiserver->newJob( tdeApp->dcopClient()->appId(), showProgress ); // Keep the result in a dict m_dctJobs.insert( progressId, job ); @@ -353,7 +353,7 @@ int Observer::messageBox( int progressId, int type, const TQString &text, arg << caption; arg << buttonYes; arg << buttonNo; - if ( kapp->dcopClient()->call( "tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, replyType, replyData, true ) + if ( tdeApp->dcopClient()->call( "tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, replyType, replyData, true ) && replyType == "int" ) { int result; diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp index ce2ae5323..4b5aee5ab 100644 --- a/tdeio/tdeio/renamedlg.cpp +++ b/tdeio/tdeio/renamedlg.cpp @@ -557,7 +557,7 @@ RenameDlg_Result TDEIO::open_RenameDlg( const TQString & _caption, time_t mtimeSrc, time_t mtimeDest) { - Q_ASSERT(kapp); + Q_ASSERT(tdeApp); RenameDlg dlg( 0L, _caption, _src, _dest, _mode, sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest, diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp index abc631284..95b5a778c 100644 --- a/tdeio/tdeio/scheduler.cpp +++ b/tdeio/tdeio/scheduler.cpp @@ -125,7 +125,7 @@ TDEIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol) Scheduler::Scheduler() : DCOPObject( "TDEIO::Scheduler" ), - TQObject(kapp, "scheduler"), + TQObject(tdeApp, "scheduler"), slaveTimer(0, "Scheduler::slaveTimer"), coSlaveTimer(0, "Scheduler::coSlaveTimer"), cleanupTimer(0, "Scheduler::cleanupTimer") @@ -890,7 +890,7 @@ Scheduler::_registerWindow(TQWidget *wid) TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << windowId; - if( !kapp->dcopClient()->send( "kded", "kded", + if( !tdeApp->dcopClient()->send( "kded", "kded", "registerWindowId(long int)", params ) ) kdDebug(7006) << "Could not register window with kded!" << endl; } @@ -909,12 +909,12 @@ Scheduler::slotUnregisterWindow(TQObject *obj) disconnect( it.key(), TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(slotUnregisterWindow(TQObject*))); m_windowList.remove( it ); - if (kapp) + if (tdeApp) { TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << windowId; - kapp->dcopClient()->send( "kded", "kded", + tdeApp->dcopClient()->send( "kded", "kded", "unregisterWindowId(long int)", params ); } } diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp index ffc09d559..f28e3b2c2 100644 --- a/tdeio/tdeio/skipdlg.cpp +++ b/tdeio/tdeio/skipdlg.cpp @@ -134,7 +134,7 @@ void SkipDlg::b2Pressed() SkipDlg_Result TDEIO::open_SkipDlg( bool _multi, const TQString& _error_text ) { - Q_ASSERT(kapp); + Q_ASSERT(tdeApp); SkipDlg dlg( 0L, _multi, _error_text, true ); return (SkipDlg_Result) dlg.exec(); diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp index f8e3dccc8..915c4fa55 100644 --- a/tdeio/tdeio/slave.cpp +++ b/tdeio/tdeio/slave.cpp @@ -235,7 +235,7 @@ void Slave::hold(const KURL &url) deref(); // Call TDELauncher::waitForSlave(pid); { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); @@ -359,7 +359,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error if (protocol == "data") return new DataProtocol(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); @@ -464,7 +464,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) if (protocol == "data") return 0; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); diff --git a/tdeio/tdeio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp index 1b9e853ed..e2a681581 100644 --- a/tdeio/tdeio/slaveinterface.cpp +++ b/tdeio/tdeio/slaveinterface.cpp @@ -511,7 +511,7 @@ void SlaveInterface::messageBox( int type, const TQString &text, const TQString TQString caption( _caption ); if ( type == TDEIO::SlaveBase::SSLMessageBox ) - caption = TQString::fromUtf8(kapp->dcopClient()->appId()); // hack, see observer.cpp + caption = TQString::fromUtf8(tdeApp->dcopClient()->appId()); // hack, see observer.cpp emit needProgressId(); kdDebug(7007) << "SlaveInterface::messageBox m_progressId=" << m_progressId << endl; diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp index b7e9c1650..6905907c2 100644 --- a/tdeio/tdeioexec/main.cpp +++ b/tdeio/tdeioexec/main.cpp @@ -207,7 +207,7 @@ void KIOExec::slotRunApp() #ifdef TQ_WS_X11 // propagate the startup indentification to the started process TDEStartupInfoId id; - id.initId( kapp->startupId()); + id.initId( tdeApp->startupId()); id.setupStartupEnv(); #endif @@ -265,7 +265,7 @@ void KIOExec::slotRunApp() } } - //kapp->quit(); not efficient enough + //tdeApp->quit(); not efficient enough exit(0); } diff --git a/tdeio/tests/getalltest.cpp b/tdeio/tests/getalltest.cpp index 96d39c3c2..40a0ec934 100644 --- a/tdeio/tests/getalltest.cpp +++ b/tdeio/tests/getalltest.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { - TDEApplication k(argc,argv,"getalltest",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"getalltest",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs TDEApp for makeStdCaption //for (int i = 0 ; i < 2 ; ++i ) { // test twice to see if they got deleted kdDebug() << "All services" << endl; diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp index 15770c941..8a17b2aec 100644 --- a/tdeio/tests/jobtest.cpp +++ b/tdeio/tests/jobtest.cpp @@ -197,7 +197,7 @@ void JobTest::get() TDEIO::StoredTransferJob* job = TDEIO::storedGet( u ); connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotGetResult( TDEIO::Job* ) ) ); - kapp->eventLoop()->enterLoop(); + tdeApp->eventLoop()->enterLoop(); assert( m_result == 0 ); // no error assert( m_data.size() == 11 ); assert( memcmp (m_data, "Hello world", m_data.size()) == 0 ); // m_data is not null-terminated @@ -207,7 +207,7 @@ void JobTest::slotGetResult( TDEIO::Job* job ) { m_result = job->error(); m_data = static_cast<TDEIO::StoredTransferJob *>(job)->data(); - kapp->eventLoop()->exitLoop(); + tdeApp->eventLoop()->exitLoop(); } //// diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp index 728214487..632960031 100644 --- a/tdeio/tests/kdcopcheck.cpp +++ b/tdeio/tests/kdcopcheck.cpp @@ -40,9 +40,9 @@ TestService::TestService(const TQString &exec) proc.start(); - connect(kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)), + connect(tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)), this, TQ_SLOT(newApp(const TQCString&))); - connect(kapp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)), + connect(tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)), this, TQ_SLOT(endApp(const TQCString&))); connect(&proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(appExit())); @@ -79,19 +79,19 @@ void TestService::appExit() void TestService::stop() { - kapp->exit_loop(); + tdeApp->exit_loop(); } int TestService::exec() { - kapp->enter_loop(); + tdeApp->enter_loop(); return result; } int main(int argc, char *argv[]) { setenv("IGNORE_SYCOCA_VERSION", "true", true); - TDEApplication k(argc,argv,"whatever",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs TDEApp for makeStdCaption k.dcopClient()->setNotifications(true); diff --git a/tdeio/tests/kdefaultprogresstest.cpp b/tdeio/tests/kdefaultprogresstest.cpp index b3f778772..fb4bc2bd3 100644 --- a/tdeio/tests/kdefaultprogresstest.cpp +++ b/tdeio/tests/kdefaultprogresstest.cpp @@ -29,7 +29,7 @@ int main(int argc, char **argv) { dlg->slotProcessedFiles( 0L, ++files ); } - kapp->processEvents(); + tdeApp->processEvents(); } dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) ); diff --git a/tdeio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp index c10a36898..8f4b6d075 100644 --- a/tdeio/tests/kruntest.cpp +++ b/tdeio/tests/kruntest.cpp @@ -56,7 +56,7 @@ Receiver::Receiver() start = new TQPushButton( "Launch KRuns", this ); stop = new TQPushButton( "Stop those KRuns", this ); stop->setEnabled(false); - TQObject::connect( h, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()) ); + TQObject::connect( h, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT(quit()) ); TQObject::connect( start, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart()) ); TQObject::connect( stop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStop()) ); diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp index 0c517c808..1f2740527 100644 --- a/tdeio/tests/speed.cpp +++ b/tdeio/tests/speed.cpp @@ -54,7 +54,7 @@ void SpeedTest::entries(TDEIO::Job*, const UDSEntryList& list) { void SpeedTest::finished(Job*) { kdDebug() << "job finished" << endl; - kapp->quit(); + tdeApp->quit(); } static TDECmdLineOptions options[] = diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp index bd5a1f1bb..7a44f5313 100644 --- a/tdeio/tests/tdeioslavetest.cpp +++ b/tdeio/tests/tdeioslavetest.cpp @@ -184,7 +184,7 @@ void KioslaveTest::slotQuit(){ } if (slave) TDEIO::Scheduler::disconnectSlave(slave); - kapp->quit(); + tdeApp->quit(); } diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp index f21402405..9747f2d0f 100644 --- a/tdeio/tests/tdesycocatest.cpp +++ b/tdeio/tests/tdesycocatest.cpp @@ -67,7 +67,7 @@ void debug(const char *format, const char *txt) int main(int argc, char *argv[]) { - TDEApplication k(argc,argv,"whatever",true); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",true); // KMessageBox needs TDEApp for makeStdCaption TQCString instname = "kword"; TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname ); diff --git a/tdeio/tests/tdesycocaupdatetest.cpp b/tdeio/tests/tdesycocaupdatetest.cpp index 5b390efa6..9b0f686b5 100644 --- a/tdeio/tests/tdesycocaupdatetest.cpp +++ b/tdeio/tests/tdesycocaupdatetest.cpp @@ -4,7 +4,7 @@ int main(int argc, char *argv[]) { - TDEApplication k(argc,argv,"whatever",true,true); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",true,true); // KMessageBox needs TDEApp for makeStdCaption KService::rebuildKSycoca(0); return 0; |