summaryrefslogtreecommitdiffstats
path: root/tdeui/kdcopactionproxy.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 15:13:01 -0600
committerTimothy Pearson <[email protected]>2013-02-01 15:13:01 -0600
commitdeac2ca49faed824fe83066080714eb6d653615b (patch)
tree8b5bf97c5acaaf5285985b87fa76dbea0f35e4fa /tdeui/kdcopactionproxy.cpp
parent0c9d97065a3d6ceb12d687555a1a33d90db96238 (diff)
downloadtdelibs-deac2ca49faed824fe83066080714eb6d653615b.tar.gz
tdelibs-deac2ca49faed824fe83066080714eb6d653615b.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'tdeui/kdcopactionproxy.cpp')
-rw-r--r--tdeui/kdcopactionproxy.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/tdeui/kdcopactionproxy.cpp b/tdeui/kdcopactionproxy.cpp
index 2b20e8bd3..730cdacb3 100644
--- a/tdeui/kdcopactionproxy.cpp
+++ b/tdeui/kdcopactionproxy.cpp
@@ -37,13 +37,13 @@ public:
{
}
- KActionCollection *m_actionCollection;
+ TDEActionCollection *m_actionCollection;
DCOPObject *m_parent;
TQCString m_prefix;
int m_pos;
};
-KDCOPActionProxy::KDCOPActionProxy( KActionCollection *actionCollection, DCOPObject *parent )
+KDCOPActionProxy::KDCOPActionProxy( TDEActionCollection *actionCollection, DCOPObject *parent )
{
init( actionCollection, parent );
}
@@ -53,7 +53,7 @@ KDCOPActionProxy::KDCOPActionProxy( DCOPObject *parent )
init( 0, parent );
}
-void KDCOPActionProxy::init( KActionCollection *collection, DCOPObject *parent )
+void KDCOPActionProxy::init( TDEActionCollection *collection, DCOPObject *parent )
{
d = new KDCOPActionProxyPrivate;
d->m_actionCollection = collection;
@@ -67,15 +67,15 @@ KDCOPActionProxy::~KDCOPActionProxy()
delete d;
}
-TQValueList<KAction *>KDCOPActionProxy::actions() const
+TQValueList<TDEAction *>KDCOPActionProxy::actions() const
{
if ( !d->m_actionCollection )
- return TQValueList<KAction *>();
+ return TQValueList<TDEAction *>();
return d->m_actionCollection->actions();
}
-KAction *KDCOPActionProxy::action( const char *name ) const
+TDEAction *KDCOPActionProxy::action( const char *name ) const
{
if ( !d->m_actionCollection )
return 0;
@@ -96,9 +96,9 @@ TQMap<TQCString,DCOPRef> KDCOPActionProxy::actionMap( const TQCString &appId ) c
if ( id.isEmpty() )
id = kapp->dcopClient()->appId();
- TQValueList<KAction *> lst = actions();
- TQValueList<KAction *>::ConstIterator it = lst.begin();
- TQValueList<KAction *>::ConstIterator end = lst.end();
+ TQValueList<TDEAction *> lst = actions();
+ TQValueList<TDEAction *>::ConstIterator it = lst.begin();
+ TQValueList<TDEAction *>::ConstIterator end = lst.end();
for (; it != end; ++it )
res.insert( (*it)->name(), DCOPRef( id, actionObjectId( (*it)->name() ) ) );
@@ -111,7 +111,7 @@ bool KDCOPActionProxy::process( const TQCString &obj, const TQCString &fun, cons
if ( obj.left( d->m_pos ) != d->m_prefix )
return false;
- KAction *act = action( obj.mid( d->m_pos ) );
+ TDEAction *act = action( obj.mid( d->m_pos ) );
if ( !act )
return false;
@@ -119,7 +119,7 @@ bool KDCOPActionProxy::process( const TQCString &obj, const TQCString &fun, cons
}
bool KDCOPActionProxy::processAction( const TQCString &, const TQCString &fun, const TQByteArray &data,
- TQCString &replyType, TQByteArray &replyData, KAction *action )
+ TQCString &replyType, TQByteArray &replyData, TDEAction *action )
{
if ( fun == "activate()" )
{