diff options
| -rw-r--r-- | ksquirrel/ksquirrel-libs-configurator/klc.ui.h | 2 | ||||
| -rw-r--r-- | ksquirrel/ksquirrel.cpp | 14 | ||||
| -rw-r--r-- | ksquirrel/sidebar/sq_categorybrowsermenu.cpp | 4 | ||||
| -rw-r--r-- | ksquirrel/sq_diroperator.cpp | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h index 5acfa45..9d0ab7c 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h +++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h @@ -155,7 +155,7 @@ void KLC::closeEvent(TQCloseEvent *ev) TQString data; if(changed) - kapp->dcopClient()->send("ksquirrel", "ksquirrel", "reload_codecs()", data); + tdeApp->dcopClient()->send("ksquirrel", "ksquirrel", "reload_codecs()", data); ev->accept(); } diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp index bd7902f..14f12d7 100644 --- a/ksquirrel/ksquirrel.cpp +++ b/ksquirrel/ksquirrel.cpp @@ -291,10 +291,10 @@ void KSquirrel::closeEvent(TQCloseEvent *ev) { tdeconf->setGroup("Main"); - if((m_demo && !m_intray) || kapp->sessionSaving()) + if((m_demo && !m_intray) || tdeApp->sessionSaving()) { // finalActions() called by slotSaveYourself() - if(!kapp->sessionSaving()) + if(!tdeApp->sessionSaving()) finalActions(); ev->accept(); @@ -1394,7 +1394,7 @@ void KSquirrel::continueLoading() raiseGLWidget(); // don't show navigator when running with file argument - if(!m_demo && !kapp->isRestored()) + if(!m_demo && !tdeApp->isRestored()) show(); // in demo mode may be invisible @@ -1429,10 +1429,10 @@ void KSquirrel::continueLoading() pWidgetStack->diroperator()->setFocus(); // show tray icon when restored - if(kapp->isRestored()) + if(tdeApp->isRestored()) slotGotoTray(); - connect(kapp, TQ_SIGNAL(saveYourself()), this, TQ_SLOT(slotSaveYourself())); + connect(tdeApp, TQ_SIGNAL(saveYourself()), this, TQ_SLOT(slotSaveYourself())); } // Set caption to main window or to image window @@ -1442,7 +1442,7 @@ void KSquirrel::setCaption(const TQString &cap) TDEMainWindow::setCaption(cap); #endif - gl_view->setCaption(cap.isEmpty() ? "ksquirrel" : kapp->makeStdCaption(cap)); + gl_view->setCaption(cap.isEmpty() ? "ksquirrel" : tdeApp->makeStdCaption(cap)); } // User selected "Open file" or "Open file #2" from menu. @@ -1494,7 +1494,7 @@ void KSquirrel::slotOpenFileAndSet() void KSquirrel::slotAnimatedClicked() { // invoke default browser - kapp->invokeBrowser(TQString::fromLatin1("http://ksquirrel.sourceforge.net/")); + tdeApp->invokeBrowser(TQString::fromLatin1("http://ksquirrel.sourceforge.net/")); } // Create SQ_ThumbnailCacheMaster, which can do something with thumbnails diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp index 95eac05..4f03e44 100644 --- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp +++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp @@ -149,7 +149,7 @@ void SQ_CategoryBrowserMenu::initialize() KURL url; url.setPath(path()); - if (!kapp->authorizeURLAction("list", KURL(), url)) + if (!tdeApp->authorizeURLAction("list", KURL(), url)) { insertItem(i18n("Not Authorized to Read Folder")); return; @@ -427,7 +427,7 @@ void SQ_CategoryBrowserMenu::dropEvent( TQDropEvent *ev ) void SQ_CategoryBrowserMenu::slotExec(int id) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); if(!_filemap.contains(id)) return; diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp index 3434fc9..398d859 100644 --- a/ksquirrel/sq_diroperator.cpp +++ b/ksquirrel/sq_diroperator.cpp @@ -1047,7 +1047,7 @@ void SQ_DirOperator::setLazy(bool l, int delay, int rows) void SQ_DirOperator::slotInvokeBrowser() { - kapp->invokeBrowser(url().prettyURL()); + tdeApp->invokeBrowser(url().prettyURL()); } void SQ_DirOperator::enableThumbnailActions(bool enable) |