diff options
Diffstat (limited to 'lib')
24 files changed, 57 insertions, 57 deletions
diff --git a/lib/kformula/main.cpp b/lib/kformula/main.cpp index bf0f058fe..40e0f3eb2 100644 --- a/lib/kformula/main.cpp +++ b/lib/kformula/main.cpp @@ -183,7 +183,7 @@ void TestWidget::keyPressEvent(TQKeyEvent* event) case TQt::Key_L: document->document()->wrapper()->addGenericLowerIndex(); return; case TQt::Key_M: loadMathML( document, "test.mml" ); return; case TQt::Key_O: load( document->document(), "test.xml" ); return; - case TQt::Key_Q: kapp->quit(); return; + case TQt::Key_Q: tdeApp->quit(); return; case TQt::Key_S: save( "test.xml", document->document()->saveXML() ); return; case TQt::Key_T: std::cout << document->texString().latin1() << std::endl; return; case TQt::Key_U: document->document()->wrapper()->addGenericUpperIndex(); return; @@ -248,7 +248,7 @@ int main(int argc, char** argv) app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); - DocumentWrapper* wrapper = new DocumentWrapper( kapp->config(), 0 ); + DocumentWrapper* wrapper = new DocumentWrapper( tdeApp->config(), 0 ); Document* document = new Document; wrapper->document( document ); Container* container1 = document->createFormula(); diff --git a/lib/kformula/symbolaction.cpp b/lib/kformula/symbolaction.cpp index 71e60ceef..1563ef613 100644 --- a/lib/kformula/symbolaction.cpp +++ b/lib/kformula/symbolaction.cpp @@ -117,7 +117,7 @@ SymbolAction::SymbolAction( const TQString& text, const TDEShortcut& cut, int SymbolAction::plug( TQWidget* w, int index ) { - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; if ( w->inherits( "TDEToolBar" ) ) { diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp index 6429d6eb5..436bf127f 100644 --- a/lib/kofficecore/KoApplication.cpp +++ b/lib/kofficecore/KoApplication.cpp @@ -91,7 +91,7 @@ bool KoApplication::start() ResetStarting resetStarting; // reset m_starting to false when we're done Q_UNUSED( resetStarting ); - // Find the *.desktop file corresponding to the kapp instance name + // Find the *.desktop file corresponding to the tdeApp instance name KoDocumentEntry entry = KoDocumentEntry( KoDocument::readNativeService() ); if ( entry.isEmpty() ) { diff --git a/lib/kofficecore/KoApplicationIface.cpp b/lib/kofficecore/KoApplicationIface.cpp index e8995ad66..62e1f8481 100644 --- a/lib/kofficecore/KoApplicationIface.cpp +++ b/lib/kofficecore/KoApplicationIface.cpp @@ -49,7 +49,7 @@ DCOPRef KoApplicationIface::createDocument( const TQString &nativeFormat ) return DCOPRef(); } KoDocument* doc = entry.createDoc( 0 ); - return DCOPRef( kapp->dcopClient()->appId(), doc->dcopObject()->objId() ); + return DCOPRef( tdeApp->dcopClient()->appId(), doc->dcopObject()->objId() ); } TQValueList<DCOPRef> KoApplicationIface::getDocuments() @@ -60,7 +60,7 @@ TQValueList<DCOPRef> KoApplicationIface::getDocuments() { TQPtrListIterator<KoDocument> it( *documents ); 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; } @@ -76,7 +76,7 @@ TQValueList<DCOPRef> KoApplicationIface::getViews() { TQPtrListIterator<KoView> itview( it.current()->views() ); for ( ; itview.current(); ++itview ) - lst.append( DCOPRef( kapp->dcopClient()->appId(), itview.current()->dcopObject()->objId() ) ); + lst.append( DCOPRef( tdeApp->dcopClient()->appId(), itview.current()->dcopObject()->objId() ) ); } } return lst; @@ -90,7 +90,7 @@ TQValueList<DCOPRef> KoApplicationIface::getWindows() { TQPtrListIterator<TDEMainWindow> it( *mainWindows ); for (; it.current(); ++it ) - lst.append( DCOPRef( kapp->dcopClient()->appId(), + lst.append( DCOPRef( tdeApp->dcopClient()->appId(), static_cast<KoMainWindow *>(it.current())->dcopObject()->objId() ) ); } return lst; diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index acdc63618..1b1f6e566 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -103,8 +103,8 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, connect(m_alwaysUseCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(alwaysUseClicked())); changePalette(); - if(kapp) { - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette())); + if(tdeApp) { + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette())); } TDEListViewItem* selectItem = 0; @@ -183,7 +183,7 @@ void KoTemplatesPane::openTemplate(TQListViewItem* item) void KoTemplatesPane::changePalette() { - TQPalette p = kapp ? kapp->palette() : palette(); + TQPalette p = tdeApp ? tdeApp->palette() : palette(); p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background)); p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground)); m_detailsLabel->setPalette(p); @@ -283,8 +283,8 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst m_documentList->setSorting(-1); // Disable sorting changePalette(); - if(kapp) { - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette())); + if(tdeApp) { + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette())); } TQString oldGroup = instance->config()->group(); @@ -436,7 +436,7 @@ void KoRecentDocumentsPane::updatePreview(const KFileItem* fileItem, const TQPix void KoRecentDocumentsPane::changePalette() { - TQPalette p = kapp ? kapp->palette() : palette(); + TQPalette p = tdeApp ? tdeApp->palette() : palette(); p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background)); p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground)); m_detailsLabel->setPalette(p); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 147b2ed1c..dca3063e4 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -2223,7 +2223,7 @@ TQCString KoDocument::nativeOasisMimeType() const //static KService::Ptr KoDocument::readNativeService( TDEInstance *instance ) { - TQString instname = instance ? instance->instanceName() : kapp->instanceName(); + TQString instname = instance ? instance->instanceName() : tdeApp->instanceName(); // The new way is: we look for a foopart.desktop in the kde_services dir. TQString servicepartname = instname + "part.desktop"; @@ -2257,7 +2257,7 @@ TQCString KoDocument::readNativeFormatMimeType( TDEInstance *instance ) //static if ( KServiceType::serviceType( "KOfficePart" ) == 0L ) kdError(30003) << "The serviceType KOfficePart is missing. Check that you have a kofficepart.desktop file in the share/servicetypes directory." << endl; else { - TQString instname = instance ? instance->instanceName() : kapp->instanceName(); + TQString instname = instance ? instance->instanceName() : tdeApp->instanceName(); if ( instname != "koshell" ) // hack for koshell kdWarning(30003) << service->desktopEntryPath() << ": no X-TDE-NativeMimeType entry!" << endl; } diff --git a/lib/kofficecore/KoDocumentIface.cpp b/lib/kofficecore/KoDocumentIface.cpp index e0196fdf3..e63b1b1c8 100644 --- a/lib/kofficecore/KoDocumentIface.cpp +++ b/lib/kofficecore/KoDocumentIface.cpp @@ -86,12 +86,12 @@ DCOPRef KoDocumentIface::view( int idx ) if ( !obj ) return DCOPRef(); - return DCOPRef( kapp->dcopClient()->appId(), obj->objId() ); + return DCOPRef( tdeApp->dcopClient()->appId(), obj->objId() ); } DCOPRef KoDocumentIface::action( const TQCString &name ) { - return DCOPRef( kapp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) ); + return DCOPRef( tdeApp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) ); } QCStringList KoDocumentIface::actions() diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index cce7fff28..daaeaba53 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -1466,7 +1466,7 @@ void KoMainWindow::slotProgress(int value) { d->m_firstTime=false; } d->m_progress->setProgress(value); - kapp->processEvents(); + tdeApp->processEvents(); } @@ -1635,7 +1635,7 @@ void KoMainWindow::slotEmailFile() if (!fileURL.isEmpty()) { - kapp->invokeMailer(TQString(), TQString(), TQString(), theSubject, + tdeApp->invokeMailer(TQString(), TQString(), TQString(), theSubject, TQString(), //body TQString(), urls); // attachments diff --git a/lib/kofficecore/KoMainWindowIface.cpp b/lib/kofficecore/KoMainWindowIface.cpp index fda04670b..8b52fc4c6 100644 --- a/lib/kofficecore/KoMainWindowIface.cpp +++ b/lib/kofficecore/KoMainWindowIface.cpp @@ -40,7 +40,7 @@ KoMainWindowIface::~KoMainWindowIface() DCOPRef KoMainWindowIface::action( const TQCString &name ) { - return DCOPRef( kapp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) ); + return DCOPRef( tdeApp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) ); } QCStringList KoMainWindowIface::actions() diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index c708dd564..3637b90b8 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -136,7 +136,7 @@ void KoSpeaker::probe() TQPoint pos; bool spoke = false; if ( d->m_speakFlags & SpeakFocusWidget ) { - w = kapp->focusWidget(); + w = tdeApp->focusWidget(); if (w) { spoke = maybeSayWidget(w); if (!spoke) @@ -145,7 +145,7 @@ void KoSpeaker::probe() } if ( !spoke && d->m_speakFlags & SpeakPointerWidget ) { pos = TQCursor::pos(); - w = kapp->widgetAt(pos, true); + w = tdeApp->widgetAt(pos, true); if (w) { if (!maybeSayWidget(w, pos)) emit customSpeakWidget(w, pos, d->m_speakFlags); @@ -481,12 +481,12 @@ bool KoSpeaker::sayWidget(const TQString& msg) bool KoSpeaker::startKttsd() { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); // If KTTSD not running, start it. if (!client->isApplicationRegistered("kttsd")) { TQString error; - if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error)) { + if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error)) { kdDebug() << "KoSpeaker::startKttsd: error starting KTTSD service: " << error << endl; d->m_enabled = false; } else @@ -502,7 +502,7 @@ TQString KoSpeaker::getKttsdVersion() // did not support version() method, so we must manually marshall this call ourselves. if (d->m_enabled) { if (!d->m_versionChecked) { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQCString replyType; TQByteArray replyData; @@ -520,7 +520,7 @@ TQString KoSpeaker::getKttsdVersion() void KoSpeaker::sayScreenReaderOutput(const TQString &msg, const TQString &talker) { if (msg.isEmpty()) return; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQCString replyType; TQByteArray replyData; @@ -535,7 +535,7 @@ void KoSpeaker::sayScreenReaderOutput(const TQString &msg, const TQString &talke uint KoSpeaker::setText(const TQString &text, const TQString &talker) { if (text.isEmpty()) return 0; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQCString replyType; TQByteArray replyData; @@ -555,7 +555,7 @@ uint KoSpeaker::setText(const TQString &text, const TQString &talker) int KoSpeaker::appendText(const TQString &text, uint jobNum /*=0*/) { if (text.isEmpty()) return 0; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQCString replyType; TQByteArray replyData; @@ -574,7 +574,7 @@ int KoSpeaker::appendText(const TQString &text, uint jobNum /*=0*/) void KoSpeaker::startText(uint jobNum /*=0*/) { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQCString replyType; TQByteArray replyData; @@ -588,7 +588,7 @@ void KoSpeaker::startText(uint jobNum /*=0*/) void KoSpeaker::removeText(uint jobNum /*=0*/) { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQCString replyType; TQByteArray replyData; diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index cca65063d..ddff05f49 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -613,7 +613,7 @@ void KoView::slotAutoScroll( ) { int state=0; #if KDE_IS_VERSION(3,4,0) - state = kapp->keyboardMouseState(); + state = tdeApp->keyboardMouseState(); #endif pos = canvas()->mapFrom(this, pos); diff --git a/lib/kofficecore/KoViewIface.cpp b/lib/kofficecore/KoViewIface.cpp index 18c5dae57..bb6159f60 100644 --- a/lib/kofficecore/KoViewIface.cpp +++ b/lib/kofficecore/KoViewIface.cpp @@ -55,7 +55,7 @@ KoViewIface::~KoViewIface() DCOPRef KoViewIface::action( const TQCString &name ) { - return DCOPRef( kapp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) ); + return DCOPRef( tdeApp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) ); } QCStringList KoViewIface::actions() diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index 3ef20eb52..a5d35b422 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -59,7 +59,7 @@ class KPanelKbdSizerIcon : public TQCursor void show(const TQPoint p) { if (!isActive) { originalPos = TQCursor::pos(); - kapp->setOverrideCursor(*this); + tdeApp->setOverrideCursor(*this); isActive = true; } if (p != pos()) @@ -69,7 +69,7 @@ class KPanelKbdSizerIcon : public TQCursor void hide() { if (isActive) { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TQCursor::setPos(originalPos); } isActive = false; @@ -79,9 +79,9 @@ class KPanelKbdSizerIcon : public TQCursor { if (shayp != shape()) { // Must restore and override to get the icon to refresh. - if (isActive) kapp->restoreOverrideCursor(); + if (isActive) tdeApp->restoreOverrideCursor(); TQCursor::setShape((TQt::CursorShape)shayp); - if (isActive) kapp->setOverrideCursor(*this); + if (isActive) tdeApp->setOverrideCursor(*this); } } @@ -174,12 +174,12 @@ KKbdAccessExtensions::KKbdAccessExtensions(TDEMainWindow* parent, const char* na d->revAction->setEnabled(false); d->accessKeysAction->setEnabled(false); d->icon = new KPanelKbdSizerIcon(); - kapp->installEventFilter(this); + tdeApp->installEventFilter(this); } KKbdAccessExtensions::~KKbdAccessExtensions() { - kapp->removeEventFilter(this); + tdeApp->removeEventFilter(this); if (d->panel) exitSizing(); delete d; } @@ -274,7 +274,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e ) TQWidgetList* KKbdAccessExtensions::getAllPanels() { - TQWidgetList* allWidgets = kapp->allWidgets(); + TQWidgetList* allWidgets = tdeApp->allWidgets(); TQWidgetList* allPanels = new TQWidgetList; TQWidget* widget = allWidgets->first(); while (widget) { @@ -571,7 +571,7 @@ void KKbdAccessExtensions::displayAccessKeys() } // Find all visible, focusable widgets and create a TQLabel for each. Don't exceed // available list of access keys. - TQWidgetList* allWidgets = kapp->allWidgets(); + TQWidgetList* allWidgets = tdeApp->allWidgets(); TQWidget* widget = allWidgets->first(); int accessCount = 0; int maxAccessCount = availableAccessKeys.length(); diff --git a/lib/kofficecore/kkbdaccessextensions.h b/lib/kofficecore/kkbdaccessextensions.h index 2aa64c748..7b9becd7c 100644 --- a/lib/kofficecore/kkbdaccessextensions.h +++ b/lib/kofficecore/kkbdaccessextensions.h @@ -83,7 +83,7 @@ class TDEMainWindow; * When entering sizing mode, the position of the mouse cursor is saved and restored when * exiting sizing mode. * -* For a TQSplitter or TQDockWindow to be found, it must be in the kapp::allWidgets() list. +* For a TQSplitter or TQDockWindow to be found, it must be in the tdeApp::allWidgets() list. * * @section focus_setting Focus Setting * @@ -128,7 +128,7 @@ class KOFFICECORE_EXPORT KKbdAccessExtensions : public TQObject void setStepSize(int s); protected: - /** Event filter installed on kapp object. */ + /** Event filter installed on tdeApp object. */ bool eventFilter( TQObject *o, TQEvent *e ); /** Retrieves a list of all Splitter and DockArea widgets in the application. */ diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index 8d200c080..f78e466a1 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -219,7 +219,7 @@ void KoHelpView::mouseReleaseEvent( TQMouseEvent* e ) e->accept(); if (currentAnchor.startsWith("help://#")) { //that's not really useful, since koffice documents can be embedded - kapp->invokeHelp(currentAnchor.right(currentAnchor.length()-8)); + tdeApp->invokeHelp(currentAnchor.right(currentAnchor.length()-8)); } else if (currentAnchor.startsWith("help://")) { @@ -231,7 +231,7 @@ void KoHelpView::mouseReleaseEvent( TQMouseEvent* e ) helpanchor=helpapp.right(helpapp.length()-pos-1); helpapp=helpapp.left(pos); } - kapp->invokeHelp(helpanchor,helpapp); + tdeApp->invokeHelp(helpanchor,helpapp); } else emit linkClicked( currentAnchor ); diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index f0ff9ff1c..94a2ffb75 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -463,7 +463,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) tmpTQLabel->setText(i18n("Recent file:")); TQComboBox * recentFile = new TQComboBox( this ); - recentFile->setMaximumWidth( kapp->desktop()->width()*3/4 ); + recentFile->setMaximumWidth( tdeApp->desktop()->width()*3/4 ); lay2->addWidget(recentFile); TQStringList fileList = TDERecentDocument::recentDocuments(); diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index e8840c0ba..d8542ec5c 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -87,7 +87,7 @@ void KoSelectAction::popup(const TQPoint& global) int KoSelectAction::plug(TQWidget* widget, int index) { // This function is copied from TDEActionMenu::plug - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis if ( widget->inherits("TQPopupMenu") ) @@ -98,7 +98,7 @@ int KoSelectAction::plug(TQWidget* widget, int index) if ( hasIconSet() ) id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index ); else - id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small), + id = menu->insertItem( tdeApp->iconLoader()->loadIcon(icon(), TDEIcon::Small), text(), popupMenu(), -1, index ); if ( !isEnabled() ) diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index fa9b52cd6..e03ce56c2 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -224,7 +224,7 @@ KoTemplateChooseDia::~KoTemplateChooseDia() static bool cancelQuits() { bool onlyDoc = !KoDocument::documentList() || KoDocument::documentList()->count() <= 1; bool onlyMainWindow = !TDEMainWindow::memberList || TDEMainWindow::memberList->count() <= 1; - return onlyDoc && onlyMainWindow && kapp->instanceName() != "koshell"; // hack for koshell + return onlyDoc && onlyMainWindow && tdeApp->instanceName() != "koshell"; // hack for koshell } KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file, diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index a27d7f236..50ac1136c 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -234,7 +234,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index ) kdWarning() << "TDESelectColorAction::plug called with 0 argument\n"; return -1; } - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; if ( w->inherits("TQPopupMenu") ) diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 295f24f80..1e63f54fc 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -390,7 +390,7 @@ void Editor::changeSetLater() { tqApp->eventLoop()->processEvents(TQEventLoop::AllEvents); - if (kapp->hasPendingEvents()) { + if (tdeApp->hasPendingEvents()) { d->changeSetLaterTimer.start(10, true); //try again... return; } @@ -590,7 +590,7 @@ Editor::slotClicked(TQListViewItem *it) if (d->currentWidget) { if (d->currentWidget->visibleFlag()) { d->currentWidget->show(); - if (hasParent( this, kapp->focusWidget() )) + if (hasParent( this, tdeApp->focusWidget() )) d->currentWidget->setFocus(); } } diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 1d186c4ce..250e8c28a 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -133,7 +133,7 @@ class GroupWidgetBase : public TQWidget TQRect r(rect()); TQPainter p(this); TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default; - kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags); + tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags); paintListViewExpander(&p, this, r.height()+2, palette().active(), isOpen()); if (!m_miniicon.isNull()) { diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 7c9518ead..336d5bbda 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -2281,7 +2281,7 @@ bool KoTextObject::statistics( TQProgressDialog *progress, ulong & charsWithSpac { progress->setProgress(progress->progress()+1); // MA: resizing if KWStatisticsDialog does not work correct with this enabled, don't know why - kapp->processEvents(); + tdeApp->processEvents(); if ( progress->wasCancelled() ) return false; } diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp index ddc09dc21..f8dcba33e 100644 --- a/lib/kotext/kohyphen/kohyphen.cpp +++ b/lib/kotext/kohyphen/kohyphen.cpp @@ -49,7 +49,7 @@ KoHyphenator::KoHyphenator() { /* Reading config for dictionary encodings from file...*/ - TQString path = kapp->dirs()->findResource("data", "koffice/hyphdicts/dicts.xml"); + TQString path = tdeApp->dirs()->findResource("data", "koffice/hyphdicts/dicts.xml"); #ifdef DEBUG_HYPHENATOR kdDebug() << path << endl; #endif @@ -187,7 +187,7 @@ HyphenDict *KoHyphenator::dict(const TQString &_lang) const #ifdef DEBUG_HYPHENATOR kdDebug() << "Searching dictionary for '" << lang << "' language..." << endl; #endif - TQString path = kapp->dirs()->findResource("data", "koffice/hyphdicts/hyph_" + lang + ".dic"); + TQString path = tdeApp->dirs()->findResource("data", "koffice/hyphdicts/hyph_" + lang + ".dic"); if (!path.isNull()) { #ifdef DEBUG_HYPHENATOR diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index d04f8d9dc..0af1be7dd 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -320,7 +320,7 @@ void WdgScriptsManager::slotUnloadScript() void WdgScriptsManager::slotGetNewScript() { #ifdef KROSS_SUPPORT_NEWSTUFF - const TQString appname = TDEApplication::kApplication()->name(); + const TQString appname = tdeApp->name(); const TQString type = TQString("%1 1.x script").arg(appname); if(! d->newstuff) { |