summaryrefslogtreecommitdiffstats
path: root/tdeui/tdeactioncollection.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:21:04 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:21:04 -0600
commitd1e0cc99a202cef3306b90b8839a6726e89f201e (patch)
treea0d01a91644fd94aa6da5d8944e052b67461faad /tdeui/tdeactioncollection.h
parent3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff)
downloadtdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz
tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/tdeactioncollection.h')
-rw-r--r--tdeui/tdeactioncollection.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/tdeui/tdeactioncollection.h b/tdeui/tdeactioncollection.h
index 9ef517579..ae6fd6575 100644
--- a/tdeui/tdeactioncollection.h
+++ b/tdeui/tdeactioncollection.h
@@ -22,17 +22,17 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __kactioncollection_h__
-#define __kactioncollection_h__
+#ifndef __tdeactioncollection_h__
+#define __tdeactioncollection_h__
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqkeysequence.h>
#include <tqobject.h>
#include <tqvaluelist.h>
#include <tqguardedptr.h>
#include <kguiitem.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kstdaction.h>
#include <kicontheme.h>
@@ -142,17 +142,17 @@ public:
*/
//bool ownsTDEAccel() const;
- /** @deprecated Deprecated because of ambiguous name. Use kaccel() */
+ /** @deprecated Deprecated because of ambiguous name. Use tdeaccel() */
virtual TDEAccel* accel() KDE_DEPRECATED;
- /** @deprecated Deprecated because of ambiguous name. Use kaccel() */
+ /** @deprecated Deprecated because of ambiguous name. Use tdeaccel() */
virtual const TDEAccel* accel() const KDE_DEPRECATED;
/** Returns the TDEAccel object of the most recently set widget. */
- TDEAccel* kaccel();
+ TDEAccel* tdeaccel();
/** Returns the TDEAccel object of the most recently set widget. Const version for convenience. */
- const TDEAccel* kaccel() const;
+ const TDEAccel* tdeaccel() const;
- /** @internal, for TDEAction::kaccelCurrent() */
+ /** @internal, for TDEAction::tdeaccelCurrent() */
TDEAccel* builderTDEAccel() const;
/** Returns the TDEAccel object associated with widget #. */
//TDEAccel* widgetTDEAccel( uint i );
@@ -317,7 +317,7 @@ private:
void endXMLPlug();
/** @internal. Only to be called by KXMLGUIFactory::removeClient() */
void prepareXMLUnplug();
- void unplugShortcuts( TDEAccel* kaccel );
+ void unplugShortcuts( TDEAccel* tdeaccel );
void _clear();
void _insert( TDEAction* );