summaryrefslogtreecommitdiffstats
path: root/lib/kofficecore
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kofficecore')
-rw-r--r--lib/kofficecore/KoApplication.cpp2
-rw-r--r--lib/kofficecore/KoApplicationIface.cpp8
-rw-r--r--lib/kofficecore/KoDetailsPane.cpp12
-rw-r--r--lib/kofficecore/KoDocument.cpp4
-rw-r--r--lib/kofficecore/KoDocumentIface.cpp4
-rw-r--r--lib/kofficecore/KoMainWindow.cpp4
-rw-r--r--lib/kofficecore/KoMainWindowIface.cpp2
-rw-r--r--lib/kofficecore/KoSpeaker.cpp20
-rw-r--r--lib/kofficecore/KoView.cpp2
-rw-r--r--lib/kofficecore/KoViewIface.cpp2
-rw-r--r--lib/kofficecore/kkbdaccessextensions.cpp16
-rw-r--r--lib/kofficecore/kkbdaccessextensions.h4
12 files changed, 40 insertions, 40 deletions
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. */
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-26 00:58:23 +0000