summaryrefslogtreecommitdiffstats
path: root/kdcop
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kdcop
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kdcop')
-rw-r--r--kdcop/kdcop.cpp2
-rw-r--r--kdcop/kdcopwindow.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/kdcop/kdcop.cpp b/kdcop/kdcop.cpp
index 0db66161..9ab6d442 100644
--- a/kdcop/kdcop.cpp
+++ b/kdcop/kdcop.cpp
@@ -27,7 +27,7 @@ int main( int argc, char ** argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication a;
+ TDEApplication a;
KDCOPWindow* kdcopwindow = new KDCOPWindow;
a.setMainWidget( kdcopwindow );
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index c8fc8972..716b7707 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -157,7 +157,7 @@ DCOPBrowserApplicationItem::setOpen(bool o)
void
DCOPBrowserApplicationItem::populate()
{
- KApplication::setOverrideCursor(tqwaitCursor);
+ TDEApplication::setOverrideCursor(tqwaitCursor);
bool ok = false;
bool isDefault = false;
@@ -175,7 +175,7 @@ DCOPBrowserApplicationItem::populate()
isDefault = false;
}
- KApplication::restoreOverrideCursor();
+ TDEApplication::restoreOverrideCursor();
}
void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCString& /*replyType*/, const TQByteArray &replyData)
@@ -240,7 +240,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o)
void
DCOPBrowserInterfaceItem::populate()
{
- KApplication::setOverrideCursor(tqwaitCursor);
+ TDEApplication::setOverrideCursor(tqwaitCursor);
bool ok = false;
@@ -250,7 +250,7 @@ DCOPBrowserInterfaceItem::populate()
if ((*it) != "QCStringList functions()")
new DCOPBrowserFunctionItem(this, app_, object_, *it);
- KApplication::restoreOverrideCursor();
+ TDEApplication::restoreOverrideCursor();
}
// ------------------------------------------------------------------------
@@ -902,7 +902,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
void KDCOPWindow::slotFillApplications()
{
- KApplication::setOverrideCursor(tqwaitCursor);
+ TDEApplication::setOverrideCursor(tqwaitCursor);
QCStringList apps = dcopClient->registeredApplications();
TQCString appId = dcopClient->appId();
@@ -917,7 +917,7 @@ void KDCOPWindow::slotFillApplications()
}
}
- KApplication::restoreOverrideCursor();
+ TDEApplication::restoreOverrideCursor();
}
bool KDCOPWindow::demarshal